[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-56-g26ece0f

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-56-g26ece0f

[jturney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=26ece0fb8604df395679003a08327667aff28011

commit 26ece0fb8604df395679003a08327667aff28011
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Sep 7 15:57:27 2019 +0100

    Disable testing of replacement hint upload
    
    Since e10575b0, uploading of a replacement hint only is broken.
    
    Disable the test of that, for the moment, so we will notice any other
    test failures.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=ce760fa1aeb391aeb0f79a1ee3e765e8e263a527

commit ce760fa1aeb391aeb0f79a1ee3e765e8e263a527
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Sep 6 22:01:02 2019 +0100

    Fix error reporting when package exists at diferent paths


Diff:
---
 calm/package.py                               |    2 +-
 test/testdata/process_arch/setup.ini.expected |    8 ++++----
 2 files changed, 5 insertions(+), 5 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:
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index e64b7de..5ec1b8e 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -253,16 +253,16 @@
  'depends2: base-cygwin\n'
  '\n'
  '@ per-version-replacement-hint-only\n'
- 'sdesc: "Replacement per-version hint test package - updated"\n'
- 'ldesc: "Replacement per-version hint test package - updated"\n'
+ 'sdesc: "Per-version hint test package"\n'
+ 'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
- 'requires: base-cygwin per-version\n'
+ 'requires: cygwin\n'
  'version: 1.0-1\n'
  'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
  'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends2: base-cygwin, per-version\n'
+ 'depends2: cygwin\n'
  '\n'
  '@ perl-Net-SMTP-SSL\n'
  'sdesc: "Perl distribution Net-SMTP-SSL"\n'