summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MDK/Common.pm.pl2
-rw-r--r--MDK/Common/System.pm4
-rw-r--r--perl-MDK-Common.spec5
3 files changed, 7 insertions, 4 deletions
diff --git a/MDK/Common.pm.pl b/MDK/Common.pm.pl
index 07198f5..ba7a989 100644
--- a/MDK/Common.pm.pl
+++ b/MDK/Common.pm.pl
@@ -74,7 +74,7 @@ use vars qw(@ISA @EXPORT $VERSION); #);
# perl_checker: RE-EXPORT-ALL
@EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::;
-$VERSION = "1.1.15";
+$VERSION = "1.1.16";
1;
EOF
diff --git a/MDK/Common/System.pm b/MDK/Common/System.pm
index 22894b3..3b21a9d 100644
--- a/MDK/Common/System.pm
+++ b/MDK/Common/System.pm
@@ -290,14 +290,14 @@ sub gettimeofday() { my $t = pack "LL"; syscall_('gettimeofday', $t, 0) or die "
sub unix2dos { local $_ = $_[0]; s/\015$//mg; s/$/\015/mg; $_ }
sub whereis_binary {
- my ($prog) = @_;
+ my ($prog, $o_prefix) = @_;
if ($prog =~ m!/!) {
warn qq(don't call whereis_binary with a name containing a "/" (the culprit is: $prog)\n);
return;
}
foreach (split(':', $ENV{PATH})) {
my $f = "$_/$prog";
- -x $f and return $f;
+ -x "$o_prefix$f" and return $f;
}
}
diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec
index 7138067..456585b 100644
--- a/perl-MDK-Common.spec
+++ b/perl-MDK-Common.spec
@@ -2,7 +2,7 @@
# do not change the version here, change in MDK/Common.pm.pl
%define version THEVERSION
-%define release 2mdk
+%define release 1mdk
%ifarch x86_64
%define build_option PERL_CHECKER_TARGET='debug-code BCSUFFIX=""'
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
# MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common
%changelog
+* Mon Aug 2 2004 Pixel <pixel@mandrakesoft.com> 1.1.16-1mdk
+- MDK::Common::System: whereis_binary() can now handle prefix
+
* Fri Jul 23 2004 Pixel <pixel@mandrakesoft.com> 1.1.15-2mdk
- workaround bug in ocaml on ultrasparc
(can't catch exception "Fatal error: out-of-bound access in array or string" in native code)