← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~lamont/launchpad/lp-buildd-74 into lp:launchpad/devel

 

LaMont Jones has proposed merging lp:~lamont/launchpad/lp-buildd-74 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


rev 74 of launchpad-buildd
-- 
https://code.launchpad.net/~lamont/launchpad/lp-buildd-74/+merge/41618
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lamont/launchpad/lp-buildd-74 into lp:launchpad/devel.
=== modified file 'lib/canonical/buildd/binarypackage.py'
--- lib/canonical/buildd/binarypackage.py	2010-11-10 19:02:29 +0000
+++ lib/canonical/buildd/binarypackage.py	2010-11-23 16:11:44 +0000
@@ -25,7 +25,8 @@
         ("(?P<pk>[\-+.\w]+)\(inst [^ ]+ ! >> wanted (?P<v>[\-.+\w:~]+)\)","\g<pk> (>> \g<v>)"),
         ("(?P<pk>[\-+.\w]+)\(inst [^ ]+ ! >?= wanted (?P<v>[\-.+\w:~]+)\)","\g<pk> (>= \g<v>)"),
         ("(?s)^E: Couldn't find package (?P<pk>[\-+.\w]+)(?!.*^E: Couldn't find package)","\g<pk>"),
-        ("(?s)^E: Package (?P<pk>[\-+.\w]+) has no installation candidate(?!.*^E: Package)","\g<pk>"),
+        ("(?s)^E: Package '?(?P<pk>[\-+.\w]+)'? has no installation candidate(?!.*^E: Package)","\g<pk>"),
+        ("(?s)^E: Unable to locate package (?P<pk>[\-+.\w]+)(?!.*^E: Unable to locate package)", "\g<pk>"),
         ]
 
 

=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2010-10-21 13:09:37 +0000
+++ lib/canonical/buildd/debian/changelog	2010-11-23 16:11:44 +0000
@@ -1,3 +1,22 @@
+launchpad-buildd (74) hardy-cat; urgency=low
+
+  [ Aaron Bentley]
+  * Memory-limit recipe builds. LP#676657
+
+  [ LaMont Jones]
+  * mount a tmpfs on /dev/shm in build chroots.  LP#671441
+
+  [Michael Bienia]
+  * Update regexes used for DEPWAIT.  LP#615286
+
+ -- LaMont Jones <lamont@xxxxxxxxxxxxx>  Tue, 23 Nov 2010 06:17:57 -0700
+
+launchpad-buildd (73) hardy-cat; urgency=low
+
+  * Revert to revision 70
+
+ -- LaMont Jones <lamont@xxxxxxxxxxxxx>  Thu, 28 Oct 2010 12:53:45 -0600
+
 launchpad-buildd (72) hardy-cat; urgency=low
 
   * break out readyservice.py from tachandler.py. LP#663828

=== modified file 'lib/canonical/buildd/mount-chroot'
--- lib/canonical/buildd/mount-chroot	2009-12-16 00:16:24 +0000
+++ lib/canonical/buildd/mount-chroot	2010-11-23 16:11:44 +0000
@@ -23,4 +23,5 @@
 $SUDO mount -t proc none "$HOME/build-$BUILDID/chroot-autobuild/proc"
 $SUDO mount -t devpts none "$HOME/build-$BUILDID/chroot-autobuild/dev/pts"
 $SUDO mount -t sysfs none "$HOME/build-$BUILDID/chroot-autobuild/sys"
+$SUDO mount -t tmpfs none "$HOME/build-$BUILDID/chroot-autobuild/dev/shm"
 $SUDO cp /etc/hosts /etc/hostname /etc/resolv.conf $HOME/build-$BUILDID/chroot-autobuild/etc/

=== modified file 'lib/canonical/buildd/umount-chroot'
--- lib/canonical/buildd/umount-chroot	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/umount-chroot	2010-11-23 16:11:44 +0000
@@ -27,5 +27,6 @@
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/dev/pts"
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/home/buildd/.ccache"
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/var/cache/apt/archives"
+#$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/dev/shm"
 $GREP "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts | \
       $CUT -d\  -f2 | $XARGS -r -n 1 $SUDO umount