|
|
@@ -268,12 +268,12 @@ sub get_installed () {
|
|
|
my(@l) = `$RPM_NPRIV --provides -qa`;
|
|
|
|
|
|
foreach (@l) {
|
|
|
- /^(\S+)\s*(?:=\s*([^\s\-]+)-(\S+))?$/;
|
|
|
+ /^(\S+)\s*(?:=\s*([^\s\-]+)-([^\s\+]+)(\+PROXY)?)?$/;
|
|
|
push(@{$map{$1}->{"$2-$3"}}, {
|
|
|
name => $1,
|
|
|
version => (defined $2 ? $2 : '*'),
|
|
|
release => (defined $3 ? $3 : '*'),
|
|
|
- PROXY => ($3 =~ /\+PROXY$/)
|
|
|
+ PROXY => $4
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -1123,7 +1123,6 @@ sub binary_target ($$) {
|
|
|
|
|
|
sub find_proxy ($$) {
|
|
|
my($t,$bpkg) = @_;
|
|
|
- print STDERR "FUCK: ".$t->{name}."\n";
|
|
|
my(@l) = `$RPM_NPRIV -ql $t->{name}`;
|
|
|
my($link) = (grep { $_ =~ /\/\.prefix-$t->{name}$/ } @l)[0];
|
|
|
return unless defined $link;
|