launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/dynamic-hostname into lp:launchpad-buildd.

Commit message:
Calculate the FQDN dynamically in sbuildrc rather than substituting it in from the postinst.  This is friendlier to scalingstack, where a single image is used for multiple guests.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/dynamic-hostname/+merge/226414

Calculate the FQDN dynamically in sbuildrc rather than substituting it in from the postinst.  This is friendlier to scalingstack, where a single image is used for multiple guests.

Note that we can't land this in production until https://code.launchpad.net/~cjwatson/canonical-is-puppet/ppa-sbuild-safety/+merge/226268 has been landed.
-- 
https://code.launchpad.net/~cjwatson/launchpad-buildd/dynamic-hostname/+merge/226414
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/dynamic-hostname into lp:launchpad-buildd.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 15:25:47 +0000
+++ debian/changelog	2014-07-11 08:04:43 +0000
@@ -1,3 +1,11 @@
+launchpad-buildd (125) UNRELEASED; urgency=medium
+
+  * Calculate the FQDN dynamically in sbuildrc rather than substituting it
+    in from the postinst.  This is friendlier to scalingstack, where a
+    single image is used for multiple guests.
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Thu, 10 Jul 2014 11:19:41 +0100
+
 launchpad-buildd (124) hardy; urgency=medium
 
   [ Adam Conrad ]

=== modified file 'debian/postinst'
--- debian/postinst	2014-06-25 01:50:28 +0000
+++ debian/postinst	2014-07-11 08:04:43 +0000
@@ -57,7 +57,6 @@
 		/home/${USER}/.lp-sbuildrc.tmp
 	    cd /home/${USER}
 	    sed -e's/@ARCHTAG@/'$(dpkg --print-architecture)'/g' \
-		-e's/@FQDN@/'$(hostname --fqdn)'/g' \
 		< .lp-sbuildrc.tmp > .lp-sbuildrc
 	    chown $USER:buildd .lp-sbuildrc
 	    chmod 0644 .lp-sbuildrc

=== modified file 'sbuildrc'
--- sbuildrc	2011-11-09 07:50:56 +0000
+++ sbuildrc	2014-07-11 08:04:43 +0000
@@ -9,7 +9,9 @@
 $arch="@ARCHTAG@";
 
 # Maintainer name to use in .changes files (mandatory, no default!)
-$maintainer_name="Ubuntu Build Daemon <buildd\@@FQDN@>";
+$fqdn=`hostname --fqdn`;
+chomp $fqdn;
+$maintainer_name="Ubuntu Build Daemon <buildd\@$fqdn>";
 
 # When to purge the build directory afterwards; possible values are
 # "never", "successful", and "always"