r1046 - in zope-common/trunk (debian/changelog dzhandle)

[Bernd Zeimetz]

    Date: Thursday, November 29, 2007 @ 18:12:34
  Author: bzed-guest
Revision: 1046

* Handle manually installed products gracefully with dzhandle, thanks to
  Ronan KERYELL and Jochen Pawletta for reporting (Closes: #417745).

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

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2007-11-29 17:47:02 UTC (rev 1045)
+++ zope-common/trunk/debian/changelog	2007-11-29 18:12:34 UTC (rev 1046)
@@ -14,8 +14,10 @@
   [ Bernd Zeimetz ]
   * Finally implement removing+reinstalling Zeo and Zope instances.
     (Closes: #429393, #431604)
+  * Handle manually installed products gracefully with dzhandle, thanks to
+    Ronan KERYELL and Jochen Pawletta for reporting (Closes: #417745).
 
- -- Bernd Zeimetz <bernd at bzed.de>  Thu, 29 Nov 2007 18:42:43 +0100
+ -- Bernd Zeimetz <bernd at bzed.de>  Thu, 29 Nov 2007 19:09:39 +0100
 
 zope-common (0.5.37) unstable; urgency=low
 

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-11-29 17:47:02 UTC (rev 1045)
+++ zope-common/trunk/dzhandle	2007-11-29 18:12:34 UTC (rev 1046)
@@ -219,8 +219,10 @@
                       % (self.dzname, os.path.join(self.path, self.dzname))
             self.type = ADDON_MANUAL
             self.name = os.path.basename(path)
-            self.package = None
-            self.version = None
+            self.directory = self.name.split(':', 1)[0]
+            self.package = 'unknown'
+            self.version = os.path.exists(os.path.join(self.path, 'version.txt')) and \
+                open(os.path.join(self.path, 'version.txt')).read().strip() or 'unknown'
             self.depends = None
             self.recommends = None
             self.suggests = None