[Python-apps-commits] r8267 - in packages/mercurial/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, March 4, 2012 @ 22:20:18
  Author: vicho
Revision: 8267

Improve the fix for the test-inherit-mode.t patch based on suggestions from upstream

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/for_upstream__chgrp_test_inherit.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-03-04 13:41:31 UTC (rev 8266)
+++ packages/mercurial/trunk/debian/changelog	2012-03-04 22:20:18 UTC (rev 8267)
@@ -1,8 +1,10 @@
 mercurial (2.1.1-2) UNRELEASED; urgency=low
 
   * Add kfreebsd-i386 to the list of slow architectures for the test suite.
+  * Improve the fix for the test-inherit-mode.t patch based on
+    suggestions from upstream
 
- -- Javi Merino <vicho at debian.org>  Sat, 03 Mar 2012 13:48:03 +0000
+ -- Javi Merino <vicho at debian.org>  Sun, 04 Mar 2012 22:19:16 +0000
 
 mercurial (2.1.1-1) unstable; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__chgrp_test_inherit.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__chgrp_test_inherit.patch	2012-03-04 13:41:31 UTC (rev 8266)
+++ packages/mercurial/trunk/debian/patches/for_upstream__chgrp_test_inherit.patch	2012-03-04 22:20:18 UTC (rev 8267)
@@ -1,19 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: Set the group of the test directory to one of the user's group
-  Some $TMPDIRs create folders owned by a group which the user doesn't
-  belong to.  test-inherit-mode then fails when chmod tries to set the
-  setgid bit because the user doesn't have permission to do so.  This
-  patch sets the group of the parent directory to one of the users'
-  groups, so that the test can modify the setgid group of any of the
-  directories created inside it afterwards.
-Forwarded: http://selenic.com/pipermail/mercurial-devel/2012-March/038419.html
---- a/tests/test-inherit-mode.t
-+++ b/tests/test-inherit-mode.t
-@@ -8,6 +8,7 @@
- just in case somebody has a strange $TMPDIR
- 
-   $ chmod g-s dir
-+  $ chgrp $(groups | awk '{print $1}') dir
-   $ cd dir
- 
-   $ cat >printmodes.py <<EOF

Added: packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch	2012-03-04 22:20:18 UTC (rev 8267)
@@ -0,0 +1,20 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Ignore the return code of chmod in test-inherit-mode
+ In freebsd, a newly created directory has the same group as the parent
+ directory by default.  That means that the test directory created by
+ test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store"
+ fails to set the SGID bit and returns 1.  If we ignore chmod's return
+ code, the testsuite passes again.
+Forwarded: http://selenic.com/pipermail/mercurial-devel/2012-March/038464.html
+
+--- a/tests/test-inherit-mode.t
++++ b/tests/test-inherit-mode.t
+@@ -138,7 +138,7 @@ just check that directories have the sam
+   $ hg init setgid
+   $ cd setgid
+   $ chmod g+rwx .hg/store
+-  $ chmod g+s .hg/store 2> /dev/null
++  $ chmod g+s .hg/store 2> /dev/null || /bin/true
+   $ mkdir dir
+   $ touch dir/file
+   $ hg ci -qAm 'add dir/file'

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-03-04 13:41:31 UTC (rev 8266)
+++ packages/mercurial/trunk/debian/patches/series	2012-03-04 22:20:18 UTC (rev 8267)
@@ -8,4 +8,4 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
-for_upstream__chgrp_test_inherit.patch
+for_upstream__fix_kfreebsd_test_inherit.patch