mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-11 05:23:48 +01:00
Code

Merge branch 'fix_bsc#1012592' of https://github.com/lethliel/osc

Browse Source
This commit is contained in:
Marcus Huewe 2017-02-08 14:30:55 +01:00
commit 9e6d1a592e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc/core.py
View File

@ -4799,16 +4799,19 @@ def checkout_package(apiurl, project, package,
# if project roots were previously inconsistent # if project roots were previously inconsistent
root_dots = "../../" root_dots = "../../"
if is_project_dir(root_dots): if is_project_dir(root_dots):
oldproj = store_read_project(root_dots)
if conf.config['checkout_no_colon']: if conf.config['checkout_no_colon']:
oldproj = store_read_project(root_dots)
n = len(oldproj.split(':')) n = len(oldproj.split(':'))
else: else:
n = 1 n = 1
if root_dots == '.':
root_dots = ''
root_dots = root_dots + "../" * n root_dots = root_dots + "../" * n
if root_dots != '.': if root_dots != '.':
if conf.config['verbose']: 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 prj_dir = root_dots + prj_dir
if not pathname: if not pathname: