Author: allison
Date: Wed Nov 16 12:28:19 2005
New Revision: 10033
Modified:
trunk/ (props changed)
trunk/lib/Parrot/Distribution.pm
trunk/lib/Parrot/Revision.pm
Log:
Fixed uninitialized variable warning from t/perl/manifest (see ticket #37655).
Modified: trunk/lib/Parrot/Distribution.pm
==============================================================================
--- trunk/lib/Parrot/Distribution.pm (original)
+++ trunk/lib/Parrot/Distribution.pm Wed Nov 16 12:28:19 2005
@@ -231,9 +231,15 @@ Query the svn:ignore property and genera
sub gen_manifest_skip {
- # manicheck.pl is propably only useful for checked out revisions
+ # manicheck.pl is probably only useful for checked out revisions
# Checkout is done either with svn or svk
- my $svn_cmd = $Parrot::Revision::svn_entries =~ m/\.svn/ ? 'svn' : 'svk';
+ my $svn_cmd;
+ if (defined $Parrot::Revision::svn_entries
+ && $Parrot::Revision::svn_entries =~ m/\.svn/) {
+ $svn_cmd = 'svn';
+ } else {
+ $svn_cmd = 'svk';
+ }
# Find all directories in the Parrot distribution
my %dir_list = map { my $dir = ( File::Spec->splitpath( $_ ) )[1];
Modified: trunk/lib/Parrot/Revision.pm
==============================================================================
--- trunk/lib/Parrot/Revision.pm (original)
+++ trunk/lib/Parrot/Revision.pm Wed Nov 16 12:28:19 2005
@@ -25,13 +25,8 @@ use 5.006;
our $svn_entries = undef;
sub __get_revision {
- foreach my $entry ( qw[.svn/entries .svk/entries] ) {
- if (-e $entry) {
- $svn_entries = $entry;
- last;
- }
- }
- return 0 unless defined $svn_entries;
+ return 0 unless (-e ".svn/entries");
+ $svn_entries = ".svn/entries";
# code taken from pugs/util/version_h.pl rev 859
if (-r $svn_entries) {
