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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 410
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~cjwatson/launchpad-buildd/xenial-sbuild-compat
Merge into: lp:launchpad-buildd
Diff against target: 30 lines (+12/-1)
2 files modified
debian/changelog (+6/-0)
sbuildrc (+6/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/xenial-sbuild-compat
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+376974@code.launchpad.net

Commit message

Fix sbuildrc compatibility with xenial's sbuild.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

I trust your Perl.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2019-12-16 21:48:09 +0000
3+++ debian/changelog 2019-12-18 22:37:16 +0000
4@@ -1,3 +1,9 @@
5+launchpad-buildd (186) UNRELEASED; urgency=medium
6+
7+ * Fix sbuildrc compatibility with xenial's sbuild.
8+
9+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 18 Dec 2019 22:34:45 +0000
10+
11 launchpad-buildd (185) xenial; urgency=medium
12
13 [ Dimitri John Ledkov ]
14
15=== modified file 'sbuildrc'
16--- sbuildrc 2019-12-09 11:03:15 +0000
17+++ sbuildrc 2019-12-18 22:37:16 +0000
18@@ -47,6 +47,11 @@
19
20 # Disable some interactive niceties.
21 $run_lintian = 0;
22-$bd_uninstallable_explainer = '';
23+# $bd_uninstallable_explainer isn't a defined variable in xenial's sbuild,
24+# so disable strictness.
25+{
26+ no strict 'vars';
27+ $bd_uninstallable_explainer = '';
28+}
29
30 $sbuild_mode="buildd";

Subscribers

People subscribed via source and target branches

to all changes: