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 openpkg-web Date: 22-Jan-2003 11:46:57 Branch: HEAD Handle: 2003012210465501 Modified files: openpkg-src/openpkg-tool openpkg-build.pl openpkg-tool.spec openpkg-web news.txt Log: allow binary installs from packages with options set to default Summary: Revision Changes Path 1.41 +13 -3 openpkg-src/openpkg-tool/openpkg-build.pl 1.29 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec 1.2968 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-build.pl ============================================================================ $ cvs diff -u -r1.40 -r1.41 openpkg-build.pl --- openpkg-src/openpkg-tool/openpkg-build.pl 21 Jan 2003 13:25:06 -0000 1.40 +++ openpkg-src/openpkg-tool/openpkg-build.pl 22 Jan 2003 10:46:56 -0000 1.41 @@ -537,12 +537,20 @@ # where option already exists in old or option key # matches regular expression # +# return true if anything was actually changed or augmented +# sub override_options ($$$) { my($old, $new, $reg) = @_; + my($rc); foreach my $k (keys %$new) { - $old->{$k} = $new->{$k} if exists $old->{$k} || $k =~ /^$reg$/; + if ((exists $old->{$k} && $old->{$k} ne $new->{$k}) || $k =~ /^$reg$/) { + $old->{$k} = $new->{$k}; + $rc = 1; + } } + + return $rc; } # @@ -1684,7 +1692,9 @@ # if ($old) { $old = { %$old }; - override_options($old, $new, $c->{optreg}); + unless (override_options($old, $new, $c->{optreg})) { + return ''; + } } else { $old = $new; } @@ -1732,7 +1742,7 @@ # OR existing binary package doesn't satisfy wanted options # $cmd1 = undef; - if ($uncond || !-f $bpkg || $_->{REBUILD} || + if ($uncond || !-f $bpkg || !target_suitable(binary_target($_, $bpkg),$with)) { $opt = make_defines($_->{OPTIONS}, $with, $c); @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-tool.spec ============================================================================ $ cvs diff -u -r1.28 -r1.29 openpkg-tool.spec --- openpkg-src/openpkg-tool/openpkg-tool.spec 21 Jan 2003 13:25:06 -0000 1.28 +++ openpkg-src/openpkg-tool/openpkg-tool.spec 22 Jan 2003 10:46:56 -0000 1.29 @@ -32,8 +32,8 @@ Distribution: OpenPKG [PLUS] Group: Bootstrapping License: GPL -Version: 20030121 -Release: 20030121 +Version: 20030122 +Release: 20030122 # list of sources Source0: openpkg.sh @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.2967 -r1.2968 news.txt --- openpkg-web/news.txt 22 Jan 2003 10:28:48 -0000 1.2967 +++ openpkg-web/news.txt 22 Jan 2003 10:46:55 -0000 1.2968 @@ -1,3 +1,4 @@ +22-Jan-2003: Upgraded package: P<openpkg-tool-20030122-20030122> 22-Jan-2003: B<Now available: OpenPKG 1.2> 22-Jan-2003: Upgraded package: P<perl-util-20030122-20030122> 22-Jan-2003: Upgraded package: P<calc-2.11.6.3-20030122> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]