Merge lp:~lamont/launchpad/lp-buildd-517802 into lp:launchpad/db-devel

Proposed by LaMont Jones
Status: Rejected
Rejected by: Brad Crittenden
Proposed branch: lp:~lamont/launchpad/lp-buildd-517802
Merge into: lp:launchpad/db-devel
Diff against target: 25 lines (+8/-0)
2 files modified
lib/canonical/buildd/debian/changelog (+6/-0)
lib/canonical/buildd/sbuild (+2/-0)
To merge this branch: bzr merge lp:~lamont/launchpad/lp-buildd-517802
Reviewer Review Type Date Requested Status
LaMont Jones (community) Disapprove
Graham Binns (community) code Approve
Review via email: mp+20644@code.launchpad.net

Description of the change

This change is required for sbuild on karmic and later.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)
Revision history for this message
LaMont Jones (lamont) wrote :

Fixed in this commit by correcting the initscript (more than just sbuild needed the umask to be set):

------------------------------------------------------------
revno: 10774 [merge]
committer: Launchpad Patch Queue Manager <email address hidden>
branch nick: launchpad
timestamp: Fri 2010-04-23 15:33:29 +0100
message:
  [r=noodles][ui=None] Updates the buildd to work on pre-karmic
        releases (sets umask) and adds Depends on lsb-release. Branch
        from LaMont Jones.
------------------------------------------------------------

review: Disapprove

Unmerged revisions

10428. By LaMont Jones

[bug=517802]sbuild needs to explicitly set umask

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog 2010-01-14 21:05:08 +0000
+++ lib/canonical/buildd/debian/changelog 2010-03-04 12:30:50 +0000
@@ -1,3 +1,9 @@
1launchpad-buildd (58~2) hardy-cat; urgency=low
2
3 * sbuild needs to explicitly set umask. LP#517802
4
5 -- LaMont Jones <lamont@canonical.com> Thu, 04 Mar 2010 05:20:18 -0700
6
1launchpad-buildd (58~1) karmic; urgency=low7launchpad-buildd (58~1) karmic; urgency=low
28
3 * Misc fixes to match APIs.9 * Misc fixes to match APIs.
410
=== modified file 'lib/canonical/buildd/sbuild'
--- lib/canonical/buildd/sbuild 2009-12-15 00:19:56 +0000
+++ lib/canonical/buildd/sbuild 2010-03-04 12:30:50 +0000
@@ -540,6 +540,8 @@
540$main::component="";540$main::component="";
541$main::nr_processors = $ENV{'NR_PROCESSORS'} if $ENV{'NR_PROCESSORS'};541$main::nr_processors = $ENV{'NR_PROCESSORS'} if $ENV{'NR_PROCESSORS'};
542542
543umask(022);
544
543$main::new_dpkg = 0;545$main::new_dpkg = 0;
544check_dpkg_version();546check_dpkg_version();
545547

Subscribers

People subscribed via source and target branches

to status/vote changes: