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: 20-Dec-2002 15:54:59
Branch: HEAD Handle: 2002122014545701
Modified files:
openpkg-src/openpkg-tool openpkg-build.pl openpkg-tool.spec
openpkg-web news.txt
Log:
now handles missing upgrade paths gracefully by falling back dependency to
installed version
Summary:
Revision Changes Path
1.16 +14 -2 openpkg-src/openpkg-tool/openpkg-build.pl
1.10 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.2345 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================
$ cvs diff -u -r1.15 -r1.16 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 18 Dec 2002 10:34:35 -0000 1.15
+++ openpkg-src/openpkg-tool/openpkg-build.pl 20 Dec 2002 14:54:58 -0000 1.16
@@ -884,7 +884,7 @@
my($dep, $env) = @_;
my($name,@vers);
my($i,$r,$b,$cond,$version);
- my($t);
+ my($t,$tdef);
$dep =~ s/(\S+)\s*//;
$name = $1;
@@ -908,10 +908,13 @@
return;
}
+ $tdef = undef;
+
if ($i && (@vers = get_versions($i, $cond))) {
foreach (@vers) {
$t = $i->{$_}->[0];
if (get_with($t), target_suitable($t, $env->{with})) {
+ $tdef = $t;
if (!$env->{upgrade}) {
return ($t, 1);
}
@@ -922,7 +925,16 @@
return ($b->{$vers[0]}->[0], 1);
}
- return (chose_source($env, $name, $r, get_versions($r, $cond)), 0);
+ $t = chose_source($env, $name, $r, get_versions($r, $cond));
+ if ($t) {
+ return ($t, 0);
+ }
+
+ if ($tdef) {
+ return ($tdef, 1);
+ }
+
+ return;
}
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================
$ cvs diff -u -r1.9 -r1.10 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 18 Dec 2002 10:37:07 -0000
1.9
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 20 Dec 2002 14:54:58 -0000
1.10
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Bootstrapping
License: GPL
-Version: 20021218
-Release: 20021218
+Version: 20021220
+Release: 20021220
# list of sources
Source0: openpkg.sh
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2344 -r1.2345 news.txt
--- openpkg-web/news.txt 20 Dec 2002 14:35:12 -0000 1.2344
+++ openpkg-web/news.txt 20 Dec 2002 14:54:57 -0000 1.2345
@@ -1,3 +1,4 @@
+20-Dez-2002: Upgraded package: P<openpkg-tool-20021220-20021220>
20-Dez-2002: Upgraded package: P<tomcat-adapter-3.2.4-20021220>
20-Dec-2002: Upgraded package: P<lout-3.28-20021220>
19-Dec-2002: Upgraded package: P<as-gui-0.5.9-20021219>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
