Bugs fixed.

scom/modules/core.py

@@ -6,7 +6,7 @@ import shutil
 
 def listModelApplications(model):
     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):
         return apps
     for i in os.listdir(scriptDir):
@@ -16,7 +16,7 @@ def listModelApplications(model):
 
 def listApplicationModels(app):
     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):
         return models
     for i in os.listdir(scriptDir):
@@ -88,7 +88,7 @@ def introspect():
         xml += model_xml("Core")
         xml += '<node name="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):
             if not i.startswith("."):
                 xml += '<node name="%s"/>' % i

scom/tests/example/apache.py

@@ -12,4 +12,4 @@ def info():
 
 def start():
     notify("System.Service", "Changed", (script(), "started"))
-    print _(MSG)
+    print((_(MSG)))

scom/tests/hav.py

@@ -9,7 +9,7 @@ import os
 def handleError(exception):
     error = exception.get_dbus_name()
     message = exception.message
-    if error.endswith("Comar.PolicyKit"):
+    if error.endswith("Scom.PolicyKit"):
         print "Access denied. '%s' access required" % message
     else:
         print message
@@ -29,10 +29,10 @@ def main():
         printUsage()
 
     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]
-    obj.setLocale(lang, dbus_interface='tr.org.pardus.comar3')
+    obj.setLocale(lang, dbus_interface='tr.org.sulin.scom')
 
     if sys.argv[1] == "list-apps":
         try:
@@ -40,7 +40,7 @@ def main():
         except IndexError:
             printUsage()
         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:
             handleError(e)
             return
@@ -52,7 +52,7 @@ def main():
         except IndexError:
             printUsage()
         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:
             handleError(e)
         for model in models:
@@ -66,7 +66,7 @@ def main():
             printUsage()
         path = os.path.realpath(script)
         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:
             handleError(e)
     elif sys.argv[1] == "remove":
@@ -75,7 +75,7 @@ def main():
         except IndexError:
             printUsage()
         try:
-            obj.remove(app, dbus_interface='tr.org.pardus.comar3')
+            obj.remove(app, dbus_interface='tr.org.sulin.scom')
         except dbus.exceptions.DBusException ase:
             handleError(e)
     else:

scom/tests/run.sh

 #!/bin/sh
 
-rm -rf comar_root
+rm -rf scom_root
 
-mkdir -p comar_root/var/log
-mkdir -p comar_root/var/db
+mkdir -p scom_root/var/log
+mkdir -p scom_root/var/db
 
 cd ..
 cmake .
 make
-make install DESTDIR=tests/comar_root
+make install DESTDIR=tests/scom_root
 cd tests
 
 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

scom/tests/test.py

@@ -6,8 +6,8 @@ import time
 
 bus = dbus.SystemBus()
 
-obj = bus.get_object('tr.org.pardus.comar3', '/', introspect=False)
-obj.setLocale('tr', dbus_interface='tr.org.pardus.comar3')
+obj = bus.get_object('tr.org.sulin.scom2', '/', introspect=False)
+obj.setLocale('tr', dbus_interface='tr.org.sulin.scom2')
 
-obj = bus.get_object('tr.org.pardus.comar3', '/package/apache', introspect=False)
-print obj.info(dbus_interface='tr.org.pardus.comar3.System.Service', timeout=60)
+obj = bus.get_object('tr.org.sulin.scom2', '/package/apache', introspect=False)
+print(obj.info(dbus_interface='tr.org.sulin.scom2.System.Service', timeout=60))