[debhelper-devel] [debhelper] 02/03: Be more flexible with app ID field
Niels Thykier
nthykier at moszumanska.debian.org
Sun Jan 7 21:43:07 UTC 2018
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to annotated tag Release_2.4.0
in repository debhelper.
commit ede9e95fd08ef802d546ac63467296d165b26186
Author: Dan Nicholson <nicholson at endlessm.com>
Date: Mon Jun 22 12:21:05 2015 -0700
Be more flexible with app ID field
The checking of app ID was too restrictive.
1. It required the field to be marked for Control (C), Binary (B) and
Source (S) packages in that specific order. Neither should be
required as the order is certainly unnecessary, and it's up to the
package which output files to apply the field to. Only the binary
package (B) is required for Endless bundles.
2. The case sensitivity of the match is inconsistent with Dpkg. Dpkg
will lower case the field name then convert it to a titlecase with -
separators. The result is that the output control field is
Eos-Appid. Use a case insensitive match to follow that behavior.
[endlessm/eos-shell#5272]
---
Debian/Debhelper/Dh_Lib.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 3ce803e..69171c7 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -834,7 +834,7 @@ sub getpackages {
if (/^(?:X[BC]*-)?Package-Type:\s*(.*)/) {
$package_type=$1;
}
- if (/^(?:XCBS-)?EOS-AppId:\s*(.*)/) {
+ if (/^(?:X[CBS]*-)?Eos-Appid:\s*(.*)/i) {
$eos_app_id=$1;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list