summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-10-20 23:37:36 +0200
committerJulian Andres Klode <jak@debian.org>2017-10-26 13:16:59 +0200
commita3603aa01b909c88c471b402f14a8ea5cdf6243b (patch)
tree25edc5d9f2f867fbe31e92371a1c6bf916877c7d
parent78e8168b5ceba7b4bc3d41262b67c42c993ba5e8 (diff)
Fix testsuite for and add new fields from dpkg 1.19
tagfile-order.c: Add missing fields from dpkg 1.19 For binary packages, this is Build-Essential; for source packages, it is Description. test-bug-718329-...: Ignore control.tar.*, changes in dpkg 1.19 test-apt-extracttemplates: Fix for dpkg 1.19 (cherry picked from commit 404dececf913d3c09368a73ca00aa8172dbf6865)
-rw-r--r--apt-pkg/tagfile-keys.list1
-rw-r--r--apt-pkg/tagfile-order.c10
-rwxr-xr-xtest/integration/test-apt-extracttemplates1
-rwxr-xr-xtest/integration/test-bug-718329-support-data.tar-uncompressed7
4 files changed, 13 insertions, 6 deletions
diff --git a/apt-pkg/tagfile-keys.list b/apt-pkg/tagfile-keys.list
index 82f0d8316..a979a404b 100644
--- a/apt-pkg/tagfile-keys.list
+++ b/apt-pkg/tagfile-keys.list
@@ -8,6 +8,7 @@ Build-Conflicts-Indep
Build-Depends
Build-Depends-Arch
Build-Depends-Indep
+Build-Essential
Built-For-Profiles
Built-Using
Checksums-Md5
diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c
index 0347d8b76..4c2068c00 100644
--- a/apt-pkg/tagfile-order.c
+++ b/apt-pkg/tagfile-order.c
@@ -11,10 +11,10 @@ static const char *iTFRewritePackageOrder[] = {
"Architecture",
"Subarchitecture", // Used only by d-i
"Version",
- "Revision", // Obsolete (warning in dpkg)
+ "Revision", // Obsolete (warning in dpkg)
"Package-Revision", // Obsolete (warning in dpkg)
"Package_Revision", // Obsolete (warning in dpkg)
- "Kernel-Version", // Used only by d-i
+ "Kernel-Version", // Used only by d-i
"Built-Using",
"Built-For-Profiles",
"Auto-Built-Package",
@@ -22,6 +22,7 @@ static const char *iTFRewritePackageOrder[] = {
"Status",
"Priority",
"Class", // dpkg nickname for Priority
+ "Build-Essential",
"Essential",
"Installer-Menu-Item", // Used only by d-i
"Section",
@@ -57,7 +58,7 @@ static const char *iTFRewritePackageOrder[] = {
"Description",
"Tag",
"Task",
- 0
+ 0,
};
static const char *iTFRewriteSourceOrder[] = {
"Package",
@@ -84,6 +85,7 @@ static const char *iTFRewriteSourceOrder[] = {
"Testsuite",
"Testsuite-Triggers",
"Homepage",
+ "Description",
"Vcs-Browser",
"Vcs-Browse", // dak only (nickname?)
"Vcs-Arch",
@@ -101,7 +103,7 @@ static const char *iTFRewriteSourceOrder[] = {
"Checksums-Sha1",
"Checksums-Sha256",
"Checksums-Sha512",
- 0
+ 0,
};
/* Two levels of initialization are used because gcc will set the symbol
diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
index b299d85f4..9b07ef79f 100755
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -16,6 +16,7 @@ CONFIG_STR="#!/bin/sh
random shell stuff
"
echo "$CONFIG_STR" > DEBIAN/config
+chmod 755 DEBIAN/config
testrun() {
local TEMPLATE_STR='Template: foo/bar
diff --git a/test/integration/test-bug-718329-support-data.tar-uncompressed b/test/integration/test-bug-718329-support-data.tar-uncompressed
index b1aa419a7..931802530 100755
--- a/test/integration/test-bug-718329-support-data.tar-uncompressed
+++ b/test/integration/test-bug-718329-support-data.tar-uncompressed
@@ -1,6 +1,10 @@
#!/bin/sh
set -e
+art() {
+ ar t "$@" | grep -v control.tar
+}
+
test_process_package_with_compression() {
COMPRESSOR="$1"
DATA_TAR="$2"
@@ -9,8 +13,7 @@ test_process_package_with_compression() {
buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR"
testsuccessequal "debian-binary
-control.tar.gz
-$DATA_TAR" ar t incoming/pkg_1.0_all.deb
+$DATA_TAR" art incoming/pkg_1.0_all.deb
testequal "Package: pkg" echo "$(aptftparchive packages incoming/|grep ^Package)"