- fixed #613513 ("osc copypac to another OBS instance fails if source package uses links")

now links are always expanded if we copy across different buildservice instances

osc/commandline.py

@@ -2020,7 +2020,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         A way to copy package to somewhere else.
 
         It can be done across buildservice instances, if the -t option is used.
-        In that case, a client-side copy is implied.
+        In that case, a client-side copy and link expansion are implied.
 
         Using --client-side-copy always involves downloading all files, and
         uploading them to the target.
@@ -2055,6 +2055,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
 
         if src_apiurl != dst_apiurl:
             opts.client_side_copy = True
+            opts.expand = True
 
         rev, dummy = parseRevisionOption(opts.revision)
 

osc/core.py

@@ -3664,7 +3664,8 @@ def copy_pac(src_apiurl, src_project, src_package,
         tmpdir = tempfile.mkdtemp(prefix='osc_copypac')
         os.chdir(tmpdir)
         query = {'rev': 'upload'}
-        for n in meta_get_filelist(src_apiurl, src_project, src_package, expand=expand):
+        revision = show_upstream_srcmd5(src_apiurl, src_project, src_package, expand=expand, revision=revision)
+        for n in meta_get_filelist(src_apiurl, src_project, src_package, expand=expand, revision=revision):
             print '  ', n
             get_source_file(src_apiurl, src_project, src_package, n, targetfilename=n, revision=revision)
             u = makeurl(dst_apiurl, ['source', dst_project, dst_package, pathname2url(n)], query=query)