summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2011-09-22 16:46:23 +0200
committerJustin Davis <jrcd83@gmail.com>2011-09-22 16:46:23 +0200
commit58fc6f5e57eeeaca6e815bd3cb804cb453e05b0d (patch)
tree8d2edb92e9fc78cf273c08d4007e3f52018ec0fd /bin
parent91cbac4f9f8391ff277b813c28aac2cc8b9b522f (diff)
downloadgenpkg-58fc6f5e57eeeaca6e815bd3cb804cb453e05b0d.tar.gz
genpkg-58fc6f5e57eeeaca6e815bd3cb804cb453e05b0d.tar.xz
Remove debugging output from makepkgbuild and from perl-dist.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/makepkgbuild2
-rwxr-xr-xbin/metas/perl.d/perl-dist19
2 files changed, 10 insertions, 11 deletions
diff --git a/bin/makepkgbuild b/bin/makepkgbuild
index 33b2216..9f64088 100755
--- a/bin/makepkgbuild
+++ b/bin/makepkgbuild
@@ -16,7 +16,7 @@ i
'"$txt"'
.
wq
-' | tee dbg | ed PKGBUILD >/dev/null 2>&1
+' | ed PKGBUILD >/dev/null 2>&1
return $? ;;
esac
}
diff --git a/bin/metas/perl.d/perl-dist b/bin/metas/perl.d/perl-dist
index b371d27..87bb9df 100755
--- a/bin/metas/perl.d/perl-dist
+++ b/bin/metas/perl.d/perl-dist
@@ -175,7 +175,7 @@ sub _reqs2deps
my ($prereqs) = @_;
my %pkgdeps;
-
+
CPAN_DEP_LOOP:
while (my ($name, $ver) = each %$prereqs) {
# Sometimes a perl version is given as a prerequisite
@@ -206,7 +206,7 @@ sub _reqs2deps
# Avoid parsing a bundled version of 0. Is this possible?
my $bundle_vobj = version->parse($bundled_version);
- my $dep_vobj = version->parse($ver);
+ my $dep_vobj = version->parse($ver);
next CPAN_DEP_LOOP if $bundle_vobj >= $dep_vobj;
}
@@ -223,7 +223,7 @@ sub _reqs2deps
# are 0)
$pkgdeps{$pkgname} ||= ($ver ? dist_pkgver($ver) : 0);
}
-
+
return \%pkgdeps;
}
@@ -233,20 +233,20 @@ sub prereqs
# maps perl names for different dependencies to ArchLinux's names
my %namemap = ('configure' => 'makedepends',
- 'build' => 'makedepends',
- 'test' => 'checkdepends',
- 'runtime' => 'depends');
+ 'build' => 'makedepends',
+ 'test' => 'checkdepends',
+ 'runtime' => 'depends');
my %pkgdeps;
while (my ($perl, $arch) = each %namemap) {
my $reqs = $prereqs->{$perl}{'requires'};
- my $deps = _reqs2deps($reqs) if $reqs;
+ my $deps; $deps = _reqs2deps($reqs) if $reqs;
next unless keys %$deps;
if ($pkgdeps{$arch}) { _merge($pkgdeps{$arch}, $deps); }
else { $pkgdeps{$arch} = $deps; }
}
-
+
# ArchLinux now has a separate array for dependencies that we only
# need for checking (aka "testing"). Older perl METAs do not
# have this separated. Force any test modules to be checkdepends.
@@ -263,7 +263,7 @@ sub prereqs
}
_mergedups(@pkgdeps{qw/makedepends checkdepends/});
- _mergedups(@pkgdeps{qw/depends makedepends/});
+ _mergedups(@pkgdeps{qw/depends makedepends/});
# Convert all deps into arrays of strings.
for my $deptype (keys %pkgdeps) {
@@ -536,7 +536,6 @@ sub _readmedesc
chomp;
next unless /\ANAME/ ... /\A[A-Z]+/
and / \A \s* ${modname} [\s\-]+ (.+) \z /x;
- print STDERR qq{Found description "$1" in README};
return $1;
}