more pythonic and more simple as we like it to be.

2005-07-04 16:12:42 +00:00
parent e82fcf4382
commit 4d5a4ae2d9
1 changed files with 6 additions and 6 deletions
@@ -145,12 +145,12 @@ class PisiBuild:
    def pkgSrcDir(self):
        """Returns the real path of WorkDir for an unpacked archive."""
        join = os.path.join
-        if 'WorkDir' in self.actionGlobals:
-            path = join(self.ctx.pkg_work_dir(),self.actionGlobals['WorkDir'])
-        else:
-            path = join(self.ctx.pkg_work_dir(), 
-                        self.spec.source.name + "-" + self.spec.source.version)
-            
+        try:
+            srcdir = self.actionGlobals['WorkDir']
+        except KeyError:
+            srcdir = self.spec.source.name + "-" + self.spec.source.version
+                    
+        path = join(self.ctx.pkg_work_dir(), srcdir)
        if not os.path.exists(path):
            ui.error ("No such file or directory: %s\n" % e)
            sys.exit(1)