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: 19-Nov-2002 10:42:51
Branch: HEAD Handle: 2002111909425100
Modified files:
openpkg-re openpkg-build
Log:
use bzip2 from openpkg bootstrap instead of bzip2 from path
Summary:
Revision Changes Path
1.31 +12 -5 openpkg-re/openpkg-build
____________________________________________________________________________
Index: openpkg-re/openpkg-build
============================================================
$ cvs diff -u -r1.30 -r1.31 openpkg-build
--- openpkg-re/openpkg-build 19 Nov 2002 09:13:26 -0000 1.30
+++ openpkg-re/openpkg-build 19 Nov 2002 09:42:51 -0000 1.31
@@ -326,12 +326,19 @@
sub get_index ($$$) {
my($url,$fn,$with) = @_;
my($ua,$req,$res,$rdf);
- my($pid,$curl);
+ my($pid,$bzip2,$curl);
my(%map);
$url = $fn if defined $fn;
$url .= '00INDEX.rdf.bz2' if $url =~ /\/$/;
+ $bzip2 = $RPM;
+ $bzip2 =~ s/bin\/rpm$/lib\/openpkg\/bzip2/
+ or die "FATAL: cannot deduce bzip2 path from $RPM\n";
+
+ $url !~ /\.bz2$/ || -x $bzip2
+ or die "FATAL: $bzip2 not found\n";
+
if ($url =~ /^\w+:/) { # looks like URL scheme
eval {
@@ -344,13 +351,13 @@
$curl = $RPM;
$curl =~ s/bin\/rpm$/lib\/openpkg\/curl/
or die "FATAL: cannot deduce curl path from $RPM\n";
- -f $curl
+ -x $curl
or die "FATAL: $curl not found\n";
if ($url =~ /\.bz2$/) {
open(FH, "$curl -q -s -o - \"$url\" |")
or die "FATAL: cannot curl '$url' ($!)\n";
- $pid = spawn(\*FH,'bzip2','-dc');
+ $pid = spawn(\*FH,$bzip2,'-dc');
close(FH);
} else {
open(RFH, "$curl -q -s -o - \"$url\" |")
@@ -366,7 +373,7 @@
die "FATAL: cannot read build index\n" unless $res->is_success;
if ($url =~ /\.bz2$/) {
- $pid = spawn($res->content,'bzip2','-dc');
+ $pid = spawn($res->content,$bzip2,'-dc');
} else {
$pid = cat($res->content,'cat');
}
@@ -377,7 +384,7 @@
if ($url =~ /\.bz2$/) {
open(FH, "< $url") or
die "FATAL: cannot read file '$url' ($!)\n";
- $pid = spawn(\*FH,'bzip2','-dc');
+ $pid = spawn(\*FH,$bzip2,'-dc');
close(FH);
} else {
open(RFH, "< $url") or
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
