[Treepkg-commits] r30 - trunk/bin

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-03-04 15:18:56 +0100 (Tue, 04 Mar 2008)
New Revision: 30

Modified:
   trunk/bin/initpbuilder.py
Log:
Use cmdexpand in bin/initpbuilder.py


Modified: trunk/bin/initpbuilder.py
===================================================================
--- trunk/bin/initpbuilder.py	2008-03-04 14:10:39 UTC (rev 29)
+++ trunk/bin/initpbuilder.py	2008-03-04 14:18:56 UTC (rev 30)
@@ -23,6 +23,7 @@
 from treepkg.readconfig import read_config
 from treepkg.util import ensure_directory, writefile
 from treepkg.run import call
+from treepkg.cmdexpand import cmdexpand
 
 
 pbuilderrc_template = '''\
@@ -80,13 +81,14 @@
     # turn the extra-pkg directory into a proper deb archive
     print "turning the extra-pkg dir into a debian archive"
     extra_pkgdir = replacements["extra-pkgdir"]
-    call(["apt-ftparchive", "packages", "."],
+    call(cmdexpand("apt-ftparchive packages ."),
          stdout=open(os.path.join(extra_pkgdir, "Packages"), "w"),
          cwd=extra_pkgdir)
 
     # create the base.tgz chroot
     print "running pbuilder create"
-    call(root_cmd + ["pbuilder", "create", "--configfile", pbuilderrc])
+    call(cmdexpand("@root_cmd pbuilder create --configfile $pbuilderrc",
+                   **locals()))
 
 
 def parse_commandline():