Kaydet (Commit) c39a0db4 authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Bugs fixed.

üst 228b8b9a
...@@ -6,7 +6,7 @@ import shutil ...@@ -6,7 +6,7 @@ import shutil
def listModelApplications(model): def listModelApplications(model):
apps = [] apps = []
scriptDir = os.path.join('/var/db/comar3/', "scripts", model) scriptDir = os.path.join('/var/db/scom3/', "scripts", model)
if not os.path.exists(scriptDir): if not os.path.exists(scriptDir):
return apps return apps
for i in os.listdir(scriptDir): for i in os.listdir(scriptDir):
...@@ -16,7 +16,7 @@ def listModelApplications(model): ...@@ -16,7 +16,7 @@ def listModelApplications(model):
def listApplicationModels(app): def listApplicationModels(app):
models = [] models = []
scriptDir = os.path.join('/var/db/comar3/', "apps", app) scriptDir = os.path.join('/var/db/scom3/', "apps", app)
if not os.path.exists(scriptDir): if not os.path.exists(scriptDir):
return models return models
for i in os.listdir(scriptDir): for i in os.listdir(scriptDir):
...@@ -88,7 +88,7 @@ def introspect(): ...@@ -88,7 +88,7 @@ def introspect():
xml += model_xml("Core") xml += model_xml("Core")
xml += '<node name="package"/>' xml += '<node name="package"/>'
elif path == '/package': elif path == '/package':
scriptDir = os.path.join('/var/db/comar3/', "apps") scriptDir = os.path.join('/var/db/scom3/', "apps")
for i in os.listdir(scriptDir): for i in os.listdir(scriptDir):
if not i.startswith("."): if not i.startswith("."):
xml += '<node name="%s"/>' % i xml += '<node name="%s"/>' % i
......
...@@ -12,4 +12,4 @@ def info(): ...@@ -12,4 +12,4 @@ def info():
def start(): def start():
notify("System.Service", "Changed", (script(), "started")) notify("System.Service", "Changed", (script(), "started"))
print _(MSG) print((_(MSG)))
...@@ -9,7 +9,7 @@ import os ...@@ -9,7 +9,7 @@ import os
def handleError(exception): def handleError(exception):
error = exception.get_dbus_name() error = exception.get_dbus_name()
message = exception.message message = exception.message
if error.endswith("Comar.PolicyKit"): if error.endswith("Scom.PolicyKit"):
print "Access denied. '%s' access required" % message print "Access denied. '%s' access required" % message
else: else:
print message print message
...@@ -29,10 +29,10 @@ def main(): ...@@ -29,10 +29,10 @@ def main():
printUsage() printUsage()
bus = dbus.SystemBus() bus = dbus.SystemBus()
obj = bus.get_object('tr.org.pardus.comar3', '/', introspect=False) obj = bus.get_object('tr.org.sulin.scom', '/', introspect=False)
lang = locale.getdefaultlocale()[0].split("_")[0] lang = locale.getdefaultlocale()[0].split("_")[0]
obj.setLocale(lang, dbus_interface='tr.org.pardus.comar3') obj.setLocale(lang, dbus_interface='tr.org.sulin.scom')
if sys.argv[1] == "list-apps": if sys.argv[1] == "list-apps":
try: try:
...@@ -40,7 +40,7 @@ def main(): ...@@ -40,7 +40,7 @@ def main():
except IndexError: except IndexError:
printUsage() printUsage()
try: try:
apps = obj.listModelApplications(model, dbus_interface='tr.org.pardus.comar3') apps = obj.listModelApplications(model, dbus_interface='tr.org.sulin.scom')
except dbus.exceptions.DBusException ase: except dbus.exceptions.DBusException ase:
handleError(e) handleError(e)
return return
...@@ -52,7 +52,7 @@ def main(): ...@@ -52,7 +52,7 @@ def main():
except IndexError: except IndexError:
printUsage() printUsage()
try: try:
models = obj.listApplicationModels(app, dbus_interface='tr.org.pardus.comar3') models = obj.listApplicationModels(app, dbus_interface='tr.org.sulin.scom')
except dbus.exceptions.DBusException ase: except dbus.exceptions.DBusException ase:
handleError(e) handleError(e)
for model in models: for model in models:
...@@ -66,7 +66,7 @@ def main(): ...@@ -66,7 +66,7 @@ def main():
printUsage() printUsage()
path = os.path.realpath(script) path = os.path.realpath(script)
try: try:
obj.register(app, model, path, dbus_interface='tr.org.pardus.comar3') obj.register(app, model, path, dbus_interface='tr.org.sulin.scom')
except dbus.exceptions.DBusException ase: except dbus.exceptions.DBusException ase:
handleError(e) handleError(e)
elif sys.argv[1] == "remove": elif sys.argv[1] == "remove":
...@@ -75,7 +75,7 @@ def main(): ...@@ -75,7 +75,7 @@ def main():
except IndexError: except IndexError:
printUsage() printUsage()
try: try:
obj.remove(app, dbus_interface='tr.org.pardus.comar3') obj.remove(app, dbus_interface='tr.org.sulin.scom')
except dbus.exceptions.DBusException ase: except dbus.exceptions.DBusException ase:
handleError(e) handleError(e)
else: else:
......
#!/bin/sh #!/bin/sh
rm -rf comar_root rm -rf scom_root
mkdir -p comar_root/var/log mkdir -p scom_root/var/log
mkdir -p comar_root/var/db mkdir -p scom_root/var/db
cd .. cd ..
cmake . cmake .
make make
make install DESTDIR=tests/comar_root make install DESTDIR=tests/scom_root
cd tests cd tests
echo echo
comar_root/usr/sbin/comar3 --datadir=comar_root/var/db/comar3 --logdir=comar_root/var/log/comar3 --debug --print scom_root/usr/sbin/scom --datadir=scom_root/var/db/scom3 --logdir=scom_root/var/log/scom3 --debug --print
...@@ -6,8 +6,8 @@ import time ...@@ -6,8 +6,8 @@ import time
bus = dbus.SystemBus() bus = dbus.SystemBus()
obj = bus.get_object('tr.org.pardus.comar3', '/', introspect=False) obj = bus.get_object('tr.org.sulin.scom2', '/', introspect=False)
obj.setLocale('tr', dbus_interface='tr.org.pardus.comar3') obj.setLocale('tr', dbus_interface='tr.org.sulin.scom2')
obj = bus.get_object('tr.org.pardus.comar3', '/package/apache', introspect=False) obj = bus.get_object('tr.org.sulin.scom2', '/package/apache', introspect=False)
print obj.info(dbus_interface='tr.org.pardus.comar3.System.Service', timeout=60) print(obj.info(dbus_interface='tr.org.sulin.scom2.System.Service', timeout=60))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment