[Python-apps-commits] r8419 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Monday, April 2, 2012 @ 21:42:27
  Author: vicho
Revision: 8419

Add patch for_upstream__skip_test_gpg_if_not_mercurial_wd.patch to skip test-gpg when the testsuite is not run in a hg checkout

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-04-02 20:43:45 UTC (rev 8418)
+++ packages/mercurial/trunk/debian/changelog	2012-04-02 21:42:27 UTC (rev 8419)
@@ -9,8 +9,10 @@
     from_upstream__dont_translate_the_abort_message_twice.patch and
     from_upstream__fix_all_remaining_uses_of_inside.patch which are now
     included upstream
+  * Add patch for_upstream__skip_test_gpg_if_not_mercurial_wd.patch to
+    skip test-gpg when the testsuite is not run in a hg checkout
 
- -- Javi Merino <vicho at debian.org>  Mon, 02 Apr 2012 21:38:52 +0100
+ -- Javi Merino <vicho at debian.org>  Mon, 02 Apr 2012 22:41:49 +0100
 
 mercurial (2.1.1-2) unstable; urgency=low
 

Added: packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	2012-04-02 21:42:27 UTC (rev 8419)
@@ -0,0 +1,19 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Don't run test-gpg if not in a working directory
+ test-gpg has to be run in a mercurial working directory as it uses
+ that to verify that it hasn't modified the trustdb.gpg file.  Skip
+ the test if it is running in an exploded tarball.
+Forwarded: http://www.selenic.com/pipermail/mercurial-devel/2012-April/038941.html
+--- a/tests/test-gpg.t
++++ b/tests/test-gpg.t
+@@ -1,6 +1,10 @@
+ Test the GPG extension
+ 
+   $ "$TESTDIR/hghave" gpg || exit 80
++  $ if ! hg identify -q > /dev/null; then
++  >     echo "skipped: not a Mercurial working dir" >&2
++  >     exit 80
++  > fi
+   $ cat <<EOF >> $HGRCPATH
+   > [extensions]
+   > gpg=

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-04-02 20:43:45 UTC (rev 8418)
+++ packages/mercurial/trunk/debian/patches/series	2012-04-02 21:42:27 UTC (rev 8419)
@@ -7,3 +7,4 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+for_upstream__skip_test_gpg_if_not_mercurial_wd.patch