summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MDK/Common/Func.pm6
-rw-r--r--perl-MDK-Common.spec5
2 files changed, 8 insertions, 3 deletions
diff --git a/MDK/Common/Func.pm b/MDK/Common/Func.pm
index 6578010..56e032a 100644
--- a/MDK/Common/Func.pm
+++ b/MDK/Common/Func.pm
@@ -280,10 +280,12 @@ sub catch_cdie(&&) {
}
sub cdie {
- my ($err, $f) = @_;
+ my ($err) = @_;
foreach (@MDK::Common::Func::cdie_catches) {
$@ = $err;
- &{$_}(\$err) and return;
+ if (my $v = &{$_}(\$err)) {
+ return $v;
+ }
}
die $err;
}
diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec
index e7601f9..ed0ab13 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 12mdk
+%define release 13mdk
Summary: Various simple functions
Name: perl-MDK-Common
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
# MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common
%changelog
+* Tue Aug 27 2002 Pixel <pixel@mandrakesoft.com> 1.0.3-13mdk
+- give a meaning to the return value of cdie
+
* Mon Aug 12 2002 Pixel <pixel@mandrakesoft.com> 1.0.3-12mdk
- add setExportedVarsInSh and setExportedVarsInCsh
- remove setVarsInCsh (obsoleted by setExportedVarsInCsh)