[Treepkg-commits] r171 - in trunk: bin treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-02-24 19:28:25 +0100 (Tue, 24 Feb 2009)
New Revision: 171

Modified:
   trunk/bin/treepkgbuilder.py
   trunk/treepkg/builder.py
Log:
Add --save-after-login option to bin/treepkgbuilder.py and corresponding
keyword argument to PBuilder.login


Modified: trunk/bin/treepkgbuilder.py
===================================================================
--- trunk/bin/treepkgbuilder.py	2009-01-21 14:02:01 UTC (rev 170)
+++ trunk/bin/treepkgbuilder.py	2009-02-24 18:28:25 UTC (rev 171)
@@ -130,11 +130,14 @@
         parser.add_option("--bind-mount", action="append",
                           help=("Directories to bind-mount in the chroot"
                                 " environment."))
+        parser.add_option("--save-after-login", action="store_true",
+                          help="Copy changes back to the tarball.")
         return parser
 
 
     def run(self):
-        self.get_builder().login(bindmounts=self.opts.bind_mount)
+        self.get_builder().login(bindmounts=self.opts.bind_mount,
+                                 save_after_login=self.opts.save_after_login)
 
 
 class BuildCommand(Command):

Modified: trunk/treepkg/builder.py
===================================================================
--- trunk/treepkg/builder.py	2009-01-21 14:02:01 UTC (rev 170)
+++ trunk/treepkg/builder.py	2009-02-24 18:28:25 UTC (rev 171)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -246,11 +246,13 @@
                            args=args, script=script),
                  suppress_output=False)
 
-    def login(self, bindmounts=()):
+    def login(self, bindmounts=(), save_after_login=False):
         """Start an interactive shell in the pbuilder environment"""
         args = []
         for mount in bindmounts:
             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,