The following commit has been merged in the master branch:
commit 2c4ab968fcd8d84740b189b294f550503ace21e8
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Mon May 12 21:25:44 2008 +0300
dpkg-gencontrol: Rename $package_type to $pkg_type for uniformity
diff --git a/ChangeLog b/ChangeLog
index 91b5411..9d8ed66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-gencontrol.pl ($package_type): Rename to ...
+ ($pkg_type): ... this, for uniformity.
+
+2008-05-12 Guillem Jover <[EMAIL PROTECTED]>
+
* src/help.c (do_script): Expand 'maint' to 'maintainer' in string.
(vmaintainer_script_installed): Mark string for translation. Change
strings so that they get merged by gettext with similar ones.
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 160eec9..219b4ff 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -264,14 +264,14 @@ for my $f (qw(Maintainer Description Architecture)) {
}
$oppackage = $fields->{'Package'};
-my $package_type = $pkg->{'Package-Type'} ||
- tied(%$pkg)->get_custom_field('Package-Type') || 'deb';
+my $pkg_type = $pkg->{'Package-Type'} ||
+ tied(%$pkg)->get_custom_field('Package-Type') || 'deb';
-if ($package_type eq 'udeb') {
+if ($pkg_type eq 'udeb') {
delete $fields->{'Homepage'};
} else {
for my $f (qw(Subarchitecture Kernel-Version Installer-Menu-Item)) {
- warning(_g("%s package with udeb specific field %s"), $package_type,
$f)
+ warning(_g("%s package with udeb specific field %s"), $pkg_type, $f)
if defined($fields->{$f});
}
}
@@ -324,7 +324,7 @@ if (open(X, "<", $fileslistfile)) {
chomp;
next if m/^([-+0-9a-z.]+)_[^_]+_([\w-]+)\.(a-z+) /
&& ($1 eq $oppackage)
- && ($3 eq $package_type)
+ && ($3 eq $pkg_type)
&& (debarch_eq($2, $fields->{'Architecture'})
|| debarch_eq($2, 'all'));
print(Y "$_\n") || &syserr(_g("copy old entry to new files list
file"));
@@ -336,7 +336,7 @@ if (open(X, "<", $fileslistfile)) {
my $sversion = $fields->{'Version'};
$sversion =~ s/^\d+://;
$forcefilename = sprintf("%s_%s_%s.%s", $oppackage, $sversion,
$fields->{'Architecture'},
- $package_type)
+ $pkg_type)
unless ($forcefilename);
print(Y $substvars->substvars(sprintf("%s %s %s\n", $forcefilename,
$fields->{'Section'} || '-',
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
