1
=== modified file 'data/templates/ubuntu-application/share.py'
2
--- data/templates/ubuntu-application/share.py	2011-07-22 10:47:34 +0000
3
+++ data/templates/ubuntu-application/share.py	2012-07-24 10:26:53 +0000
4
@@ -33,14 +33,15 @@
5
33
33
6
34
launchpad = None
34
launchpad = None
7
35
ppa_name = None
35
ppa_name = None
8
36
for_extras = False
9
36
i = 0
37
i = 0
10
37
args = []
38
args = []
11
38
argv = sys.argv
39
argv = sys.argv
12
39
40
14
40
options = ["--ppa",]
41
options = ["--ppa", "--extras",]
15
41
42
16
42
def usage():
43
def usage():
18
43
    templatetools.print_usage(_('quickly share [--ppa <ppa | group/ppa>]'))
44
    templatetools.print_usage(_('quickly share [--extras] [--ppa <ppa | group/ppa>]'))
19
44
def help():
45
def help():
20
45
    print _("""Updates your PPA with the the latest saved project changes.
46
    print _("""Updates your PPA with the the latest saved project changes.
21
46
47
22
@@ -57,6 +58,9 @@
23
57
the package three times since then, another run of 'quickly share' will
58
the package three times since then, another run of 'quickly share' will
24
58
use a new version of 10.07.2-public4.
59
use a new version of 10.07.2-public4.
25
59
60
26
61
Passing --extras will create a package similar to one created by
27
62
the "quickly package --extras" command.  It will install files into /opt.
28
63
29
60
You can optionally run 'quickly package' and test your package to make
64
You can optionally run 'quickly package' and test your package to make
30
61
sure it installs as expected.""")
65
sure it installs as expected.""")
31
62
def shell_completion(argv):
66
def shell_completion(argv):
32
@@ -84,6 +88,8 @@
33
84
            else:
88
            else:
34
85
                cmd = commands.get_command('share', 'ubuntu-application')
89
                cmd = commands.get_command('share', 'ubuntu-application')
35
86
                templatetools.usage_error(_("No PPA provided."), cmd=cmd)
90
                templatetools.usage_error(_("No PPA provided."), cmd=cmd)
36
91
        elif arg == '--extras':
37
92
            for_extras = True
38
87
        else:
93
        else:
39
88
            cmd = commands.get_command('share', 'ubuntu-application')
94
            cmd = commands.get_command('share', 'ubuntu-application')
40
89
            templatetools.usage_error(_("Unknown option: %s."  % arg), cmd=cmd)
95
            templatetools.usage_error(_("Unknown option: %s."  % arg), cmd=cmd)
41
@@ -148,7 +154,7 @@
42
148
    sys.exit(1)
154
    sys.exit(1)
43
149
155
44
150
# creation/update debian packaging
156
# creation/update debian packaging
46
151
return_code = packaging.updatepackaging()
157
return_code = packaging.updatepackaging(installopt=for_extras)
47
152
if return_code != 0:
158
if return_code != 0:
48
153
    print _("ERROR: can't create or update ubuntu package")
159
    print _("ERROR: can't create or update ubuntu package")
49
154
    sys.exit(1)
160
    sys.exit(1)
Status:	Merged
Merged at revision:	682
Proposed branch:	lp:~torkvemada/quickly/packageextras
Merge into:	lp:quickly
Diff against target:	49 lines (+9/-3) 1 file modified data/templates/ubuntu-application/share.py (+9/-3)
To merge this branch:	bzr merge lp:~torkvemada/quickly/packageextras
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Didier Roche-Tolomelli		2012-07-17	Approve on 2012-08-14
Review via email: mp+115279@code.launchpad.net