Merge lp:~torkvemada/quickly/packageextras into lp:quickly

[Vsevolod Velichko]

'quickly release' option that will package for ppa as for 'extras'

[Didier Roche-Tolomelli (didrocks)]

As discussde on IRC, I think this should be in quickly share --extra to test the extra repository integration there, not in release.

review: Needs Fixing

[lp:~torkvemada/quickly/packageextras]

677. By Vsevolod Velichko on 2012-07-24

Move --extras packaging to share rather than to release command

[Didier Roche-Tolomelli (didrocks)]

Thanks for your work here! Merging :)

review: Approve

=== modified file 'data/templates/ubuntu-application/share.py'
--- data/templates/ubuntu-application/share.py	2011-07-22 10:47:34 +0000
+++ data/templates/ubuntu-application/share.py	2012-07-24 10:26:53 +0000
@@ -33,14 +33,15 @@
 
 launchpad = None
 ppa_name = None
+for_extras = False
 i = 0
 args = []
 argv = sys.argv
 
-options = ["--ppa",]
+options = ["--ppa", "--extras",]
 
 def usage():
-    templatetools.print_usage(_('quickly share [--ppa <ppa | group/ppa>]'))
+    templatetools.print_usage(_('quickly share [--extras] [--ppa <ppa | group/ppa>]'))
 def help():
     print _("""Updates your PPA with the the latest saved project changes.
 
@@ -57,6 +58,9 @@
 the package three times since then, another run of 'quickly share' will
 use a new version of 10.07.2-public4.
 
+Passing --extras will create a package similar to one created by
+the "quickly package --extras" command.  It will install files into /opt.
+
 You can optionally run 'quickly package' and test your package to make
 sure it installs as expected.""")
 def shell_completion(argv):
@@ -84,6 +88,8 @@
             else:
                 cmd = commands.get_command('share', 'ubuntu-application')
                 templatetools.usage_error(_("No PPA provided."), cmd=cmd)
+        elif arg == '--extras':
+            for_extras = True
         else:
             cmd = commands.get_command('share', 'ubuntu-application')
             templatetools.usage_error(_("Unknown option: %s."  % arg), cmd=cmd)
@@ -148,7 +154,7 @@
     sys.exit(1)
 
 # creation/update debian packaging
-return_code = packaging.updatepackaging()
+return_code = packaging.updatepackaging(installopt=for_extras)
 if return_code != 0:
     print _("ERROR: can't create or update ubuntu package")
     sys.exit(1)