public inbox for
help / color / mirror / Atom feed
Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20190530-56-g26ece0f
Date: Sat, 07 Sep 2019 15:08:00 -0000	[thread overview]
Message-ID: <> (raw);h=26ece0fb8604df395679003a08327667aff28011

commit 26ece0fb8604df395679003a08327667aff28011
Author: Jon Turney <>
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.;h=ce760fa1aeb391aeb0f79a1ee3e765e8e263a527

commit ce760fa1aeb391aeb0f79a1ee3e765e8e263a527
Author: Jon Turney <>
Date:   Fri Sep 6 22:01:02 2019 +0100

    Fix error reporting when package exists at diferent paths

 calm/                               |    2 +-
 test/testdata/process_arch/setup.ini.expected |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/calm/ b/calm/
index 842bb31..d100044 100755
--- a/calm/
+++ b/calm/
@@ -1215,7 +1215,7 @@ def merge(a, *l):
                 # 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
                     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'
  '@ 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 '
  'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
- 'depends2: base-cygwin, per-version\n'
+ 'depends2: cygwin\n'
  '@ perl-Net-SMTP-SSL\n'
  'sdesc: "Perl distribution Net-SMTP-SSL"\n'

                 reply	other threads:[~2019-09-07 15:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).