import "osc aggregate --nosources" feature, implemented by brook.hong@nokia.com

NEWS

@@ -1,4 +1,8 @@
 0.129
+#
+# Feature which requires OBS 2.1
+#
+  - add "osc aggregate --nosources" option
 
 0.128
   - better default commands selection for editor/pager

osc/commandline.py

@@ -1881,6 +1881,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
         link_pac(src_project, src_package, dst_project, dst_package, opts.force, rev, opts.cicount, opts.disable_publish)
 
+    @cmdln.option('--nosources', action='store_true',
+                  help='ignore source packages when copying build results to destination project')
     @cmdln.option('-m', '--map-repo', metavar='SRC=TARGET[,SRC=TARGET]',
                   help='Allows repository mapping(s) to be given as SRC=TARGET[,SRC=TARGET]')
     @cmdln.option('-d', '--disable-publish', action='store_true',
@@ -1929,7 +1931,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                     raise oscerr.WrongOptions('map "%s" must be SRC=TARGET[,SRC=TARGET]' % opts.map_repo)
                 repo_map[src_tgt[0]] = src_tgt[1]
 
-        aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map, opts.disable_publish)
+        aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map, opts.disable_publish, opts.nosources)
 
 
     @cmdln.option('-c', '--client-side-copy', action='store_true',

osc/core.py

@@ -3414,7 +3414,7 @@ def link_pac(src_project, src_package, dst_project, dst_package, force, rev='',
     http_PUT(u, data=link_template)
     print 'Done.'
 
-def aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map = {}, disable_publish = False):
+def aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map = {}, disable_publish = False, nosources = False):
     """
     aggregate package
      - "src" is the original package
@@ -3466,9 +3466,15 @@ def aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map =
 
     aggregate_template += """\
     <package>%s</package>
+""" % ( src_package)
+    if nosources:
+        aggregate_template += """\
+    <nosources />
+"""
+    aggregate_template += """\
   </aggregate>
 </aggregatelist>
-""" % ( src_package)
+"""
 
     u = makeurl(conf.config['apiurl'], ['source', dst_project, dst_package, '_aggregate'])
     http_PUT(u, data=aggregate_template)