mirror of
https://github.com/openSUSE/osc.git
synced 2025-02-06 03:10:57 +01:00
Merge branch 'fix_bsc#1012592' of https://github.com/lethliel/osc
This commit is contained in:
commit
9e6d1a592e
@ -4799,16 +4799,19 @@ def checkout_package(apiurl, project, package,
|
||||
# if project roots were previously inconsistent
|
||||
root_dots = "../../"
|
||||
if is_project_dir(root_dots):
|
||||
oldproj = store_read_project(root_dots)
|
||||
if conf.config['checkout_no_colon']:
|
||||
oldproj = store_read_project(root_dots)
|
||||
n = len(oldproj.split(':'))
|
||||
else:
|
||||
n = 1
|
||||
if root_dots == '.':
|
||||
root_dots = ''
|
||||
root_dots = root_dots + "../" * n
|
||||
|
||||
if root_dots != '.':
|
||||
if conf.config['verbose']:
|
||||
print("found root of %s at %s" % (oldproj, root_dots))
|
||||
print("%s is project dir of %s. Root found at %s" %
|
||||
(prj_dir, oldproj, os.path.abspath(root_dots)))
|
||||
prj_dir = root_dots + prj_dir
|
||||
|
||||
if not pathname:
|
||||
|
Loading…
x
Reference in New Issue
Block a user