[Treepkg-commits] r304 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-05-10 12:59:02 +0200 (Mon, 10 May 2010)
New Revision: 304

Modified:
   trunk/treepkg/sbuilder.py
Log:
added login feature for sbdmock 


Modified: trunk/treepkg/sbuilder.py
===================================================================
--- trunk/treepkg/sbuilder.py	2010-05-03 08:31:04 UTC (rev 303)
+++ trunk/treepkg/sbuilder.py	2010-05-10 10:59:02 UTC (rev 304)
@@ -168,12 +168,25 @@
             args.extend(["--bindmounts", mount])
         if save_after_login:
             args.extend(["--save-after-login"])
-        run.call(cmdexpand("@rootcmd /usr/sbin/pbuilder login"
-                           " --configfile $pbuilderrc @args",
-                           rootcmd=self.root_cmd, pbuilderrc=self.pbuilderrc,
-                           args=args),
-                 suppress_output=False)
 
+        logging.info("Mointing extra-pkg apt repository")
+
+        self.mount([self.extra_pkg_dir])
+
+        logging.info("Login into scratchbox...")
+
+
+
+        cmd = cmdexpand("/usr/bin/sbdmock login --cleanbuilddir"
+                           " --config=$builderconfig"
+#                           " --dbo=" # aren't build options setable in treepkg.cfg?
+                           " -u @args",
+                           builderconfig=self.builderconfig,
+                           dsc=dsc_file, args=args)
+        logging.debug("sbdmock cmd: %s" % cmd)
+
+        run.call(cmd, suppress_output=False)
+
     def mount(self, bindmounts):
         for mount in bindmounts:
             mount_dir = "/scratchbox/users/%s/%s" % (util.getuser(), mount)