Merge lp:~broder/ubuntu-dev-tools/update-builder into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Evan Broder]

=== modified file 'backportpackage'
--- backportpackage	2010-12-16 22:43:48 +0000
+++ backportpackage	2010-12-17 09:51:10 +0000
@@ -64,6 +64,11 @@
                  default=None,
                  help='Specify the package builder (default: pbuilder)',
                  metavar='BUILDER')
+    p.add_option('-U', '--update',
+                 dest='update',
+                 default=False,
+                 action='store_true',
+                 help='Update the build environment before attempting to build')
     p.add_option('-u', '--upload',
                  dest='upload',
                  help='Specify an upload destination',
@@ -182,6 +187,11 @@
     if not builder:
         return
 
+    if opts.update:
+        if 0 != builder.update(release):
+            error('Failed to update %s chroot for %s.' % \
+                      (release, builder.get_name()))
+
     return builder.build(os.path.join(workdir,
                                       '%s_%s.dsc' % (package, bp_version)),
                          release,
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-12-16 22:43:48 +0000
+++ debian/changelog	2010-12-17 09:51:10 +0000
@@ -14,8 +14,10 @@
 
   [ Evan Broder ]
   * backportpackage: new script for testing backport requests in a PPA.
+  * sponsor-patch: Add --update option to make sure build environment is
+    up to date (LP: #689605)
 
- -- Benjamin Drung <[e-mail]>  Thu, 16 Dec 2010 23:40:14 +0100
+ -- Evan Broder <[e-mail]>  Fri, 17 Dec 2010 01:46:50 -0800
 
 ubuntu-dev-tools (0.107) experimental; urgency=low
 
 
=== modified file 'doc/backportpackage.1'
--- doc/backportpackage.1	2010-12-16 09:05:29 +0000
+++ doc/backportpackage.1	2010-12-17 09:51:10 +0000
@@ -33,6 +33,9 @@
 \fBpbuilder\fR(8) and \fBsbuild\fR(1). This overrides
 \fBUBUNTUTOOLS_BUILDER\fR. The default is \fBpbuilder\fR(8).
 .TP
+.B \-U, \-\-update
+Update the builder environment before attempting to build.
+.TP
 .B \-u \fIUPLOAD\fR, \-\-upload=\fIUPLOAD\fR
 Upload to \fIUPLOAD\fR with \fBdput\fR(1) (after confirmation).
 .TP
 
=== modified file 'doc/sponsor-patch.1'
--- doc/sponsor-patch.1	2010-12-16 22:43:48 +0000
+++ doc/sponsor-patch.1	2010-12-17 09:51:10 +0000
@@ -77,6 +77,9 @@
 .B \-u \fIDEST\fR, \fB\-\-upload\fR=\fIDEST
 Upload to \fIDEST\fR with \fBdput\fR(1) (after confirmation).
 .TP
+.BR \-U ", " \-\-update
+Make sure the build environment is up to date before building.
+.TP
 .BR \-v ", " \-\-verbose
 Print more information.
 .TP
 
=== modified file 'sponsor-patch'
--- sponsor-patch	2010-12-13 03:45:52 +0000
+++ sponsor-patch	2010-12-17 09:51:10 +0000
@@ -409,8 +409,8 @@
                 edit = True
     return edit
 
-def main(script_name, bug_number, build, edit, keyid, upload, workdir, builder,
-         verbose=False):
+def main(script_name, bug_number, update, build, edit, keyid, upload, workdir,
+         builder, verbose=False):
     workdir = os.path.expanduser(workdir)
     if not os.path.isdir(workdir):
         try:
@@ -598,6 +598,15 @@
                 continue
 
         if build:
+            if update:
+                ret = builder.update()
+                if ret != 0:
+                    Logger.error("Failed to update %s chroot for %s." % \
+                                     (changelog.distributions,
+                                      builder.get_name()))
+                    ask_for_manual_fixing()
+                    continue
+
             buildresult = os.path.join(workdir, task.package + "-buildresult")
             if not os.path.isdir(buildresult):
                 os.makedirs(buildresult)
@@ -706,6 +715,9 @@
                       dest="sponsoring", action="store_true", default=False)
     parser.add_option("-u", "--upload", dest="upload", default=None,
                       help="Specify an upload destination (default none).")
+    parser.add_option("-U", "--update", dest="update", default=False,
+                      action="store_true",
+                      help="Update builder chroot before building")
     parser.add_option("-v", "--verbose", help="print more information",
                       dest="verbose", action="store_true", default=False)
     parser.add_option("-w", "--workdir", dest="workdir",
@@ -737,5 +749,6 @@
         options.build = True
         options.upload = "ubuntu"
 
-    main(script_name, bug_number, options.build, options.edit, options.keyid,
-         options.upload, options.workdir, builder, options.verbose)
+    main(script_name, bug_number, options.update, options.build, options.edit,
+         options.keyid, options.upload, options.workdir, builder,
+         options.verbose)
 
=== modified file 'ubuntutools/builder.py'
--- ubuntutools/builder.py	2010-12-13 04:20:40 +0000
+++ ubuntutools/builder.py	2010-12-17 09:51:10 +0000
@@ -50,6 +50,11 @@
         Logger.command(cmd)
         return subprocess.call(cmd)
 
+    def update(self, dist):
+        cmd = ["sudo", "-E", "DIST=" + dist, "pbuilder", "--update"]
+        Logger.command(cmd)
+        return subprocess.call(cmd)
+
 
 class Sbuild(Builder):
     def __init__(self):
@@ -67,6 +72,36 @@
         os.chdir(workdir)
         return result
 
+    def update(self, dist):
+        cmd = ["schroot", "--list"]
+        Logger.command(cmd)
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+        chroots, _ = p.communicate()
+        chroots = chroots.strip().split()
+        if p.returncode != 0:
+            return p.returncode
+
+        params = {"dist": dist,
+                  "arch": self.architecture}
+        for chroot in ("%(dist)s-%(arch)s-sbuild-source",
+                       "%(dist)s-sbuild-source",
+                       "%(dist)s-%(arch)s-source",
+                       "%(dist)s-source"):
+            chroot = chroot % params
+            if chroot in chroots:
+                break
+        else:
+            return 1
+
+        commands = [["sbuild-update"],
+                    ["sbuild-distupgrade"],
+                    ["sbuild-clean", "-a", "-c"]]
+        for cmd in commands:
+            Logger.command(cmd + [chroot])
+            ret = subprocess.call(cmd + [chroot])
+            if ret != 0:
+                return ret
+
 
 def getBuilder(builder=None):
     if not builder: