[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.3.3-45-g5eb50bf



The following commit has been merged in the master branch:
commit 2e37cf41dab7efeda3f5d4d228f94bfed01de267
Author: Raphaël Hertzog <hertzog@debian.org>
Date:   Wed Mar 3 20:04:34 2010 +0100

    Simplify collection/debfiles to copy the debian directory entirely
    
    Despite the comment in the source code, the collector has always collected
    the full debian directory and several scripts now depend on this behaviour:
    * patch-systems use files below debian/patches/
    * po-debconf use files below debian/po/
    * debian-source-dir will use files below debian/source/
    
    The line “next if -d $file” should have been “next if -d
    "unpacked/debian/$file"” for the script to have its intended behaviour.

diff --git a/collection/debfiles b/collection/debfiles
index a7664d9..6493741 100755
--- a/collection/debfiles
+++ b/collection/debfiles
@@ -35,14 +35,5 @@ if (-e "debfiles") {
 	or fail("cannot rm old debfiles directory");
 }
 
-mkdir('debfiles', 0777) or fail("cannot mkdir debfiles: $!");
-
-# Don't copy the whole directory, just all files in it.
-opendir(DEBIAN, 'unpacked/debian')
-	or fail("cannot open unpacked/debian/ directory: $!");
-while (my $file=readdir(DEBIAN)) {
-	next if -d $file;
-	copy_dir("unpacked/debian/$file", 'debfiles/')
-		or fail("cannot copy unpacked/debian/$file: $!");
-}
-closedir(DEBIAN);
+# Copy the whole debian directory
+copy_dir("unpacked/debian", "debfiles");

-- 
Debian package checker


Reply to: