mirror of
https://github.com/openSUSE/osc.git
synced 2025-01-27 07:06:13 +01:00
new packages gets checked out expanded when using "osc up -e" in project
directory now.
This commit is contained in:
parent
d2c9b0707d
commit
2a180fa346
@ -1793,7 +1793,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()
|
||||
prj.checkout_missing_pacs(opts.expand_link)
|
||||
args.remove(arg)
|
||||
|
||||
args.sort()
|
||||
|
@ -302,7 +302,7 @@ class Project:
|
||||
|
||||
self.pacs_missing = [ i for i in self.pacs_available if i not in self.pacs_have ]
|
||||
|
||||
def checkout_missing_pacs(self):
|
||||
def checkout_missing_pacs(self, expand_link=False):
|
||||
for pac in self.pacs_missing:
|
||||
|
||||
if conf.config['do_package_tracking'] and pac in self.pacs_unvers:
|
||||
@ -313,7 +313,7 @@ class Project:
|
||||
print 'checking out new package %s' % pac
|
||||
checkout_package(self.apiurl, self.name, pac, \
|
||||
pathname=getTransActPath(os.path.join(self.dir, pac)), \
|
||||
prj_obj=self, prj_dir=self.dir)
|
||||
prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
|
||||
|
||||
def set_state(self, pac, state):
|
||||
node = self.get_package_node(pac)
|
||||
@ -448,7 +448,7 @@ 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)
|
||||
pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
|
||||
elif state == ' ':
|
||||
# do a simple update
|
||||
p = Package(os.path.join(self.dir, pac))
|
||||
@ -467,7 +467,7 @@ class Project:
|
||||
# TODO: Package::update has to fixed to behave like svn does
|
||||
if pac in self.pacs_broken:
|
||||
checkout_package(self.apiurl, self.name, pac,
|
||||
pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir)
|
||||
pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
|
||||
else:
|
||||
Package(os.path.join(self.dir, pac)).update()
|
||||
elif state == 'A' and pac in self.pacs_available:
|
||||
|
Loading…
Reference in New Issue
Block a user