OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 20-Nov-2002 17:38:44
Branch: HEAD Handle: 2002112016384400
Modified files:
openpkg-re openpkg-build
Log:
again prefer parameter set from installed base
Summary:
Revision Changes Path
1.38 +5 -3 openpkg-re/openpkg-build
____________________________________________________________________________
Index: openpkg-re/openpkg-build
============================================================
$ cvs diff -u -r1.37 -r1.38 openpkg-build
--- openpkg-re/openpkg-build 20 Nov 2002 16:35:39 -0000 1.37
+++ openpkg-re/openpkg-build 20 Nov 2002 16:38:44 -0000 1.38
@@ -326,12 +326,14 @@
my($t,$fn) = @_;
my(@l,%with);
- if (exists $t->{desc}) {
- @l = split(/\n+/, $t->{desc});
- } elsif (defined $fn) {
+ if (defined $fn) {
@l = `$RPM_NPRIV -qi -p $fn`;
} else {
@l = `$RPM_NPRIV -qi $t->{name}`;
+ }
+
+ if (scalar(@l) == 0 && exists $t->{desc}) {
+ @l = split(/\n+/, $t->{desc});
}
%with = map { /--define\s*'(\S+)\s+(\S+?)'/ } @l;
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
