[Pkg-dkms-commits] [dkms] 02/07: handle dkms conf files where PACKAGE_VERSION or PACKAGE_NAME is unquoted
Aron Xu
aron at debian.org
Tue Jul 5 22:00:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
aron pushed a commit to branch master
in repository dkms.
commit 9b3073d0aed8f6fec2fab88bca017e1729cfeafb
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Jun 30 14:02:16 2016 -0400
handle dkms conf files where PACKAGE_VERSION or PACKAGE_NAME is unquoted
Some dkms.conf files do not quote PACKAGE_VERSION or PACKAGE_NAME,
like:
PACKAGE_NAME=blah
PACKAGE_VERSION=0.0.0
This patch lets dh_dkms grok this syntax.
---
debian/scripts/dh_dkms | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/scripts/dh_dkms b/debian/scripts/dh_dkms
index f5a1c4b..48fe8b3 100755
--- a/debian/scripts/dh_dkms
+++ b/debian/scripts/dh_dkms
@@ -116,8 +116,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# now, parse our configuration file
open(IN, "< $name");
while (my $l = <IN>) {
- $l =~ /PACKAGE_NAME=(["'])(.*)\1/ && ($is_snippet = 1 && $package_name = $2);
- $l =~ /PACKAGE_VERSION=(["'])(.*)\1/ && ($package_version = $2);
+ $l =~ /PACKAGE_NAME=(["']?)(.*)\1/ && ($is_snippet = 1 && $package_name = $2);
+ $l =~ /PACKAGE_VERSION=(["']?)(.*)\1/ && ($package_version = $2);
}
close(IN);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dkms/dkms.git
More information about the Pkg-dkms-commits
mailing list