diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-01-24 02:15:44 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-01-24 02:15:44 +0000 |
| commit | 007b18555518e1ef3e63f9876ad1fcd2768937b2 (patch) | |
| tree | 2c75e07cc3444ef703832ec274a1de9bf5c14832 /t/synthesis.t | |
| parent | c11bc530a1101f4ec4307aa54e3e6b44ba0456e4 (diff) | |
| download | perl-URPM-007b18555518e1ef3e63f9876ad1fcd2768937b2.tar perl-URPM-007b18555518e1ef3e63f9876ad1fcd2768937b2.tar.gz perl-URPM-007b18555518e1ef3e63f9876ad1fcd2768937b2.tar.bz2 perl-URPM-007b18555518e1ef3e63f9876ad1fcd2768937b2.tar.xz perl-URPM-007b18555518e1ef3e63f9876ad1fcd2768937b2.zip | |
skip fullname & evr check for 'gpg-pubkey' packages
Diffstat (limited to 't/synthesis.t')
| -rw-r--r-- | t/synthesis.t | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/t/synthesis.t b/t/synthesis.t index a662a25..2281267 100644 --- a/t/synthesis.t +++ b/t/synthesis.t @@ -153,7 +153,7 @@ ok($provides[0] eq 'glibc-devel'); SKIP: { my $synthesis = "res/synthesis.hdlist_distepoch.xz"; if (!(-r $synthesis)) { - skip "$synthesis missing, only found in svn", 1; + skip "$synthesis missing, only found in svn", 1; } my $urpm = new URPM; @@ -230,18 +230,21 @@ SKIP: { $errors++; } - my $expectedevr = $pkg->version . "-" . $pkg->release . ($pkg->distepoch ? ":" . $pkg->distepoch : ""); - if ($expectedevr ne $pkg->evr and "$epoch:$expectedevr" ne $pkg->evr and $pkg->name ne "gpg-pubkey") { - print "evr[" . $pkg->fullname . "]: $expectedevr != " . $pkg->evr . "\n"; - $errors++; - } + if ($pkg->name ne "gpg-pubkey") { - my $expectedfullname = "$name-$version-$release" . ($disttag ? "-$disttag" : "") . ($distepoch ? $distepoch : "") . ($arch ? ".$arch" : ""); - if($pkg->fullname ne $expectedfullname) { - print "fullname: " . $pkg->fullname . " != $expectedfullname\n"; - $errors++; + my $expectedevr = $pkg->version . "-" . $pkg->release . ($pkg->distepoch ? ":" . $pkg->distepoch : ""); + if ($expectedevr ne $pkg->evr and "$epoch:$expectedevr" ne $pkg->evr and $pkg->name ne "gpg-pubkey") { + print "evr[" . $pkg->fullname . "]: $expectedevr != " . $pkg->evr . "\n"; + $errors++; + } + + my $expectedfullname = "$name-$version-$release" . ($disttag ? "-$disttag" : "") . ($distepoch ? $distepoch : "") . ($arch ? ".$arch" : ""); + if($pkg->fullname ne $expectedfullname) { + print "fullname: " . $pkg->fullname . " != $expectedfullname\n"; + $errors++; + } } - }); + }); is($errors, 0, "fields check"); |