This is an automated email from the git hooks/post-receive script.
guillem pushed a commit to branch master
in repository dpkg.
commit d6c8af723fb79f96e1bcc3d87e952e0a7a9eea0e
Author: Guillem Jover <guil...@debian.org>
Date: Sun Apr 1 03:23:10 2018 +0200
dpkg-checkbuilddeps: Fix indentation
---
scripts/dpkg-checkbuilddeps.pl | 69 +++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 35 deletions(-)
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 80b309f..c5a65e1 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -138,48 +138,47 @@ if ($bc_value) {
}
if (@unmet) {
- errormsg(g_('Unmet build dependencies: %s'),
- join(' ', map { $_->output() } @unmet));
+ errormsg(g_('Unmet build dependencies: %s'),
+ join(' ', map { $_->output() } @unmet));
}
if (@conflicts) {
- errormsg(g_('Build conflicts: %s'),
- join(' ', map { $_->output() } @conflicts));
+ errormsg(g_('Build conflicts: %s'),
+ join(' ', map { $_->output() } @conflicts));
}
exit 1 if @unmet || @conflicts;
# Silly little status file parser that returns a Dpkg::Deps::KnownFacts
sub parse_status {
- my $status = shift;
-
- my $facts = Dpkg::Deps::KnownFacts->new();
- local $/ = '';
- open(my $status_fh, '<', $status)
- or syserr(g_('cannot open %s'), $status);
- while (<$status_fh>) {
- next unless /^Status: .*ok installed$/m;
-
- my ($package) = /^Package: (.*)$/m;
- my ($version) = /^Version: (.*)$/m;
- my ($arch) = /^Architecture: (.*)$/m;
- my ($multiarch) = /^Multi-Arch: (.*)$/m;
- $facts->add_installed_package($package, $version, $arch,
- $multiarch);
-
- if (/^Provides: (.*)$/m) {
- my $provides = deps_parse($1, reduce_arch => 1, union
=> 1);
- next if not defined $provides;
- foreach (grep { $_->isa('Dpkg::Deps::Simple') }
- $provides->get_deps())
- {
- $facts->add_provided_package($_->{package},
- $_->{relation}, $_->{version},
- $package);
- }
- }
- }
- close $status_fh;
-
- return $facts;
+ my $status = shift;
+
+ my $facts = Dpkg::Deps::KnownFacts->new();
+ local $/ = '';
+ open(my $status_fh, '<', $status)
+ or syserr(g_('cannot open %s'), $status);
+ while (<$status_fh>) {
+ next unless /^Status: .*ok installed$/m;
+
+ my ($package) = /^Package: (.*)$/m;
+ my ($version) = /^Version: (.*)$/m;
+ my ($arch) = /^Architecture: (.*)$/m;
+ my ($multiarch) = /^Multi-Arch: (.*)$/m;
+ $facts->add_installed_package($package, $version, $arch, $multiarch);
+
+ if (/^Provides: (.*)$/m) {
+ my $provides = deps_parse($1, reduce_arch => 1, union => 1);
+ next if not defined $provides;
+ foreach (grep { $_->isa('Dpkg::Deps::Simple') }
+ $provides->get_deps())
+ {
+ $facts->add_provided_package($_->{package},
+ $_->{relation}, $_->{version},
+ $package);
+ }
+ }
+ }
+ close $status_fh;
+
+ return $facts;
}
# This function checks the build dependencies passed in as the first
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/dpkg/dpkg.git
