r1304 - in zope-common/trunk (3 files)

[Jonas Meurer]

    Date: Tuesday, November 11, 2008 @ 10:44:17
  Author: mejo
Revision: 1304

fix trivial parts of bug #500773

Modified:
  zope-common/trunk/debian/changelog
  zope-common/trunk/debian/postinst
  zope-common/trunk/dzhandle

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2008-10-27 21:32:09 UTC (rev 1303)
+++ zope-common/trunk/debian/changelog	2008-11-11 10:44:17 UTC (rev 1304)
@@ -1,3 +1,12 @@
+zope-common (0.5.46) unstable; urgency=low
+
+  * dzhandle: show add-extension, remove-extension and list-extensions in
+    the dzhandle help. Talk about the actual addon type in DZListAddons.run().
+  * debian/postinst: add an Extensions directory to the localdir as well.
+  * This closes one half of bug #500773.
+
+ -- Jonas Meurer <mejo at debian.org>  Tue, 11 Nov 2008 11:35:42 +0100
+
 zope-common (0.5.45) unstable; urgency=low
 
   * dzhandle: applied patch from quest at lysator.liu.se to fix a typo in the

Modified: zope-common/trunk/debian/postinst
===================================================================
--- zope-common/trunk/debian/postinst	2008-10-27 21:32:09 UTC (rev 1303)
+++ zope-common/trunk/debian/postinst	2008-11-11 10:44:17 UTC (rev 1304)
@@ -26,6 +26,7 @@
     if [ ! -d $LOCALDIR ]; then
         if mkdir $LOCALDIR 2>/dev/null ; then
             mkdir $LOCALDIR/Products
+            mkdir $LOCALDIR/Extensions
             chmod 2775 $LOCALDIR -R
             chown root:$zopegroup $LOCALDIR -R
         fi

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2008-10-27 21:32:09 UTC (rev 1303)
+++ zope-common/trunk/dzhandle	2008-11-11 10:44:17 UTC (rev 1304)
@@ -373,7 +373,6 @@
     kind = 'extension'
     subdir = 'Extensions'
     dzname = '.dzextension'
-    list_on_help = False
 
 class Product(ProductAttributes, Addon):
     pass
@@ -797,7 +796,6 @@
 class DZPostrmExtension(ExtensionAttributes, DZPostrm):
     name = 'postrm-%s' % ExtensionAttributes.kind
     help = 'handle postrm of a packaged %s' % ExtensionAttributes.kind
-    list_on_help = False
 
 register_action(DZPostrmProduct)
 register_action(DZPostrmExtension)
@@ -1072,7 +1070,6 @@
 class DZAddExtension(ExtensionAttributes, DZAddAddon):
     name = 'add-extension'
     help = 'add an extension to an instance'
-    list_on_help = False
 
 register_action(DZAddProduct)
 register_action(DZAddExtension)
@@ -1170,7 +1167,6 @@
 class DZRemoveExtension(ExtensionAttributes, DZRemoveAddon):
     name = 'remove-extension'
     help = 'remove an extension from an instance'
-    list_on_help = False
 
 register_action(DZRemoveProduct)
 register_action(DZRemoveExtension)
@@ -1185,7 +1181,7 @@
 
     def check_args(self, global_options):
         if not self.args:
-            # list available products
+            # list available products/extensions
             self.instance = None
         elif len(self.args) == 1:
             try:
@@ -1199,23 +1195,24 @@
 
     def run(self, global_options):
         if self.instance:
-            print 'Listing products installed for instance', self.instance.name
+            print "Listing %ss installed for instance" % (self.addon_type), self.instance.name
             addons = self.instance.installed_addons()
         else:
             if len(global_options.zversion) > 1:
-                print 'Listing products available for all version(s):', ' '.join(global_options.zversion)
+                print "Listing %ss available for all version(s):" % (self.addon_type), ' '.join(global_options.zversion)
             addons = locate_addons(self.addonClass, zopeversions=global_options.zversion)
         for addon in addons:
             addon.printit()
 
 class DZListProducts(ProductAttributes, DZListAddons):
     name = 'list-products'
+    addon_type = 'product'
     help = 'show all products managed by dzhandle'
 
 class DZListExtensions(ExtensionAttributes, DZListAddons):
     name = 'list-extensions'
+    addon_type = 'extension'
     help = 'show all extensions managed by dzhandle'
-    list_on_help = False
 
 register_action(DZListProducts)
 register_action(DZListExtensions)