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

[SCM] Debian package checker branch, master, updated. 2.5.13-9-g8ac067a



The following commit has been merged in the master branch:
commit 8ac067a0c4dfbc7ac27e3f067f1f2ec66cd7881a
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 9 18:23:58 2013 +0200

    coll: Add Auto-Remove on some colls to reduce inode pressure
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/ar-info b/collection/ar-info
index a004d38..7e60c48 100755
--- a/collection/ar-info
+++ b/collection/ar-info
@@ -32,12 +32,19 @@ use Lintian::Command qw(spawn);
 
 sub collect {
     my ($pkg, $type, $dir) = @_;
-my $info = Lintian::Collect->new ($pkg, $type, $dir);
+    my $info;
 
 if ( -e "$dir/ar-info" ) {
     unlink("$dir/ar-info");
 }
 
+# If we are asked to only remove the files stop right here
+if ($type =~ m/^remove-/) {
+    return;
+}
+
+$info  = Lintian::Collect->new ($pkg, $type, $dir);
+
 open(my $out_fd, '>', "$dir/ar-info");
 
 chdir("$dir/unpacked");
diff --git a/collection/ar-info.desc b/collection/ar-info.desc
index cd9e2e6..015ac56 100644
--- a/collection/ar-info.desc
+++ b/collection/ar-info.desc
@@ -5,3 +5,4 @@ Type: binary
 Needs-Info: unpacked, index
 Version: 1
 Interface: perl-coll
+Auto-Remove: yes
diff --git a/collection/debfiles b/collection/debfiles
index 39b1c27..e5c2c03 100755
--- a/collection/debfiles
+++ b/collection/debfiles
@@ -38,6 +38,11 @@ if ( -e "$dir/debfiles") {
         or fail('cannot rm old debfiles directory');
 }
 
+# If we are asked to only remove the files stop right here
+if ($type =~ m/^remove-/) {
+    return;
+}
+
 if ( ! -d "$dir/unpacked/debian/" ) {
     mkdir("$dir/debfiles");
     return;
diff --git a/collection/debfiles.desc b/collection/debfiles.desc
index 35c9611..713ba00 100644
--- a/collection/debfiles.desc
+++ b/collection/debfiles.desc
@@ -6,3 +6,4 @@ Type: source
 Version: 1
 Needs-Info: unpacked
 Interface: perl-coll
+Auto-Remove: yes
diff --git a/collection/debian-readme b/collection/debian-readme
index ca04500..3d79478 100755
--- a/collection/debian-readme
+++ b/collection/debian-readme
@@ -35,6 +35,11 @@ if ( -f "$dir/README.Debian") {
     unlink("$dir/README.Debian");
 }
 
+# If we are asked to only remove the files stop right here
+if ($type =~ m/^remove-/) {
+    return;
+}
+
 # Pick the first of these files that exists.
 my @readmes = ("$dir/unpacked/usr/share/doc/$pkg/README.Debian.gz",
                "$dir/unpacked/usr/share/doc/$pkg/README.Debian",
diff --git a/collection/debian-readme.desc b/collection/debian-readme.desc
index 5e35524..ae122cb 100644
--- a/collection/debian-readme.desc
+++ b/collection/debian-readme.desc
@@ -6,3 +6,4 @@ Type: binary
 Version: 1
 Needs-Info: unpacked
 Interface: perl-coll
+Auto-Remove: yes
diff --git a/collection/menu-files b/collection/menu-files
index 501af99..f33e4bb 100755
--- a/collection/menu-files
+++ b/collection/menu-files
@@ -36,6 +36,11 @@ if ( -e "$dir/menu") {
         or fail('cannot rm old menu directory');
 }
 
+# If we are asked to only remove the files stop right here
+if ($type =~ m/^remove-/) {
+    return;
+}
+
 mkdir("$dir/menu", 0777);
 
 my %dirs;
diff --git a/collection/menu-files.desc b/collection/menu-files.desc
index 5ff531d..3d723f4 100644
--- a/collection/menu-files.desc
+++ b/collection/menu-files.desc
@@ -5,3 +5,4 @@ Type: binary
 Version: 2
 Needs-Info: unpacked
 Interface: perl-coll
+Auto-Remove: yes
diff --git a/collection/strings b/collection/strings
index 1921afb..c11c6f1 100755
--- a/collection/strings
+++ b/collection/strings
@@ -38,7 +38,7 @@ my $helper = locate_helper_tool('coll/strings-helper');
 sub collect {
 
 my ($pkg, $type, $dir) = @_;
-my $info = Lintian::Collect->new ($pkg, $type, $dir);
+my $info;
 my @manual = ();
 
 if ( -e "$dir/elf-index" ) {
@@ -49,6 +49,14 @@ if ( -d "$dir/strings" ) {
     delete_dir ("$dir/strings") or fail "rmdir strings: $!";
 }
 
+# If we are asked to only remove the files stop right here
+if ($type =~ m/^remove-/) {
+    return;
+}
+
+$info = Lintian::Collect->new ($pkg, $type, $dir);
+
+
 open(my $elf_fd, '>', "$dir/elf-index");
 
 # The directory is required, even if it would be empty.
diff --git a/collection/strings.desc b/collection/strings.desc
index 4836db1..9586e53 100644
--- a/collection/strings.desc
+++ b/collection/strings.desc
@@ -6,3 +6,4 @@ Type: binary, udeb
 Version: 2
 Interface: perl-coll
 Needs-Info: index, unpacked, file-info
+Auto-Remove: yes
diff --git a/debian/changelog b/debian/changelog
index 4aa9cd3..c6a7e96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ lintian (2.5.14) UNRELEASED; urgency=low
   * checks/fields.desc:
     + [NT] Fix typo, thanks to Adrien Cunin.
 
+  * coll/*:
+    + [NT] Set "Auto-Remove: yes" on several collections to
+      reduce the "inode pressure" on lintian.d.o.
   * coll/hardening-info:
     + [NT] Skip files in usr/lib/debug/.
 

-- 
Debian package checker


Reply to: