summaryrefslogtreecommitdiff
path: root/createrpmdeps
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2009-12-08 17:51:32 +0100
committerMichael Schroeder <mls@suse.de>2009-12-08 17:51:32 +0100
commitc8b33e430bfb40b80df43249279bd561d874d786 (patch)
tree12a32184d9f367d45cb0574877f1fd20b3864fa6 /createrpmdeps
parentd32fc3a74edbc477871d62ce90e7f8ea813f10e2 (diff)
- fix whitespace (revert large part of e7cba6)
Diffstat (limited to 'createrpmdeps')
-rwxr-xr-xcreaterpmdeps94
1 files changed, 47 insertions, 47 deletions
diff --git a/createrpmdeps b/createrpmdeps
index e41de15..c8c796d 100755
--- a/createrpmdeps
+++ b/createrpmdeps
@@ -84,55 +84,55 @@ foreach my $dir (@ARGV) {
for my $known (@todo) {
my $path = $known2path{$known};
if ($path =~ /\.rpm$/) {
- my %res = Build::Rpm::rpmq($path, 1000, 1001, 1002, 1006, 1022, 1047, 1049, 1048, 1050, 1112, 1113);
- next unless %res;
- Build::Rpm::add_flagsvers(\%res, 1047, 1112, 1113);
- Build::Rpm::add_flagsvers(\%res, 1049, 1048, 1050);
- my $id = $known;
- $id =~ s/.*-//;
- if ($known ne "$res{1000}->[0].$res{1022}->[0]-$id") {
- $known = "$res{1000}->[0].$res{1022}->[0]-$id";
- if (!$known2path{$known}) {
- push @known, $known;
- $known2path{$known} = $path;
- }
- }
- # rpm3 compatibility: retrofit missing self provides
- my $name = $res{1000}->[0];
- if (!@{$res{1047} || []} || $res{1047}->[-1] !~ /^\Q$name\E =/) {
- my $evr = "$res{1001}->[0]-$res{1002}->[0]";
- $evr = "$res{1003}->[0]:$evr" if $res{1003} && $res{1003}->[0];
- push @{$res{1047}}, "$name = $evr";
- }
+ my %res = Build::Rpm::rpmq($path, 1000, 1001, 1002, 1006, 1022, 1047, 1049, 1048, 1050, 1112, 1113);
+ next unless %res;
+ Build::Rpm::add_flagsvers(\%res, 1047, 1112, 1113);
+ Build::Rpm::add_flagsvers(\%res, 1049, 1048, 1050);
+ my $id = $known;
+ $id =~ s/.*-//;
+ if ($known ne "$res{1000}->[0].$res{1022}->[0]-$id") {
+ $known = "$res{1000}->[0].$res{1022}->[0]-$id";
+ if (!$known2path{$known}) {
+ push @known, $known;
+ $known2path{$known} = $path;
+ }
+ }
+ # rpm3 compatibility: retrofit missing self provides
+ my $name = $res{1000}->[0];
+ if (!@{$res{1047} || []} || $res{1047}->[-1] !~ /^\Q$name\E =/) {
+ my $evr = "$res{1001}->[0]-$res{1002}->[0]";
+ $evr = "$res{1003}->[0]:$evr" if $res{1003} && $res{1003}->[0];
+ push @{$res{1047}}, "$name = $evr";
+ }
- $newp{$known} = "P:$known: ".join(' ', @{$res{1047} || []});
- $newr{$known} = "R:$known: ".join(' ', @{$res{1049} || []});
- #$tag{$known} = $res{1000}->[0]."-".$res{1001}->[0]."-".$res{1002}->[0]." ".$res{1007}->[0]."-".$res{1006}->[0];
- $tag{$known} = $res{1000}->[0]."-".$res{1001}->[0]."-".$res{1002}->[0]." ".$res{1006}->[0];
+ $newp{$known} = "P:$known: ".join(' ', @{$res{1047} || []});
+ $newr{$known} = "R:$known: ".join(' ', @{$res{1049} || []});
+ #$tag{$known} = $res{1000}->[0]."-".$res{1001}->[0]."-".$res{1002}->[0]." ".$res{1007}->[0]."-".$res{1006}->[0];
+ $tag{$known} = $res{1000}->[0]."-".$res{1001}->[0]."-".$res{1002}->[0]." ".$res{1006}->[0];
} else {
- my %res = Build::Deb::debq($path);
- next unless %res;
- my ($dn, $da) = ($res{'PACKAGE'}, $res{'ARCHITECTURE'});
- $da = 'noarch' if $da eq 'all';
- my $id = $known;
- $id =~ s/.*-//;
- if ($known ne "$dn.$da-$id") {
- $known = "$dn.$da-$id";
- if (!$known2path{$known}) {
- push @known, $known;
- $known2path{$known} = $path;
- }
- }
- my @provides = split(',\s*', $res{'PROVIDES'} || '');
- my @depends = split(',\s*', $res{'DEPENDS'} || '');
- my @predepends = split(',\s*', $res{'PRE-DEPENDS'} || '');
- s/\s.*// for @provides; #for now
- s/\s.*// for @depends; #for now
- s/\s.*// for @predepends; #for now
- push @depends, @predepends;
- push @provides, $res{'PACKAGE'};
- $newp{$known} = "P:$known: ".join(' ', @provides);
- $newr{$known} = "R:$known: ".join(' ', @depends);
+ my %res = Build::Deb::debq($path);
+ next unless %res;
+ my ($dn, $da) = ($res{'PACKAGE'}, $res{'ARCHITECTURE'});
+ $da = 'noarch' if $da eq 'all';
+ my $id = $known;
+ $id =~ s/.*-//;
+ if ($known ne "$dn.$da-$id") {
+ $known = "$dn.$da-$id";
+ if (!$known2path{$known}) {
+ push @known, $known;
+ $known2path{$known} = $path;
+ }
+ }
+ my @provides = split(',\s*', $res{'PROVIDES'} || '');
+ my @depends = split(',\s*', $res{'DEPENDS'} || '');
+ my @predepends = split(',\s*', $res{'PRE-DEPENDS'} || '');
+ s/\s.*// for @provides; #for now
+ s/\s.*// for @depends; #for now
+ s/\s.*// for @predepends; #for now
+ push @depends, @predepends;
+ push @provides, $res{'PACKAGE'};
+ $newp{$known} = "P:$known: ".join(' ', @provides);
+ $newr{$known} = "R:$known: ".join(' ', @depends);
}
}
}