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

Merge branch 'update-default-behaviour' of https://github.com/Ericsson/osc

Browse Source
This commit is contained in:
Marcus Huewe 2016-11-18 12:20:53 +01:00
commit ac99d54440
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

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

21
osc/core.py
View File

@ -683,18 +683,31 @@ class Project:
store_write_apiurl(self.dir, apiurl) store_write_apiurl(self.dir, apiurl)
self.apiurl = store_read_apiurl(self.dir, defaulturl=False) self.apiurl = store_read_apiurl(self.dir, defaulturl=False)
def checkout_missing_pacs(self, expand_link=False): def checkout_missing_pacs(self, expand_link=False, unexpand_link=False):
for pac in self.pacs_missing: for pac in self.pacs_missing:
if conf.config['do_package_tracking'] and pac in self.pacs_unvers: if conf.config['do_package_tracking'] and pac in self.pacs_unvers:
# pac is not under version control but a local file/dir exists # pac is not under version control but a local file/dir exists
msg = 'can\'t add package \'%s\': Object already exists' % pac msg = 'can\'t add package \'%s\': Object already exists' % pac
raise oscerr.PackageExists(self.name, pac, msg) raise oscerr.PackageExists(self.name, pac, msg)
else:
if not (expand_link or unexpand_link):
try:
m = show_files_meta(self.apiurl, self.name, pac)
li = Linkinfo()
li.read(ET.fromstring(''.join(m)).find('linkinfo'))
if not li.haserror():
if li.project == self.name:
print('Skipping local linked package %s' % pac)
continue
except:
pass
print('checking out new package %s' % pac) print('checking out new package %s' % pac)
checkout_package(self.apiurl, self.name, pac, \ checkout_package(self.apiurl, self.name, pac, \
pathname=getTransActPath(os.path.join(self.dir, pac)), \ pathname=getTransActPath(os.path.join(self.dir, pac)), \
prj_obj=self, prj_dir=self.dir, expand_link=expand_link, progress_obj=self.progress_obj) prj_obj=self, prj_dir=self.dir,
expand_link=expand_link or not unexpand_link, progress_obj=self.progress_obj)
def status(self, pac): def status(self, pac):
exists = os.path.exists(os.path.join(self.absdir, pac)) exists = os.path.exists(os.path.join(self.absdir, pac))
@ -930,7 +943,7 @@ class Project:
else: else:
print('unexpected state.. package \'%s\'' % pac) print('unexpected state.. package \'%s\'' % pac)
self.checkout_missing_pacs(expand_link=not unexpand_link) self.checkout_missing_pacs(expand_link, unexpand_link)
finally: finally:
self.write_packages() self.write_packages()