[pacman-contrib] [PATCH 1/2] Fix manpages showing the version as the date
--- doc/asciidoc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 68ab5b8..0d2ea98 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_contrib_version}</date> +<date>{pacman_contrib_date}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> -- 2.15.0
In commit 42181f85c44de29d40642aeed897e030f30e0559 the pacsort testsuite was migrated from the pacman codebase, and the PMTEST_UTIL_DIR variable was changed to PMTEST_BIN_DIR. However, it was only changed in two of the three places it was needed, and the testsuite could not find the pacsort binary in the build tree. As a result, the tests would fail on a system that did not have a systemwide pacsort install, and would test the systemwide install if there was one available. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2b86c2c..9b06cba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,6 @@ TESTS = \ TEST_SUITE_LOG = test/test-suite.log AM_TESTS_ENVIRONMENT = \ - PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_UTIL_DIR; + PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_BIN_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh -- 2.15.0
Quoting Eli Schwartz (2017-11-13 18:14:54)
In commit 42181f85c44de29d40642aeed897e030f30e0559 the pacsort testsuite was migrated from the pacman codebase, and the PMTEST_UTIL_DIR variable was changed to PMTEST_BIN_DIR. However, it was only changed in two of the three places it was needed, and the testsuite could not find the pacsort binary in the build tree.
As a result, the tests would fail on a system that did not have a systemwide pacsort install, and would test the systemwide install if there was one available. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am index 2b86c2c..9b06cba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,6 @@ TESTS = \
TEST_SUITE_LOG = test/test-suite.log AM_TESTS_ENVIRONMENT = \ - PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_UTIL_DIR; + PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_BIN_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh -- 2.15.0
Thanks! -- Sincerely, Johannes Löthberg PGP Key ID: 0x50FB9B273A9D0BB5 PGP Key FP: 5134 EF9E AF65 F95B 6BB1 608E 50FB 9B27 3A9D 0BB5 https://theos.kyriasis.com/~kyrias/
participants (2)
-
Eli Schwartz
-
Johannes Löthberg