aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-21 20:57:18 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-21 20:57:18 +0000
commit8fc4203c7786e025830027da80da50061ef86d22 (patch)
tree5c491d1594fc06a4b94ba24f51d145e7d8601f9b
parentcb58bdf62649202bf35ea416ca42a525254372b6 (diff)
downloadrelease-8fc4203c7786e025830027da80da50061ef86d22.tar
release-8fc4203c7786e025830027da80da50061ef86d22.tar.gz
release-8fc4203c7786e025830027da80da50061ef86d22.tar.bz2
release-8fc4203c7786e025830027da80da50061ef86d22.tar.xz
release-8fc4203c7786e025830027da80da50061ef86d22.zip
Include epoch in svn path
-rw-r--r--MgaRelease/Common.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/MgaRelease/Common.pm b/MgaRelease/Common.pm
index bd84df8..a4c38af 100644
--- a/MgaRelease/Common.pm
+++ b/MgaRelease/Common.pm
@@ -28,6 +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;
});
}
@@ -55,7 +56,9 @@ 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/};
- $svnrev = path_rev($ra, "cauldron/$pkg/releases/$ver/$rel");
+ my $epoch = $srpms_list->{$pkg}->{epoch} ?
+ $srpms_list->{$pkg}->{epoch} . ':' : '';
+ $svnrev = path_rev($ra, "cauldron/$pkg/releases/$epoch$ver/$rel");
$srpms_list->{$pkg}->{svnrev} = $svnrev if $svnrev;
}
}