[Treepkg-commits] r56 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-05-23 19:44:15 +0200 (Fri, 23 May 2008)
New Revision: 56

Modified:
   trunk/treepkg/packager.py
Log:
Try to determine dependencies only when treepkg is fully configured.
That is, don't try to parse debian/control if the debian directory does
not exist, a situation that most likely happens when running
bin/inittreepkg.py to configure the tree packager instance.


Modified: trunk/treepkg/packager.py
===================================================================
--- trunk/treepkg/packager.py	2008-05-23 16:42:52 UTC (rev 55)
+++ trunk/treepkg/packager.py	2008-05-23 17:44:15 UTC (rev 56)
@@ -311,7 +311,12 @@
 
         requires = ()
         provides = ()
-        if self.handle_dependencies:
+        # only try to parse the control file if the debian directory
+        # exists.  If the debian directory doesn't exist yet, the tree
+        # packager is likely still being configured and this code may be
+        # run indirectly from e. g. bin/inittreepkg.py in which case the
+        # init_treepkg method will report the missing debian
+        if self.handle_dependencies and os.path.exists(self.debian_dir):
             control = debian.DebianControlFile(os.path.join(self.debian_dir,
                                                             "control"))
             requires = control.build_depends