summaryrefslogtreecommitdiff
diff options
authorMichael Vogt <mvo@ubuntu.com>2018-05-25 15:13:48 +0200
committerMichael Vogt <mvo@ubuntu.com>2018-05-25 15:13:51 +0200
commite613f0a7bb41edea50315198c6aa6d9e0b3a1cae (patch)
treedbd895604d0408fd92c01fa242ddc46e6c7a8bf2
parent9a6934d47a37c88510fee7eb6f1e14e5ba210906 (diff)
snapcraft: use dpkg-buildpackage options that work in xenialsnapcraft-xenial-fixes
The code used to use "--no-sign" however this is not yet available in xenial so we need to use something compatible.
-rw-r--r--parts/plugins/x_builddeb.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/parts/plugins/x_builddeb.py b/parts/plugins/x_builddeb.py
index ecef6126be..583e12f509 100644
--- a/parts/plugins/x_builddeb.py
+++ b/parts/plugins/x_builddeb.py
@@ -33,8 +33,9 @@ class XBuildDeb(snapcraft.BasePlugin):
self.run(["sudo", "apt-get", "build-dep", "-y", "./"])
# XXX: get this from "debian/gbp.conf:postexport"
self.run(["./get-deps.sh"])
- # run the real build
- self.run(["dpkg-buildpackage", "--no-sign"])
+ # run the real build, -ptrue means run "true" to sign the package.
+ # Newer dpkg-buildpackage has "--no-sign" but not the xenial version
+ self.run(["dpkg-buildpackage", "-ptrue"])
# and "install" into the right place
snapd_deb = glob.glob("../snapd_*.deb")[0]
self.run(["dpkg-deb", "-x", os.path.abspath(snapd_deb), self.installdir])