Control: tag -1 patch
Hi Apollon & Java team,
Lucas Nussbaum <lu...@debian.org> (2017-10-30):
> Relevant part (hopefully):
> > at clojure.lang.Var.applyTo(Var.java:700)
> > at clojure.main.main(main.java:37)
> > Caused by: java.io.IOException: No such file or directory
> > at java.io.UnixFileSystem.createFileExclusively(Native Method)
> > at java.io.File.createNewFile(File.java:1012)
> > at me.raynes.fs$create.invokeStatic(fs.clj:283)
> > at me.raynes.fs$create.invoke(fs.clj:280)
> > at me.raynes.fs$touch.invokeStatic(fs.clj:412)
> > at me.raynes.fs$touch.doInvoke(fs.clj:408)
> > at clojure.lang.RestFn.invoke(RestFn.java:410)
> > at
> > puppetlabs.trapperkeeper.testutils.bootstrap$eval24901.invokeStatic(bootstrap.clj:11)
> > at
> > puppetlabs.trapperkeeper.testutils.bootstrap$eval24901.invoke(bootstrap.clj:11)
> > at clojure.lang.Compiler.eval(Compiler.java:6927)
> > at clojure.lang.Compiler.load(Compiler.java:7379)
> > ... 42 more
> > debian/rules:44: recipe for target 'override_dh_auto_test' failed
It was a bit curious at first since I couldn't reproduce it in my sid
amd64 devel chroot, but could in my sid amd64 sbuild chroot… Checking
strace's output, it seemed like it might be that some leftover from a
previous test might have been missing:
[…]/test/./target/empty.ini
so I've tried sorting the tests to run, and I've got a reproducible
success, both inside devel & sbuild chroots.
You'll find attached two patches: one for the FTBFS, one for the Vcs-*
fields.
I can upload an NMU and/or push those to git if you give me permission
on salsa (username = kibi), or prepare a merge request; whatever works
for you. :)
Cheers,
--
Cyril Brulebois (k...@debian.org) <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
From 60a00eebb3574ebdb81df7615f8948bd3ccdbc7f Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <k...@debian.org> Date: Fri, 28 Dec 2018 07:32:16 +0100 Subject: [PATCH 1/2] Fix/work around FTBFS by running tests in order (Closes: #880351). --- debian/changelog | 9 +++++++++ debian/rules | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c2f0797..00e501a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +trapperkeeper-status-clojure (0.7.1-2) UNRELEASED; urgency=medium + + * Insert a “sort” call between the find and the xargs calls in the + dh_auto_test override: tests are apparently picky about who ran + before who, which can lead to ENOENT depending on find's output, + triggering an FTBFS (Closes: #880351). + + -- Cyril Brulebois <k...@debian.org> Fri, 28 Dec 2018 07:30:02 +0100 + trapperkeeper-status-clojure (0.7.1-1) unstable; urgency=medium * Initial release (Closes: #855744) diff --git a/debian/rules b/debian/rules index 0b9cb2c..d7e758c 100755 --- a/debian/rules +++ b/debian/rules @@ -41,5 +41,6 @@ override_jh_clean: cat debian/footer.html >> $@ override_dh_auto_test: - (cd test && find . -name "*.clj" | \ + # Make sure to run tests in order, to avoid ENOENT issues (#880351): + (cd test && find . -name "*.clj" | LC_ALL=C sort | \ xargs --verbose clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH)) -- 2.20.1
From d2e8c9340e2a4a95314ef9bdba4bbe74cd1128e1 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <k...@debian.org>
Date: Fri, 28 Dec 2018 07:34:17 +0100
Subject: [PATCH 2/2] Update Vcs-{Browser,Git} to point to salsa (alioth's
replacement).
---
debian/changelog | 1 +
debian/control | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 00e501a..48f98ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ trapperkeeper-status-clojure (0.7.1-2) UNRELEASED; urgency=medium
dh_auto_test override: tests are apparently picky about who ran
before who, which can lead to ENOENT depending on find's output,
triggering an FTBFS (Closes: #880351).
+ * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
-- Cyril Brulebois <k...@debian.org> Fri, 28 Dec 2018 07:30:02 +0100
diff --git a/debian/control b/debian/control
index ec4a21b..0d1df05 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,8 @@ Build-Depends:
libtext-markdown-perl | markdown,
default-jdk
Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/trapperkeeper-status-clojure.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/trapperkeeper-status-clojure.git
+Vcs-Git: https://salsa.debian.org/java-team/trapperkeeper-status-clojure
+Vcs-Browser: https://salsa.debian.org/java-team/trapperkeeper-status-clojure
Homepage: https://github.com/puppetlabs/trapperkeeper-status
Package: libtrapperkeeper-status-clojure
--
2.20.1
signature.asc
Description: PGP signature
