public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpmclosure, also take into account rel attribute when versions are the same

Browse Source 
svn path=/nixpkgs/trunk/; revision=31964
This commit is contained in:
Rob Vermaas 2012-02-02 09:53:45 +00:00
parent f53c231cc4
commit 6a3feaa3dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/vm/rpm/rpm-closure.pl
View File

@ -76,8 +76,9 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
my $earlierPkg = $pkgs{$pkg->{name}}; my $earlierPkg = $pkgs{$pkg->{name}};
print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
# <version epoch="0" ver="1.28.0" rel="2.el6"/> # <version epoch="0" ver="1.28.0" rel="2.el6"/>
if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) { my $cmp = rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver});
print STDERR "WARNING: replaced package $pkg->{name} with newer one\n"; if ($cmp > 0 || ($cmp == 0 && rpmvercmp($pkg->{'version'}->{rel}, $earlierPkg->{'version'}->{rel})>0)) {
print STDERR "WARNING: replaced package $pkg->{name} (".$earlierPkg->{'version'}->{ver}." ".$earlierPkg->{'version'}->{rel}.") with newer one (".$pkg->{'version'}->{ver}." ".$pkg->{'version'}->{rel}.")\n";
$pkg->{urlPrefix} = $urlPrefixes[$i]; $pkg->{urlPrefix} = $urlPrefixes[$i];
$pkgs{$pkg->{name}} = $pkg; $pkgs{$pkg->{name}} = $pkg;
} }
@ -175,3 +176,4 @@ foreach my $pkgName (@needed) {
} }
print "]\n"; print "]\n";
exit 1