lintian: r334 - in trunk: debian frontend unpack

[djpig@debian.org]

Author: djpig
Date: 2004-07-09 13:14:38 +0200 (Fri, 09 Jul 2004)
New Revision: 334

Modified:
   trunk/debian/changelog
   trunk/frontend/lintian
   trunk/unpack/unpack-binpkg-l2
Log:
Move the chmod stuff where it belongs.
Tighten the permission fix while we're at it.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-07-08 22:59:09 UTC (rev 333)
+++ trunk/debian/changelog	2004-07-09 11:14:38 UTC (rev 334)
@@ -1,4 +1,4 @@
-lintian (1.23.1~RC1) unstable; urgency=low
+lintian (1.23.1~beta) unstable; urgency=low
 
   The ``Now featuring over 500 checks'' release, prepared by the usual
   suspects.
@@ -117,8 +117,6 @@
       rather than executed as separate executables. Makes it easy to make
       common functions available, tags are done centrally, etc etc. Should
       also save quite a number of forks, thus more speedier.
-    + [FL] Correctly handle non-empty write-protected directories
-      on removal
   
   * lib/Util.pm:
     + [FL] dpkg supports comments in control files now, handle them
@@ -144,6 +142,10 @@
   * unpack/list-udebpkg:
     + [FL] Fix sort of copy & paste error which caused the whole
       script to behave ill
+  * unpack/unpack-binpkg-l2:
+    + [FL] While fixing permissions, also enable write access
+      so we get no problems on removal. Disable group write
+      permissions, we need nobody to interfere with us.
 
  -- Debian Lintian Maintainers <lintian-maint@debian.org>  Fri, 09 Jul 2004 00:58:38 +0200
 

Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian	2004-07-08 22:59:09 UTC (rev 333)
+++ trunk/frontend/lintian	2004-07-09 11:14:38 UTC (rev 334)
@@ -1437,9 +1437,6 @@
 
 	# remove unpacked/ directory
 	print "N: Decreasing unpack level to 1 (removing files) ...\n" if $debug;
-	# rm -rf doesn't remove non-empty write-protected
-	# directories
-	spawn('chmod', '-R', 'u+w', '--', "$base/unpacked/") == 0 or return -1;
 	if ( -l "$base/unpacked" ) {
 	    spawn('rm', '-rf', '--', "$base/".readlink( "$base/unpacked" )) == 0
 		or return -1;
@@ -1459,9 +1456,6 @@
     my ($base) = @_;
 
     print "N: Removing package in lab ...\n" if $debug;
-    # rm -rf doesn't remove non-empty write-protected
-    # directories
-    spawn('chmod', '-R', 'u+w', '--', $base) or warn "error: chmod on $base failed.\n";
     if (spawn('rm', '-rf', '--', $base) != 0) {
 	print STDERR "error: cannot remove directory $base: $!\n";
 	return 0;

Modified: trunk/unpack/unpack-binpkg-l2
===================================================================
--- trunk/unpack/unpack-binpkg-l2	2004-07-08 22:59:09 UTC (rev 333)
+++ trunk/unpack/unpack-binpkg-l2	2004-07-09 11:14:38 UTC (rev 334)
@@ -41,7 +41,7 @@
     or fail();
 
 # fix permissions
-spawn('chmod', '-R', 'u+rX,o-w', "$base_dir/unpacked") == 0 or fail();
+spawn('chmod', '-R', 'u+rwX,go-w', "$base_dir/unpacked") == 0 or fail();
 
 exit 0;