mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-11 16:36:14 +01:00
Code

fixed osc co proj pack file, which took great effort in following a link

Browse Source 
without applying a project.diff -- now it merges correctly.
This commit is contained in:
Juergen Weigert 2011-03-08 18:48:00 +01:00
parent e8aa7df530
commit 4a3a071c41
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osc/commandline.py
View File

@ -2971,22 +2971,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
sys.exit(1)
if filename:
link_seen = False
# Note: this logic should follow the `osc ls' logic
# Note: same logic as with 'osc cat' (not 'osc ls', which never merges!)
if expand_link:
l = meta_get_filelist(apiurl,
project,
package,
expand=False,
revision=rev)
link_seen = '_link' in l
if link_seen:
m = show_files_meta(apiurl, project, package)
li = Linkinfo()
li.read(ET.fromstring(''.join(m)).find('linkinfo'))
if li.haserror():
raise oscerr.LinkExpandError(project, package, li.error)
project, package, rev = li.project, li.package, li.rev
rev = show_upstream_srcmd5(apiurl, project, package, expand=True, revision=rev)
get_source_file(apiurl, project, package, filename, revision=rev, progress_obj=self.download_progress)
elif package: