Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-09-07 00:01:02 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2019-09-07 00:01:02 +0300
commitce760fa1aeb391aeb0f79a1ee3e765e8e263a527 (patch)
tree3cbcc69512c91f23799084d0720c553eafabeaaa
parent4d6baa589f3466f6bff5fa537ac99c1f48d77130 (diff)
Fix error reporting when package exists at diferent paths
-rwxr-xr-xcalm/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/calm/package.py b/calm/package.py
index 842bb31..d100044 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1215,7 +1215,7 @@ def merge(a, *l):
else:
# package must exist at same relative path
if c[p].pkgpath != b[p].pkgpath:
- logging.error("package '%s' is at paths %s and %s" % (p, c[p].path, b[p].path))
+ logging.error("package '%s' is at paths %s and %s" % (p, c[p].pkgpath, b[p].pkgpath))
return None
else:
for vr in b[p].tars: