Merge lp:~cjwatson/launchpad-buildd/xenial-sbuild-compat into lp:launchpad-buildd

[Colin Watson]

Fix sbuildrc compatibility with xenial's sbuild.

[William Grant (wgrant)]

I trust your Perl.

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2019-12-16 21:48:09 +0000
+++ debian/changelog	2019-12-18 22:37:16 +0000
@@ -1,3 +1,9 @@
+launchpad-buildd (186) UNRELEASED; urgency=medium
+
+  * Fix sbuildrc compatibility with xenial's sbuild.
+
+ -- Colin Watson <[e-mail]>  Wed, 18 Dec 2019 22:34:45 +0000
+
 launchpad-buildd (185) xenial; urgency=medium
 
   [ Dimitri John Ledkov ]
 
=== modified file 'sbuildrc'
--- sbuildrc	2019-12-09 11:03:15 +0000
+++ sbuildrc	2019-12-18 22:37:16 +0000
@@ -47,6 +47,11 @@
 
 # Disable some interactive niceties.
 $run_lintian = 0;
-$bd_uninstallable_explainer = '';
+# $bd_uninstallable_explainer isn't a defined variable in xenial's sbuild,
+# so disable strictness.
+{
+    no strict 'vars';
+    $bd_uninstallable_explainer = '';
+}
 
 $sbuild_mode="buildd";