diff options
| -rw-r--r-- | MgaRelease/Common.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MgaRelease/Common.pm b/MgaRelease/Common.pm index a4c38af..41dba72 100644 --- a/MgaRelease/Common.pm +++ b/MgaRelease/Common.pm @@ -28,7 +28,7 @@ sub make_srpms_list_from_synthesis { $urpm->traverse(sub { $srpms_list->{$_[0]->name}->{version} = $_[0]->version; $srpms_list->{$_[0]->name}->{release} = $_[0]->release; - $srpms_list->{$_[0]->name}->{epoch} = $_[0]->epoch if $_[0]->epoch; + $srpms_list->{$_[0]->name}->{epoch} = $_[0]->epoch; }); } @@ -55,10 +55,9 @@ sub path_rev sub get_srpms_rev { my $ra = SVN::Ra->new(config()->{svn_repourl}); foreach my $pkg (keys %$srpms_list) { - my ($ver, $rel) = @{$srpms_list->{$pkg}}{qw/version release/}; - my $epoch = $srpms_list->{$pkg}->{epoch} ? - $srpms_list->{$pkg}->{epoch} . ':' : ''; - $svnrev = path_rev($ra, "cauldron/$pkg/releases/$epoch$ver/$rel"); + my ($ver, $rel, $epoch) = @{$srpms_list->{$pkg}}{qw/version release epoch/}; + $svnrev = path_rev($ra, "cauldron/$pkg/releases/$epoch:$ver/$rel"); + $svnrev = path_rev($ra, "cauldron/$pkg/releases/$ver/$rel") unless $svnrev; $srpms_list->{$pkg}->{svnrev} = $svnrev if $svnrev; } } |