summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-20 13:44:28 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-10-20 13:44:28 +0000
commit3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85 (patch)
tree479de4ec5d56265921398709f70e814132249d32
parent89b1217172c61d545703ed2784dfe4aeba700cab (diff)
downloadurpmi-3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85.tar
urpmi-3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85.tar.gz
urpmi-3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85.tar.bz2
urpmi-3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85.tar.xz
urpmi-3e6f55b7b4e4b22a9b0b70febc8fc9c564b99b85.zip
Adapt loop exit in callback in level of nesting
-rwxr-xr-xurpmf5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpmf b/urpmf
index 8186b4e8..8bd50603 100755
--- a/urpmf
+++ b/urpmf
@@ -147,9 +147,10 @@ while ($callback =~ /%[-\d]*(\w+)/g) {
}
}
$callback =~ s/%([-\d]*)(\w+)/%${1}s/g;
-$uniq and $uniq = "\n" . ' $uniq{$_} and return 1; $uniq{$_} = 1;';
+my $next_st = $multi ? 'next' : 'return 1';
+$uniq and $uniq = "\n" . ' $uniq{$_} and ' . $next_st . '; $uniq{$_} = 1;';
$callback .= qq<$sprintfargs);
- $expr or return 1;$uniq
+ $expr or $next_st;$uniq
print;>;
$callback .= "\n }" if $multi;
$callback .= "\n 1;\n}";