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: 24-Jun-2003 16:58:26
Branch: HEAD Handle: 2003062415582600
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl
Log:
code cleanup, adds compatibility to older releases
Summary:
Revision Changes Path
1.81 +14 -6 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.80 -r1.81 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 24 Jun 2003 14:52:38 -0000 1.80
+++ openpkg-src/openpkg-tool/openpkg-build.pl 24 Jun 2003 14:58:26 -0000 1.81
@@ -539,15 +539,14 @@
#
# parse option from rpm provides list
#
-sub parse_provideslist ($$) {
- my($l,$name) = @_;
+sub parse_provideslist ($) {
+ my($l) = @_;
my($p);
my($nam,$val,%opts);
foreach (@$l) {
$p = parse_provides($_);
- next unless defined $p->{with};
- next if defined $p->{prefix} && $p->{prefix} ne $name;
+ next unless defined $p->{with} && defined $p->{prefix};
$opts{$p->{with}} = $p->{version}
}
@@ -584,8 +583,17 @@
@l = run("$RPM -q --provides -p $fn");
} else {
@l = run("$RPM -q --provides $t->{name}");
- }
- $opt = parse_provideslist([EMAIL PROTECTED],$t->{name});
+ }
+ $opt = parse_provideslist([EMAIL PROTECTED]);
+ if (scalar(keys %$opt) == 0) {
+ if (defined $fn) {
+ @l = run("$RPM -qi -p $fn");
+ } else {
+ @l = run("$RPM -qi $t->{name}");
+ }
+ $opt = parse_options([EMAIL PROTECTED]);
+ }
+
$t->{OPTIONS} = $opt;
}
return $opt;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
