[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit cd6a53f364af45d2eadeb743bc249f9722f14f43
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Jan 14 18:26:29 2009 +0100

    ousaged: move errors to appropriate modules.

diff --git a/framework/subsystems/ousaged/generic.py b/framework/subsystems/ousaged/generic.py
index c1b103a..e2eebe2 100644
--- a/framework/subsystems/ousaged/generic.py
+++ b/framework/subsystems/ousaged/generic.py
@@ -13,7 +13,7 @@ Module: generic
 """
 
 MODULE_NAME = "ousaged"
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 DBUS_INTERFACE_PREFIX = "org.freesmartphone.Usage"
 DBUS_PATH_PREFIX = "/org/freesmartphone/Usage"
@@ -35,12 +35,6 @@ logger = logging.getLogger( MODULE_NAME )
 #----------------------------------------------------------------------------#
 # DBus Exceptions specifications specific to this module
 
-class PolicyUnknown( dbus.DBusException ):
-    _dbus_error_name = "org.freesmartphone.Usage.PolicyUnknown"
-
-class PolicyDisabled( dbus.DBusException ):
-    _dbus_error_name = "org.freesmartphone.Usage.PolicyDisabled"
-
 class ResourceUnknown( dbus.DBusException ):
     _dbus_error_name = "org.freesmartphone.Usage.ResourceUnknown"
 
@@ -50,12 +44,6 @@ class ResourceExists( dbus.DBusException ):
 class ResourceInUse( dbus.DBusException ):
     _dbus_error_name = "org.freesmartphone.Usage.ResourceInUse"
 
-class UserExists( dbus.DBusException ):
-    _dbus_error_name = "org.freesmartphone.Usage.UserExists"
-
-class UserUnknown( dbus.DBusException ):
-    _dbus_error_name = "org.freesmartphone.Usage.UserUnknown"
-
 #----------------------------------------------------------------------------#
 class GenericUsageControl( dbus.service.Object ):
 #----------------------------------------------------------------------------#
diff --git a/framework/subsystems/ousaged/resources.py b/framework/subsystems/ousaged/resources.py
index eccfc9c..8319c4b 100644
--- a/framework/subsystems/ousaged/resources.py
+++ b/framework/subsystems/ousaged/resources.py
@@ -13,7 +13,7 @@ Module: resources
 """
 
 MODULE_NAME = "ousaged"
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 
 import framework.patterns.tasklet as tasklet
 
@@ -27,6 +27,21 @@ import logging
 logger = logging.getLogger( MODULE_NAME )
 
 #----------------------------------------------------------------------------#
+# DBus Exceptions specifications specific to this module
+
+class PolicyUnknown( dbus.DBusException ):
+    _dbus_error_name = "org.freesmartphone.Usage.PolicyUnknown"
+
+class PolicyDisabled( dbus.DBusException ):
+    _dbus_error_name = "org.freesmartphone.Usage.PolicyDisabled"
+
+class UserExists( dbus.DBusException ):
+    _dbus_error_name = "org.freesmartphone.Usage.UserExists"
+
+class UserUnknown( dbus.DBusException ):
+    _dbus_error_name = "org.freesmartphone.Usage.UserUnknown"
+
+#----------------------------------------------------------------------------#
 class AbstractResource( object ):
 #----------------------------------------------------------------------------#
     """

-- 
FSO frameworkd Debian packaging