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: 04-Feb-2003 13:32:12
Branch: HEAD Handle: 2003020412321100
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl
Log:
also pull in options from old descriptions when parsing conditional
dependencies
Summary:
Revision Changes Path
1.51 +2 -2 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.50 -r1.51 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 4 Feb 2003 12:02:50 -0000 1.50
+++ openpkg-src/openpkg-tool/openpkg-build.pl 4 Feb 2003 12:32:11 -0000 1.51
@@ -843,7 +843,7 @@
my(@t) = get_targets($installed->{$name},sub { 1; });
$mywith = combine_options(
$options,
- @t ? $t[0]->{OPTIONS} : undef,
+ @t ? get_with($t[0]) : undef,
$with
);
} else {
@@ -939,7 +939,7 @@
my(@t) = get_targets($installed->{$name},sub { 1; });
$mywith = combine_options(
$options,
- @t ? $t[0]->{OPTIONS} : undef,
+ @t ? get_with($t[0]) : undef,
$with
);
} else {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
