OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2002 17:37:03
Branch: HEAD Handle: 2002112716370300
Modified files:
openpkg-src/openpkg-tool openpkg-build.pl
Log:
fix rpm output parser for +PROXY tags.
no curses please.
Summary:
Revision Changes Path
1.7 +2 -3 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================
$ cvs diff -u -r1.6 -r1.7 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 27 Nov 2002 15:54:00 -0000 1.6
+++ openpkg-src/openpkg-tool/openpkg-build.pl 27 Nov 2002 16:37:03 -0000 1.7
@@ -268,12 +268,12 @@
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 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;
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
