service.py: Introduce a `name' attribute for services.

[chopwood] / service.py

diff --git a/service.py b/service.py
index 0944e2c167dc16d0712f49b2821941c5f988a951..26406b5b5480bda9d9f31ec0a018efb131f9dd9c 100644 (file)
--- a/service.py
+++ b/service.py
@@ -78,8 +78,9 @@ class BasicService (object):
   A simple base class for services.
   """
 
   A simple base class for services.
   """
 

-  def __init__(me, friendly, *args, **kw):
+  def __init__(me, friendly, name = None, *args, **kw):

     super(BasicService, me).__init__(*args)
     super(BasicService, me).__init__(*args)

+    me.name = name

     me.friendly = friendly
     me.meta = kw
 
     me.friendly = friendly
     me.meta = kw
 


@@ -379,5 +380,7 @@ def add_master_service():
                                    'users', 'user', 'passwd'),
                  CFG.HASH,
                  friendly = 'Password changing service')
                                    'users', 'user', 'passwd'),
                  CFG.HASH,
                  friendly = 'Password changing service')

+  for name, svc in SERVICES.iteritems():
+    if svc.name is None: svc.name = name

 
 ###----- That's all, folks --------------------------------------------------
 
 ###----- That's all, folks --------------------------------------------------