Merge lp:~sylvain-pineau/checkbox/fix-1303742 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 4435
Merged at revision: 4436
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1303742
Merge into: lp:checkbox
Diff against target: 26 lines (+5/-0)
2 files modified
checkbox-touch/Makefile (+1/-0)
plainbox/plainbox/provider_manager.py (+4/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1303742
Reviewer Review Type Date Requested Status
Maciej Kisielewski (community) Approve
Review via email: mp+299917@code.launchpad.net

Description of the change

Fixes the linked bug

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

lgtm! +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-touch/Makefile'
2--- checkbox-touch/Makefile 2016-07-11 06:50:35 +0000
3+++ checkbox-touch/Makefile 2016-07-13 08:08:28 +0000
4@@ -35,6 +35,7 @@
5 --exclude=lib --exclude=providers \
6 --exclude=settings.json --exclude=manifest.json \
7 --exclude=checkbox-touch.desktop
8+ @gpg --armor --sign --detach-sig dist/checkbox-converged-$(VERSION).tar.gz
9
10 run:
11 /usr/bin/qmlscene $@ checkbox-touch.qml
12
13=== modified file 'plainbox/plainbox/provider_manager.py'
14--- plainbox/plainbox/provider_manager.py 2016-06-03 15:36:03 +0000
15+++ plainbox/plainbox/provider_manager.py 2016-07-13 08:08:28 +0000
16@@ -484,6 +484,10 @@
17 dst_name = os.path.join(self.toplevel_name, name)
18 if os.path.exists(src_name):
19 tarball.add(src_name, dst_name)
20+ subprocess.call(
21+ 'gpg --armor --sign --detach-sig {}.tar.gz'.format(
22+ self.toplevel_name),
23+ shell=True, cwd=self.dist_dir)
24
25
26 @docstring(

Subscribers

People subscribed via source and target branches