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

openSUSE · Feb 8, 2017 · 9e6d1a5 · 9e6d1a5
2 parents 025ecec + 8cf89fa
commit 9e6d1a5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/osc/core.py b/osc/core.py
@@ -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: