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: 18-Jul-2003 16:46:45
Branch: HEAD Handle: 2003071815464302
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl openpkg-tool.spec openpkg.1
openpkg-web news.txt
Log:
skip virtual targets in status map, better error output
Summary:
Revision Changes Path
1.93 +20 -12 openpkg-src/openpkg-tool/openpkg-build.pl
1.68 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.10 +1 -1 openpkg-src/openpkg-tool/openpkg.1
1.5648 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.92 -r1.93 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 15 Jul 2003 10:08:31 -0000 1.92
+++ openpkg-src/openpkg-tool/openpkg-build.pl 18 Jul 2003 14:46:45 -0000 1.93
@@ -1718,14 +1718,14 @@
if ($t = target_has_conflicts($target, $env->{installed}, $env)) {
target_setstatus($target,'CONFLICT',4);
push(@$clist,$target);
- print "# $target->{name} conflicts with ",vsn($t),"\n";
+ pusherr($env,$target,"$target->{name} conflicts with ".vsn($t));
return;
}
if ($t = target_has_conflicts($target, $env->{built}, $env)) {
target_setstatus($target,'CONFLICT',4);
push(@$clist,$target);
- print "# $target->{name} conflicts with ",vsn($t),"\n";
+ pusherr($env,$target,"$target->{name} conflicts with ".vsn($t));
return;
}
@@ -1806,10 +1806,9 @@
}
unless (depend_option($t, $d{$_}, $env)) {
- print "# $target->{name} has conflicting requirement\n";
- push(@{$env->{fatal}},vsn($target));
- target_setstatus($target,'UNDEF',4);
push @$clist, $target;
+ pusherr($env,$target,"$target->{name} has conflicting
requirement");
+ target_setstatus($target,'UNDEF',4);
$conflict = 1;
next;
}
@@ -1823,10 +1822,9 @@
push @deps, $t;
} else {
- print "# $target->{name} searches a frood called '$_'\n";
- push(@{$env->{fatal}},vsn($target));
- target_setstatus($target,'UNDEF',4);
push @$clist, $target;
+ pusherr($env,$target,"$target->{name} searches a frood called
'$_'");
+ target_setstatus($target,'UNDEF',4);
$conflict = 1;
}
}
@@ -2058,6 +2056,15 @@
#
#
+# remember fatal error
+#
+sub pusherr ($$$) {
+ my($env,$target,$mess) = @_;
+ print "# $mess\n";
+ push @{$env->{fatal}}, vsn($target).": $mess\n";
+}
+
+#
# compute path to binary RPM from rpm config and target data
#
sub target2rpm ($$) {
@@ -2268,7 +2275,7 @@
my($old,$tag,$new);
foreach (@$list, @$clist) {
- next unless defined $_->{release};
+ next unless $_->{release} =~ /\S/;
$map{$_->{name}} = {
rel => "$_->{version}-$_->{release}",
status => $_->{STATUS}
@@ -2276,6 +2283,7 @@
}
foreach (@$bonly) {
+ next unless $_->{release} =~ /\S/;
$map{$_->{name}} = {
rel => "$_->{version}-$_->{release}",
status => 'TEMP'
@@ -2286,7 +2294,7 @@
foreach $n (keys %$installed) {
next if $n =~ /::/;
next if exists $map{$n};
- next unless grep { $_ ne '-' } keys %{$installed->{$n}};
+ next unless grep { $_ ne '' } keys %{$installed->{$n}};
$map{$n}->{'status'} = 'OK';
push @names,$n;
}
@@ -2294,7 +2302,7 @@
foreach $n (keys %$repository) {
next if $n =~ /::/;
next if exists $map{$n};
- next unless grep { $_ ne '-' } keys %{$repository->{$n}};
+ next unless grep { $_ ne '' } keys %{$repository->{$n}};
$t = find_target($n, $repository);
$map{$n}->{'status'} = 'NEW';
$map{$n}->{'rel'} = vs($t);
@@ -2434,7 +2442,7 @@
} else {
if (@{$env->{fatal}}) {
die "FATAL: errors occured while building:\n",
- join (',', @{$env->{fatal}}),
+ @{$env->{fatal}},
"\n";
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 17 Jul 2003 15:32:58 -0000
1.67
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 18 Jul 2003 14:46:45 -0000
1.68
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 20030715
-Release: 20030717
+Version: 20030718
+Release: 20030718
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg.1
============================================================================
$ cvs diff -u -r1.9 -r1.10 openpkg.1
--- openpkg-src/openpkg-tool/openpkg.1 25 Jun 2003 12:01:11 -0000 1.9
+++ openpkg-src/openpkg-tool/openpkg.1 18 Jul 2003 14:46:45 -0000 1.10
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "OPENPKG 1"
-.TH OPENPKG 1 "2003-06-25" "openpkg-tool" "OpenPKG Maintainance"
+.TH OPENPKG 1 "2003-07-16" "openpkg-tool" "OpenPKG Maintainance"
.SH "NAME"
\&\fBopenpkg\fR \- \fBOpenPKG\fR maintainance utility
.SH "VERSION"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5647 -r1.5648 news.txt
--- openpkg-web/news.txt 18 Jul 2003 13:56:41 -0000 1.5647
+++ openpkg-web/news.txt 18 Jul 2003 14:46:43 -0000 1.5648
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<openpkg-tool-20030718-20030718>
18-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030718>
18-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030718>
18-Jul-2003: New package: P<wine-msov-20030718-20030718>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
