[SCM] Debian package checker branch, master, updated. 2.3.0-15-g8b74548
The following commit has been merged in the master branch:
commit f3ce20e033eb80bf9d0ebf0eba33ade2cc6dac4f
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sun Dec 27 13:33:06 2009 -0600
Remove any reference to unpack-level outside the frontend
diff --git a/checks/binaries.desc b/checks/binaries.desc
index fcc49fc..573d486 100644
--- a/checks/binaries.desc
+++ b/checks/binaries.desc
@@ -2,7 +2,6 @@ Check-Script: binaries
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: bin
Type: binary, udeb
-Unpack-Level: 1
Needs-Info: objdump-info, file-info, strings
Info: This script checks binaries and object files for bugs.
diff --git a/checks/changelog-file.desc b/checks/changelog-file.desc
index a7fef78..406e2c3 100644
--- a/checks/changelog-file.desc
+++ b/checks/changelog-file.desc
@@ -2,7 +2,6 @@ Check-Script: changelog-file
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: chg
Type: binary
-Unpack-Level: 1
Needs-Info: file-info, changelog-file
Info: This script checks if a binary package conforms to policy
with regards to changelog files.
diff --git a/checks/conffiles.desc b/checks/conffiles.desc
index 183b52a..b6ce48b 100644
--- a/checks/conffiles.desc
+++ b/checks/conffiles.desc
@@ -2,7 +2,6 @@ Check-Script: conffiles
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: cnf
Type: binary
-Unpack-Level: 1
Info: This script checks if the conffiles control file of a binary
package is correct.
diff --git a/checks/control-file.desc b/checks/control-file.desc
index c4212ee..234cc98 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -2,7 +2,6 @@ Check-Script: control-file
Author: Marc 'HE' Brockschmidt <marc@marcbrockschmidt.de>
Abbrev: dctl
Type: source
-Unpack-Level: 1
Needs-Info: debfiles
Info: This script checks debian/control files in source packages
diff --git a/checks/control-files.desc b/checks/control-files.desc
index b5698c4..c568d8e 100644
--- a/checks/control-files.desc
+++ b/checks/control-files.desc
@@ -2,7 +2,6 @@ Check-Script: control-files
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: ctl
Type: binary, udeb
-Unpack-Level: 1
Tag: unknown-control-file
Severity: normal
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index e97f56b..15e9a92 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -2,7 +2,6 @@ Check-Script: copyright-file
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: cpy
Type: binary
-Unpack-Level: 1
Needs-Info: copyright-file
Info: This script checks if a binary package conforms to policy
with regard to copyright files.
diff --git a/checks/cruft.desc b/checks/cruft.desc
index fe7aedd..04adec4 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -2,7 +2,6 @@ Check-Script: cruft
Author: Sean 'Shaleh' Perry <shaleh@debian.org>
Abbrev: deb
Type: source
-Unpack-Level: 1
Info: This looks for cruft in Debian packaging or upstream source
Needs-Info: unpacked, debfiles, diffstat, file-info
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index af07371..c753b03 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -2,7 +2,6 @@ Check-Script: deb-format
Author: Russ Allbery <rra@debian.org>
Abbrev: dfmt
Type: binary, udeb
-Unpack-Level: 1
Needs-Info: unpacked
Info: This script checks the format of the deb ar archive itself.
diff --git a/checks/debconf.desc b/checks/debconf.desc
index b02a919..da58990 100644
--- a/checks/debconf.desc
+++ b/checks/debconf.desc
@@ -2,7 +2,6 @@ Check-Script: debconf
Author: Colin Watson <cjwatson@debian.org>
Abbrev: dc
Type: binary, udeb, source
-Unpack-Level: 1
Info: This looks for common mistakes in packages using debconf.
Needs-Info: unpacked, scripts
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 1a7a6d6..de4c34e 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -2,7 +2,6 @@ Check-Script: debhelper
Author: Joey Hess <joeyh@debian.org>
Abbrev: dh
Type: source
-Unpack-Level: 1
Info: This looks for common mistakes in debhelper source packages.
Needs-Info: debfiles, source-control-file
diff --git a/checks/debian-readme.desc b/checks/debian-readme.desc
index 2723b8f..740e672 100644
--- a/checks/debian-readme.desc
+++ b/checks/debian-readme.desc
@@ -2,7 +2,6 @@ Check-Script: debian-readme
Author: Richard Braakman <dark@xs4all.nl>
Abbrev: drm
Type: binary
-Unpack-Level: 1
Needs-Info: debian-readme
Info: This script checks the README.Debian file for various problems.
diff --git a/checks/description.desc b/checks/description.desc
index 22ca72a..7bd2a71 100644
--- a/checks/description.desc
+++ b/checks/description.desc
@@ -2,7 +2,6 @@ Check-Script: description
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: des
Type: binary, udeb
-Unpack-Level: 1
Tag: package-has-no-description
Severity: serious
diff --git a/checks/etcfiles.desc b/checks/etcfiles.desc
index 5f3c9d5..6bbed0d 100644
--- a/checks/etcfiles.desc
+++ b/checks/etcfiles.desc
@@ -2,7 +2,6 @@ Check-Script: etcfiles
Author: Sean 'Shaleh' Perry <shaleh@debian.org>
Abbrev: etc
Type: binary
-Unpack-Level: 1
Tag: file-in-etc-not-marked-as-conffile
Severity: serious
diff --git a/checks/fields.desc b/checks/fields.desc
index 8288f1b..da21b2a 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -2,7 +2,6 @@ Check-Script: fields
Author: Marc 'HE' Brockschmidt <marc@marcbrockschmidt.de>
Abbrev: fld
Type: binary, udeb, source
-Unpack-Level: 1
Needs-Info: debfiles, source-control-file
Info: This script checks the syntax of the fields in package control files,
as described in the Policy Manual.
diff --git a/checks/files.desc b/checks/files.desc
index 5337f04..1341399 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -2,7 +2,6 @@ Check-Script: files
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: fil
Type: binary, udeb
-Unpack-Level: 1
Needs-Info: unpacked, objdump-info, scripts, file-info
Info: This script checks if a binary package conforms to policy
WRT to files and directories.
diff --git a/checks/huge-usr-share.desc b/checks/huge-usr-share.desc
index b23dc62..8abb32d 100644
--- a/checks/huge-usr-share.desc
+++ b/checks/huge-usr-share.desc
@@ -2,7 +2,6 @@ Check-Script: huge-usr-share
Author: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Abbrev: hus
Type: binary
-Unpack-Level: 1
Needs-Info: unpacked
Info: This script checks whether an architecture-dependent package has
large amounts of data in /usr/share.
diff --git a/checks/infofiles.desc b/checks/infofiles.desc
index f182beb..853aff2 100644
--- a/checks/infofiles.desc
+++ b/checks/infofiles.desc
@@ -2,7 +2,6 @@ Check-Script: infofiles
Author: Josip Rodin <jrodin@jagor.srce.hr>
Abbrev: info
Type: binary
-Unpack-Level: 1
Needs-Info: unpacked, file-info
Info: This script checks if a binary package conforms to info document policy.
diff --git a/checks/init.d.desc b/checks/init.d.desc
index 358bae0..5d443ae 100644
--- a/checks/init.d.desc
+++ b/checks/init.d.desc
@@ -3,7 +3,6 @@ Author: Christian Schwarz <schwarz@debian.org>
Abbrev: ini
Type: binary
Needs-Info: init.d
-Unpack-Level: 1
Tag: duplicate-updaterc.d-calls-in-postinst
Severity: important
diff --git a/checks/manpages.desc b/checks/manpages.desc
index 69261c2..ae347ed 100644
--- a/checks/manpages.desc
+++ b/checks/manpages.desc
@@ -2,7 +2,6 @@ Check-Script: manpages
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: man
Type: binary
-Unpack-Level: 1
Needs-Info: unpacked, file-info
Info: This script checks if a binary package conforms to manual page policy.
diff --git a/checks/md5sums.desc b/checks/md5sums.desc
index 15c0151..ca0e572 100644
--- a/checks/md5sums.desc
+++ b/checks/md5sums.desc
@@ -2,7 +2,6 @@ Check-Script: md5sums
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: md5
Type: binary
-Unpack-Level: 1
Needs-Info: md5sums
Info: This script checks if md5sum control files are valid, if they are
provided by a binary package.
diff --git a/checks/menu-format.desc b/checks/menu-format.desc
index 8b575e2..3c51d7b 100644
--- a/checks/menu-format.desc
+++ b/checks/menu-format.desc
@@ -3,7 +3,6 @@ Author: Joey Hess <joeyh@master.debian.org>
Abbrev: mnf
Needs-Info: unpacked, menu-files
Type: binary
-Unpack-Level: 1
Info: This script validates the format of menu files.
Tag: old-format-menu-file
diff --git a/checks/menus.desc b/checks/menus.desc
index f0c03e9..8b43e1a 100644
--- a/checks/menus.desc
+++ b/checks/menus.desc
@@ -2,7 +2,6 @@ Check-Script: menus
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: men
Type: binary
-Unpack-Level: 1
Needs-Info: doc-base-files
Tag: postinst-should-not-set-usr-doc-link
diff --git a/checks/nmu.desc b/checks/nmu.desc
index 7f96052..c2515ee 100644
--- a/checks/nmu.desc
+++ b/checks/nmu.desc
@@ -2,7 +2,6 @@ Check-Script: nmu
Author: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Abbrev: nmu
Type: source
-Unpack-Level: 1
Needs-Info: debfiles
Info: This script checks if a source package is consistent about its NMU-ness.
diff --git a/checks/ocaml.desc b/checks/ocaml.desc
index 151b832..7d727ca 100644
--- a/checks/ocaml.desc
+++ b/checks/ocaml.desc
@@ -2,7 +2,6 @@ Check-Script: ocaml
Author: Stephane Glondu <steph@glondu.net>
Abbrev: ocaml
Type: binary
-Unpack-Level: 1
Info: This looks for common mistakes in OCaml binary packages.
Needs-Info: file-info, ar-info
diff --git a/checks/patch-systems.desc b/checks/patch-systems.desc
index b65c0d9..b3df68b 100644
--- a/checks/patch-systems.desc
+++ b/checks/patch-systems.desc
@@ -2,7 +2,6 @@ Check-Script: patch-systems
Author: Marc Brockschmidt <he@debian.org>
Abbrev: pat
Type: source
-Unpack-Level: 1
Info: This script checks for various possible problems when using patch systems
Needs-Info: debfiles, diffstat
diff --git a/checks/po-debconf.desc b/checks/po-debconf.desc
index bd8d41a..b8f8540 100644
--- a/checks/po-debconf.desc
+++ b/checks/po-debconf.desc
@@ -2,7 +2,6 @@ Check-Script: po-debconf
Author: Denis Barbier <barbier@linuxfr.org>
Abbrev: pd
Type: source
-Unpack-Level: 1
Info: This looks for common mistakes in packages using po-debconf.
Needs-Info: debfiles
diff --git a/checks/rules.desc b/checks/rules.desc
index 2a9dc48..9f3df07 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -1,7 +1,6 @@
Check-Script: rules
Author: Russ Allbery <rra@debian.org>
Type: source
-Unpack-Level: 1
Needs-Info: debfiles, source-control-file
Info: Check targets and actions in debian/rules.
Abbrev: rul
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 9d6ec21..1b4e060 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -2,7 +2,6 @@ Check-Script: scripts
Author: Richard Braakman <dark@xs4all.nl>
Abbrev: scr
Type: binary
-Unpack-Level: 1
Info: This script checks the #! lines of scripts in a package.
Needs-Info: unpacked, file-info, scripts
diff --git a/checks/shared-libs.desc b/checks/shared-libs.desc
index 46c5169..f00288c 100644
--- a/checks/shared-libs.desc
+++ b/checks/shared-libs.desc
@@ -2,7 +2,6 @@ Check-Script: shared-libs
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: shl
Type: binary, udeb
-Unpack-Level: 1
Needs-Info: unpacked, file-info, objdump-info
Info: This script checks if a binary package conforms to shared library policy.
diff --git a/checks/standards-version.desc b/checks/standards-version.desc
index 3cb9c4b..1c9beed 100644
--- a/checks/standards-version.desc
+++ b/checks/standards-version.desc
@@ -2,7 +2,6 @@ Check-Script: standards-version
Author: Christian Schwarz <schwarz@debian.org>
Abbrev: std
Type: source
-Unpack-Level: 1
Info: This script checks if a source package contains a valid
Standards-Version field.
Needs-Info: debfiles, source-control-file
diff --git a/checks/version-substvars.desc b/checks/version-substvars.desc
index 652c368..bb47d0a 100644
--- a/checks/version-substvars.desc
+++ b/checks/version-substvars.desc
@@ -2,7 +2,6 @@ Check-Script: version-substvars
Author: Adeodato Simó <dato@net.com.org.es>
Abbrev: v-s
Type: source
-Unpack-Level: 1
Needs-Info: debfiles, source-control-file
Info: This script checks for correct use of the various *Version
substvars, e.g. deprecated substvars, or usage that can cause
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index 00241aa..454dc61 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -2,7 +2,6 @@ Check-Script: watch-file
Author: Patrick Schoenfeld <schoenfeld@in-medisa-res.com>
Abbrev: watch
Type: source
-Unpack-Level: 1
Needs-Info: debfiles
Info: Check debian/watch files in source packages.
diff --git a/collection/ar-info.desc b/collection/ar-info.desc
index eaecfcf..1fed4fa 100644
--- a/collection/ar-info.desc
+++ b/collection/ar-info.desc
@@ -2,6 +2,6 @@ Collector-Script: ar-info
Author: Stéphane Glondu <steph@glondu.net>
Info: This script runs the "ar t" command over all .a files of package.
Type: binary
-Unpack-Level: 2
+Needs-Info: unpacked
Version: 1
Order: 1
diff --git a/collection/changelog-file.desc b/collection/changelog-file.desc
index 3e8499f..4caae66 100644
--- a/collection/changelog-file.desc
+++ b/collection/changelog-file.desc
@@ -4,7 +4,6 @@ Info: This script copies the <tt>changelog</tt> file and
<tt>NEWS.Debian</tt> file (if any) of a package into the lintian
directory.
Type: binary
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/copyright-file.desc b/collection/copyright-file.desc
index 70fe48f..785266c 100644
--- a/collection/copyright-file.desc
+++ b/collection/copyright-file.desc
@@ -3,7 +3,6 @@ Author: Richard Braakman <dark@xs4all.nl>
Info: This script copies the "copyright" file of a package into the
lintian directory.
Type: binary
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/debfiles.desc b/collection/debfiles.desc
index a01028c..9c374bb 100644
--- a/collection/debfiles.desc
+++ b/collection/debfiles.desc
@@ -3,7 +3,6 @@ Author: Joey Hess <joeyh@debian.org>
Info: This script collects files shipped in the source of the
package.
Type: source
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/debian-readme.desc b/collection/debian-readme.desc
index 437c454..5b17a83 100644
--- a/collection/debian-readme.desc
+++ b/collection/debian-readme.desc
@@ -2,7 +2,6 @@ Collector-Script: debian-readme
Author: Richard Braakman <dark@xs4all.nl>
Info: This script copies the 'README.Debian' file of a package into the lintian directory.
Type: binary
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/diffstat.desc b/collection/diffstat.desc
index d250dbe..992b0db 100644
--- a/collection/diffstat.desc
+++ b/collection/diffstat.desc
@@ -3,6 +3,5 @@ Author: Richard Braakman <dark@xs4all.nl>
Info: This script extracts the Debian diff of a source package, and runs
diffstat on it, leaving the result in the diffstat output file
Type: source
-Unpack-Level: 1
Version: 1
Order: 1
diff --git a/collection/doc-base-files.desc b/collection/doc-base-files.desc
index c5c60d6..5d687af 100644
--- a/collection/doc-base-files.desc
+++ b/collection/doc-base-files.desc
@@ -3,7 +3,6 @@ Author: Josip Rodin <jrodin@jagor.srce.hr>
Info: This script copies the contents of /usr/share/doc-base into the
lintian doc-base/ directory.
Type: binary
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/file-info.desc b/collection/file-info.desc
index 82d99aa..b82f33e 100644
--- a/collection/file-info.desc
+++ b/collection/file-info.desc
@@ -2,7 +2,6 @@ Collector-Script: file-info
Author: Richard Braakman <dark@xs4all.nl>
Info: This script runs the "file" command over all files of any kind of package.
Type: binary, udeb, source
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/init.d.desc b/collection/init.d.desc
index c50b882..85ea0ee 100644
--- a/collection/init.d.desc
+++ b/collection/init.d.desc
@@ -3,7 +3,6 @@ Author: Richard Braakman <dark@xs4all.nl>
Info: This script copies the "etc/init.d" directory into the lintian
directory.
Type: binary
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/md5sums.desc b/collection/md5sums.desc
index cc95e62..3e1b11d 100644
--- a/collection/md5sums.desc
+++ b/collection/md5sums.desc
@@ -2,7 +2,6 @@ Collector-Script: md5sums
Author: Richard Braakman <dark@xs4all.nl>
Info: This script runs the "md5sums" over all files in a binary package.
Type: binary, udeb
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/menu-files.desc b/collection/menu-files.desc
index 66c06eb..92495b6 100644
--- a/collection/menu-files.desc
+++ b/collection/menu-files.desc
@@ -2,7 +2,6 @@ Collector-Script: menu-files
Author: Richard Braakman <dark@xs4all.nl>
Info: This script copies the contents of /usr/lib/menu into the lintian menu/ directory.
Type: binary
-Unpack-Level: 1
Version: 2
Order: 1
Needs-Info: unpacked
diff --git a/collection/objdump-info.desc b/collection/objdump-info.desc
index 0dc56fe..d52ec36 100644
--- a/collection/objdump-info.desc
+++ b/collection/objdump-info.desc
@@ -3,7 +3,6 @@ Author: Christian Schwarz <schwarz@debian.org>
Info: This script runs "objdump" over all binaries and object files of a
binary package.
Type: binary, udeb
-Unpack-Level: 1
Version: 1
Order: 2
Needs-Info: file-info, unpacked
diff --git a/collection/override-file.desc b/collection/override-file.desc
index e1b27d2..0a2cc54 100644
--- a/collection/override-file.desc
+++ b/collection/override-file.desc
@@ -3,7 +3,6 @@ Author: Darren Benham <gecko@debian.org>
Info: This script copies the "override" file of a package into the lintian
directory.
Type: binary, udeb, source
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/scripts.desc b/collection/scripts.desc
index 9a9eb74..1e577a0 100644
--- a/collection/scripts.desc
+++ b/collection/scripts.desc
@@ -6,7 +6,6 @@ Info: This script scans a binary package for scripts that start with #! and
Note that the filename might contain spaces, but the scriptpath will not,
because linux only looks at the first word when executing a script.
Type: binary, udeb
-Unpack-Level: 1
Version: 1
Order: 1
Needs-Info: unpacked
diff --git a/collection/source-control-file.desc b/collection/source-control-file.desc
index a8127d2..ab05fe9 100644
--- a/collection/source-control-file.desc
+++ b/collection/source-control-file.desc
@@ -2,7 +2,6 @@ Collector-Script: source-control-file
Author: Frank Lichtenheld <djpig@debian.org>
Info: Collects information about binary packages from debian/control in source packages
Type: source
-Unpack-Level: 1
Version: 1
Order: 2
Needs-Info: debfiles
diff --git a/collection/strings.desc b/collection/strings.desc
index 2857097..60640ec 100644
--- a/collection/strings.desc
+++ b/collection/strings.desc
@@ -3,7 +3,6 @@ Author: Raphael Geissert <atomo64@gmail.com>
Info: This script runs the "strings" command over all files of a binary
package.
Type: binary, udeb
-Unpack-Level: 1
Version: 1
Order: 2
Needs-Info: unpacked, file-info
diff --git a/collection/unpacked.desc b/collection/unpacked.desc
index f57be67..ff3074a 100644
--- a/collection/unpacked.desc
+++ b/collection/unpacked.desc
@@ -2,7 +2,6 @@ Collector-Script: unpacked
Author: Raphael Geissert <atomo64@gmail.com>
Info: This script unpacks the package under the unpacked/ directory
Type: binary, udeb, source
-Unpack-Level: 1
Version: 1
Order: 0
Auto-Remove: yes
diff --git a/frontend/lintian b/frontend/lintian
index 3019c9b..8e2ed18 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -157,7 +157,6 @@ Behaviour options:
--display-source X restrict displayed tags by source
--suppress-tags T,... don\'t show the specified tags
--suppress-tags-from-file X don\'t show the tags listed in file X
- -l X, --unpack-level X set default unpack level to X
-o, --no-override ignore overrides
--show-overrides output tags that have been overriden
--color never/always/auto disable, enable, or enable color for TTY
@@ -541,19 +540,21 @@ if (defined $LINTIAN_SECTION) {
# determine requested unpack level
if (defined($unpack_level)) {
+ print STDERR "warning: --unpack-level is deprecated, ingoring.\n";
# specified through command line
} elsif (defined($LINTIAN_UNPACK_LEVEL)) {
# specified via configuration file or env variable
- $unpack_level = $LINTIAN_UNPACK_LEVEL;
+ print STDERR "warning: LINTIAN_UNPACK_LEVEL is deprecated, ingoring.\n";
+}
+
+# determine by action
+if (($action eq 'unpack') or ($action eq 'check')) {
+ $unpack_level = 1;
} else {
- # determine by action
- if (($action eq 'unpack') or ($action eq 'check')) {
- $unpack_level = 1;
- } else {
- $unpack_level = 0;
- }
+ $unpack_level = 0;
}
-unless (($unpack_level == 0) or ($unpack_level == 1) or ($unpack_level == 2)) {
+
+unless (($unpack_level == 0) or ($unpack_level == 1)) {
die("bad unpack level $unpack_level specified");
}
@@ -1062,7 +1063,6 @@ for my $f (readdir COLLDIR) {
}
$p->{'type'} = "$s$b$u";
- set_value($f,$p,'unpack-level',$secs[0],1);
set_value($f,$p,'order',$secs[0],1);
set_value($f,$p,'version',$secs[0],1);
set_value($f,$p,'auto-remove',$secs[0],0);
@@ -1128,7 +1128,6 @@ for my $f (readdir CHECKDIR) {
}
$p->{'type'} = "$s$b$u";
- set_value($f,$p,'unpack-level',$secs[0],1);
set_value($f,$p,'abbrev',$secs[0],1);
if (exists $secs[0]->{'needs-info'} && defined $secs[0]->{'needs-info'}) {
@@ -1363,15 +1362,6 @@ foreach my $pkg_info ($schedule->get_all) {
goto REMOVE_BASEDIR;
}
- # unpack level defined?
- unless (exists $data->{'unpack-level'}) {
- warning("cannot determine unpack-level of package");
- $remove_basedir = 1;
- goto REMOVE_BASEDIR;
- } else {
- $act_unpack_level = $data->{'unpack-level'};
- }
-
# file modified?
my $timestamp;
my @stat;
@@ -1430,15 +1420,6 @@ foreach my $pkg_info ($schedule->get_all) {
}
closedir(BASE);
- # unpack to desired unpack level (if necessary)
- $act_unpack_level = unpack_pkg($type,$base,$file,$act_unpack_level,$ci->{'unpack-level'});
- if ($act_unpack_level == -1) {
- warning("could not unpack package to desired level",
- "skipping $action of $long_type package $pkg");
- $exit_code = 2;
- next PACKAGE;
- }
-
# chdir to base directory
unless (chdir($base)) {
warning("could not chdir into directory $base: $!",
@@ -1497,15 +1478,6 @@ foreach my $pkg_info ($schedule->get_all) {
# current type?
next unless ($ci->{'type'} =~ m/$type/);
- # unpack to desired unpack level (if necessary)
- $act_unpack_level = unpack_pkg($type,$base,$file,$act_unpack_level,$ci->{'unpack-level'});
- if ($act_unpack_level == -1) {
- warning("could not unpack package to desired level",
- "skipping $action of $long_type package $pkg");
- $exit_code = 2;
- next PACKAGE;
- }
-
# chdir to base directory
unless (chdir($base)) {
warning("could not chdir into directory $base: $!",
@@ -1629,7 +1601,6 @@ foreach my $pkg_info ($schedule->get_all) {
print STATUS "Package: $pkg\n";
print STATUS "Version: $ver\n";
print STATUS "Type: $type\n";
- print STATUS "Unpack-Level: $act_unpack_level\n";
print STATUS "Timestamp: $timestamp\n";
close(STATUS);
}
diff --git a/t/scripts/unpack-level.t b/t/scripts/unpack-level.t
index 981238a..d117c79 100755
--- a/t/scripts/unpack-level.t
+++ b/t/scripts/unpack-level.t
@@ -38,15 +38,14 @@ my @l2refs = (
# it is level two then there should be a reference
for my $desc (@DESCS) {
my ($header) = read_dpkg_control($desc);
+ my $level = $header->{'unpack-level'};
if ($desc =~ m/lintian\.desc$/) {
- ok(1, "lintian.desc has valid unpack-level");
+ ok(!defined($level), "lintian.desc doesn't define unpack-level");
ok(1, "lintian.desc has valid needs-info for unpack level");
next;
}
- my $level = $header->{'unpack-level'};
- chomp $level;
my $info = $header->{'needs-info'} || '';
chomp $info;
my %ninfo = map {$_ => 1} split(/\s*,\s*/, $info);
@@ -66,8 +65,8 @@ for my $desc (@DESCS) {
# it is ok that collection/unpacked doesn't depend on itself :)
$requires_unpacked = 0 if ($short eq 'collection/unpacked.desc');
- # no script should be using unpack-level: 2 anymore
- ok($level eq 1, "$short has valid unpack-level");
+ # no script should be using unpack-level: n anymore
+ ok(!defined($level), "$short doesn't define unpack-level");
ok($requires_unpacked? defined($ninfo{'unpacked'}) : !defined($ninfo{'unpacked'}),
"$short has valid needs-info for unpack level");
--
Debian package checker
Reply to: