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

- default to expanded for new packages in osc up, like we do in osc co

Browse Source
This commit is contained in:
Michael Schroeder 2010-01-21 14:47:04 +01:00
parent 151b9b699d
commit b821c2ed6d
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -2390,7 +2390,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# (a) update all packages
args += prj.pacs_have
# (b) fetch new packages
prj.checkout_missing_pacs(opts.expand_link)
prj.checkout_missing_pacs(expand_link = not opts.unexpand_link)
args.remove(arg)
print_request_list(prj.apiurl, prj.name)

15
osc/core.py
View File

@ -509,13 +509,20 @@ class Project:
if pac in self.pacs_broken:
if self.get_state(pac) != 'A':
checkout_package(self.apiurl, self.name, pac,
pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=not unexpand_link)
elif state == ' ':
# do a simple update
p = Package(os.path.join(self.dir, pac))
rev = None
if expand_link and p.islink() and not p.isexpanded():
rev = p.linkinfo.xsrcmd5
if p.haslinkerror():
try:
rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev)
except:
rev = show_upstream_xsrcmd5(p.apiurl, p.prjname, p.name, revision=p.rev, linkrev="base")
p.mark_frozen()
else:
rev = p.linkinfo.xsrcmd5
print 'Expanding to rev', rev
elif unexpand_link and p.islink() and p.isexpanded():
rev = p.linkinfo.lsrcmd5
@ -524,6 +531,8 @@ class Project:
rev = p.latest_rev()
print 'Updating %s' % p.name
p.update(rev, service_files)
if unexpand_link:
p.unmark_frozen()
elif state == 'D':
# TODO: Package::update has to fixed to behave like svn does
if pac in self.pacs_broken:
@ -541,7 +550,7 @@ class Project:
else:
print 'unexpected state.. package \'%s\'' % pac
self.checkout_missing_pacs()
self.checkout_missing_pacs(expand_link=not unexpand_link)
finally:
self.write_packages()