The branch, master has been updated
via 76209ff4c9d406a4d167d09745ebf8e0b48c3394 (commit)
via 2e6845caaab4af4c860258b55a9a1fb92496438b (commit)
via fa11d7a0987bbd98d6fe4786fd65b95d13b0e52b (commit)
via 7cdac51735b3d71407f1d739791fcca5cdaccf77 (commit)
via 01d43380761d1796e735c0e7d43b60c32e7427d7 (commit)
from 8c2d03f393ed0c4a177aa57bb005be375296afd7 (commit)
- Shortlog ------------------------------------------------------------
76209ff Dpkg::BuildOptions: Add tests and fix errors found
2e6845c Dpkg::BuildOptions: Really set DEB_BUILD_OPTIONS
fa11d7a Dpkg::BuildOptions: Add support for nocheck
7cdac51 dpkg.1: Remove some unneccessary markup
01d4338 man/Makefile.am: Add update-po target
Summary of changes:
ChangeLog | 9 ++++++++
debian/changelog | 2 +
man/ChangeLog | 8 +++++++
man/Makefile.am | 6 +++++
man/dpkg.1 | 2 -
scripts/Dpkg/BuildOptions.pm | 8 +++++-
scripts/t/300_Dpkg_BuildOptions.t | 41 +++++++++++++++++++++++++++++++++++++
7 files changed, 72 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 76209ff4c9d406a4d167d09745ebf8e0b48c3394
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 12 01:09:16 2007 +0200
Dpkg::BuildOptions: Add tests and fix errors found
This whole module was one giant brown paper bag bug...
diff --git a/ChangeLog b/ChangeLog
index 09eeaed..afd178c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
2007-10-12 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * scripts/t/300_Dpkg_BuildOptions.t: New file.
+ Leads to the following fixes:
* scripts/Dpkg/BuildOptions.pm (parse): Add
- support for nocheck.
+ support for nocheck and make it actually work.
(set): Really set DEB_BUILD_OPTIONS. Discovered
by Daniel Shepler.
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index d94a0d3..8be98ff 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -11,9 +11,10 @@ sub parse {
unless ($env) { return {}; }
my %opts;
- if ($env =~ s/(noopt|nostrip|nocheck),?//ig) {
+ while ($env =~ s/(noopt|nostrip|nocheck),?//i) {
$opts{lc $1} = '';
- } elsif ($env =~ s/(parallel)=(-?\d+),?//ig) {
+ }
+ while ($env =~ s/(parallel)=(-?\d+),?//i) {
$opts{lc $1} = $2;
}
@@ -35,6 +36,7 @@ sub set {
}
$ENV{DEB_BUILD_OPTIONS} = $env if $env;
+ return $env;
}
1;
diff --git a/scripts/t/300_Dpkg_BuildOptions.t
b/scripts/t/300_Dpkg_BuildOptions.t
new file mode 100644
index 0000000..bfd788f
--- /dev/null
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -0,0 +1,41 @@
+# -*- mode: cperl;-*-
+
+use Test::More tests => 6;
+
+use strict;
+use warnings;
+
+use_ok('Dpkg::BuildOptions');
+
+$ENV{DEB_BUILD_OPTIONS} = 'foonostripbar,parallel=3,bazNOCHECK';
+
+my $dbo = Dpkg::BuildOptions::parse();
+
+my %dbo = (
+ nostrip => '',
+ nocheck => '',
+ parallel => 3,
+ );
+my %dbo2 = (
+ nocheck => '',
+ );
+
+
+is_deeply($dbo, \%dbo, 'parse');
+
+$dbo = Dpkg::BuildOptions::parse('no opt,no-strip,parallel = 5,nocheck');
+
+is_deeply($dbo, \%dbo2, 'parse (param)');
+
+$dbo->{parallel} = 5;
+$dbo->{noopt} = '';
+
+my $env = Dpkg::BuildOptions::set($dbo,1);
+
+is($ENV{DEB_BUILD_OPTIONS}, $env, 'set (return value)');
+is_deeply(Dpkg::BuildOptions::parse(), $dbo, 'set (env)');
+
+$ENV{DEB_BUILD_OPTIONS} = 'foobar';
+$dbo = { noopt => '' };
+$env = Dpkg::BuildOptions::set($dbo);
+is($env, "foobar,noopt,", 'set (append)');
commit 2e6845caaab4af4c860258b55a9a1fb92496438b
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 12 00:43:31 2007 +0200
Dpkg::BuildOptions: Really set DEB_BUILD_OPTIONS
Discovered by Daniel Shepler.
diff --git a/ChangeLog b/ChangeLog
index 35c322f..09eeaed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* scripts/Dpkg/BuildOptions.pm (parse): Add
support for nocheck.
+ (set): Really set DEB_BUILD_OPTIONS. Discovered
+ by Daniel Shepler.
2007-10-11 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 9975ab6..7b9cfec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ dpkg (1.14.8) UNRELEASED; urgency=low
Closes: #382673
* Various small fixes to the manpages suggested by Helge Kreutzmann.
Closes: #445858
+ * Fix Dpkg::BuildOptions (and thereby dpkg-buildpackage) to really
+ set DEB_BUILD_OPTIONS. Found by Daniel Shepler. Closes: #446119
[ Guillem Jover ]
* Use shipped perl modules when calling perl programs at build time.
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index a28277d..d94a0d3 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -33,6 +33,8 @@ sub set {
$env .= "$k,";
}
}
+
+ $ENV{DEB_BUILD_OPTIONS} = $env if $env;
}
1;
commit fa11d7a0987bbd98d6fe4786fd65b95d13b0e52b
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 12 00:39:52 2007 +0200
Dpkg::BuildOptions: Add support for nocheck
diff --git a/ChangeLog b/ChangeLog
index 53f5c89..35c322f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-12 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/BuildOptions.pm (parse): Add
+ support for nocheck.
+
2007-10-11 Guillem Jover <[EMAIL PROTECTED]>
* scripts/controllib.pl ($warnable_error, $quiet_warnings): Remove
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 3ca38b9..a28277d 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -11,7 +11,7 @@ sub parse {
unless ($env) { return {}; }
my %opts;
- if ($env =~ s/(noopt|nostrip),?//ig) {
+ if ($env =~ s/(noopt|nostrip|nocheck),?//ig) {
$opts{lc $1} = '';
} elsif ($env =~ s/(parallel)=(-?\d+),?//ig) {
$opts{lc $1} = $2;
commit 7cdac51735b3d71407f1d739791fcca5cdaccf77
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 12 00:37:15 2007 +0200
dpkg.1: Remove some unneccessary markup
diff --git a/man/ChangeLog b/man/ChangeLog
index e4a3c15..894eba5 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,8 @@
2007-10-12 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * dpkg.1 (AUTHORS): Remove some unneccessary markup.
+ Allows reuse of one more msgid.
+
* Makefile.am (update-po): New target to easily
update the .pot and .po files. Uses po4a --force.
diff --git a/man/dpkg.1 b/man/dpkg.1
index 4d97649..a49b5de 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -619,7 +619,5 @@ and
\fB\-\-no\-act\fP usually gives less information than might be helpful.
.
.SH AUTHORS
-.nf
See \fI/usr/share/doc/dpkg/THANKS\fP for the list of people who have
contributed to \fBdpkg\fP.
-.fi
commit 01d43380761d1796e735c0e7d43b60c32e7427d7
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 12 00:32:18 2007 +0200
man/Makefile.am: Add update-po target
New target to easily update the .pot and .po files. Uses po4a --force.
diff --git a/man/ChangeLog b/man/ChangeLog
index b04e77d..e4a3c15 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-12 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * Makefile.am (update-po): New target to easily
+ update the .pot and .po files. Uses po4a --force.
+
2007-10-11 Helge Kreutzmann <[EMAIL PROTECTED]>
* po/de.po: Updated to 1279t0f64u.
diff --git a/man/Makefile.am b/man/Makefile.am
index 98fcc82..63278db 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,6 +13,11 @@ clean-local:
$(srcdir)/po/po4a.cfg
rm -f man.stamp
+update-po:
+ cd $(srcdir)/po && \
+ po4a --no-backups --force --variable srcdir=../../man \
+ ./po4a.cfg
+
# Extract the list of languages from the po4a config file.
LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p'
$(srcdir)/po/po4a.cfg)
@@ -87,3 +92,4 @@ EXTRA_DIST = \
po/po4a.cfg \
po/dpkg-man.pot
+.PHONY: update-po
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
