From 54757f6a94bc8b1581fdb360b36ecc5c81df70c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20Schr=C3=B6der?= Date: Mon, 29 Sep 2008 13:47:07 +0000 Subject: [PATCH] - fix boolification in && and || --- Build/Rpm.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Build/Rpm.pm b/Build/Rpm.pm index a476093..3877a01 100644 --- a/Build/Rpm.pm +++ b/Build/Rpm.pm @@ -43,11 +43,19 @@ sub expr { return ($v, $expr) if $lev > 1; ($v2, $expr) = expr(substr($expr, 2), 1); return undef unless defined $v2; + $v = 0 if $v && $v eq '\"\"'; + $v =~ s/^0+/0/; + $v2 = 0 if $v2 && $v2 eq '\"\"'; + $v2 =~ s/^0+/0/; $v &&= $v2; } elsif ($expr =~ /^\|\|/) { return ($v, $expr) if $lev > 1; ($v2, $expr) = expr(substr($expr, 2), 1); return undef unless defined $v2; + $v = 0 if $v && $v eq '\"\"'; + $v =~ s/^0+/0/; + $v2 = 0 if $v2 && $v2 eq '\"\"'; + $v2 =~ s/^0+/0/; $v ||= $v2; } elsif ($expr =~ /^>=/) { return ($v, $expr) if $lev > 2; -- 2.7.4