Author: rob
Date: Thu Feb 2 09:53:45 2012
New Revision: 31964
URL: https://nixos.org/websvn/nix/?rev=31964&sc=1
Log:
rpmclosure, also take into account rel attribute when versions are the same
Modified:
nixpkgs/trunk/pkgs/build-support/vm/rpm/rpm-closure.pl
Modified: nixpkgs/trunk/pkgs/build-support/vm/rpm/rpm-closure.pl
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/rpm/rpm-closure.pl Thu Feb 2
08:54:54 2012 (r31963)
+++ nixpkgs/trunk/pkgs/build-support/vm/rpm/rpm-closure.pl Thu Feb 2
09:53:45 2012 (r31964)
@@ -76,8 +76,9 @@
my $earlierPkg = $pkgs{$pkg->{name}};
print STDERR "WARNING: duplicate occurrence of package
$pkg->{name}\n";
# <version epoch="0" ver="1.28.0" rel="2.el6"/>
- if (rpmvercmp($pkg->{'version'}->{ver},
$earlierPkg->{'version'}->{ver}) >= 0) {
- print STDERR "WARNING: replaced package $pkg->{name} with
newer one\n";
+ my $cmp = rpmvercmp($pkg->{'version'}->{ver},
$earlierPkg->{'version'}->{ver});
+ 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];
$pkgs{$pkg->{name}} = $pkg;
}
@@ -175,3 +176,4 @@
}
print "]\n";
+exit 1
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
