dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove tabs

Browse Source
This commit is contained in:
Eelco Dolstra 2015-02-12 17:00:31 +01:00
parent 28ea9050fa
commit ff37dc6fb6
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,20 +28,20 @@ sub rpmvercmp {
my $v2 = $vercmps2[$i]; my $v2 = $vercmps2[$i];
if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) { if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) {
if ( int($v1) > int($v2) ) { if ( int($v1) > int($v2) ) {
return 1; return 1;
} }
elsif ( int($v1) < int($v2) ) { elsif ( int($v1) < int($v2) ) {
return -1; return -1;
} }
} else { } else {
if ( $v1 gt $v2 ) { if ( $v1 gt $v2 ) {
return 1; return 1;
} }
elsif ( $v1 lt $v2 ) { elsif ( $v1 lt $v2 ) {
return -1; return -1;
} }
} }
} }
if($l1 == $l2) { if($l1 == $l2) {
return 0; return 0;
@ -93,11 +93,11 @@ my %provides;
foreach my $pkgName (keys %pkgs) { foreach my $pkgName (keys %pkgs) {
#print STDERR "looking at $pkgName\n"; #print STDERR "looking at $pkgName\n";
my $pkg = $pkgs{$pkgName}; my $pkg = $pkgs{$pkgName};
#print STDERR keys %{$pkg->{format}}, "\n"; #print STDERR keys %{$pkg->{format}}, "\n";
#print STDERR $pkg->{format}->{'rpm:provides'}, "\n"; #print STDERR $pkg->{format}->{'rpm:provides'}, "\n";
my $provides = $pkg->{format}->{'rpm:provides'}->{'rpm:entry'} or die; my $provides = $pkg->{format}->{'rpm:provides'}->{'rpm:entry'} or die;
foreach my $req (@{$provides}) { foreach my $req (@{$provides}) {
#print "$req->{name}\n"; #print "$req->{name}\n";
@ -123,9 +123,9 @@ sub closePackage {
return if defined $donePkgs{$pkgName}; return if defined $donePkgs{$pkgName};
$donePkgs{$pkgName} = 1; $donePkgs{$pkgName} = 1;
print STDERR ">>> $pkgName\n"; print STDERR ">>> $pkgName\n";
my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist"; my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist";
my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || []; my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || [];
@ -140,7 +140,7 @@ sub closePackage {
next; next;
} }
print STDERR " satisfied by $provider\n"; print STDERR " satisfied by $provider\n";
push @deps, $provider; push @deps, $provider;
} }
closePackage($_) foreach @deps; closePackage($_) foreach @deps;