Browse Source

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
tags/debian/1.6_alpha1
Julian Andres Klode 3 years ago
parent
commit
404dececf9
4 changed files with 13 additions and 6 deletions
  1. +1
    -0
      apt-pkg/tagfile-keys.list
  2. +6
    -4
      apt-pkg/tagfile-order.c
  3. +1
    -0
      test/integration/test-apt-extracttemplates
  4. +5
    -2
      test/integration/test-bug-718329-support-data.tar-uncompressed

+ 1
- 0
apt-pkg/tagfile-keys.list View File

@@ -8,6 +8,7 @@ Build-Conflicts-Indep
Build-Depends
Build-Depends-Arch
Build-Depends-Indep
Build-Essential
Built-For-Profiles
Built-Using
Checksums-Md5


+ 6
- 4
apt-pkg/tagfile-order.c View File

@@ -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


+ 1
- 0
test/integration/test-apt-extracttemplates View File

@@ -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


+ 5
- 2
test/integration/test-bug-718329-support-data.tar-uncompressed View File

@@ -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)"



Loading…
Cancel
Save