archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix some typos in makerpm and removed unused debug code

Browse source
This commit is contained in:
Tomas V.V.Cox 2003-06-14 16:56:19 +00:00
parent 3861a10c07
commit 9f828a5035
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pear/PEAR/Command/Package.php
View file

@ -583,22 +583,14 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
array('installroot' => $instroot, array('installroot' => $instroot,
'nodeps' => true)); 'nodeps' => true));
$pkgdir = "$info[package]-$info[version]"; $pkgdir = "$info[package]-$info[version]";
// print "instroot=$instroot\n";
// print_r($info);
// return true;
$info['rpm_xml_dir'] = '/var/lib/pear'; $info['rpm_xml_dir'] = '/var/lib/pear';
$this->config->set('verbose', $tmp); $this->config->set('verbose', $tmp);
if (!$tar->extractList("$pkgdir/package.xml", $tmpdir, $pkgdir)) { if (!$tar->extractList("$pkgdir/package.xml", $tmpdir, $pkgdir)) {
return $this->raiseError("failed to extract $params[0]"); return $this->raiseError("failed to extract $params[0]");
} }
if (!file_exists("$tmpdir/package.xml")) { if (!file_exists("package.xml")) {
return $this->raiseError("no package.xml found in $params[0]"); return $this->raiseError("no package.xml found in $params[0]");
} }
// System::mkdir("-p $instroot$info[rpm_xml_dir]");
// if (!@copy("$tmpdir/package.xml", "$instroot$info[rpm_xml_dir]/$info[package].xml")) {
// return $this->raiseError("could not copy package.xml file: $php_errormsg");
// }
if (isset($options['spec-template'])) { if (isset($options['spec-template'])) {
$spec_template = $options['spec-template']; $spec_template = $options['spec-template'];
} else { } else {
@ -631,7 +623,7 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
} else { } else {
$arch = 'noarch'; $arch = 'noarch';
} }
$cfk = array('master_server', 'php_dir', 'ext_dir', 'doc_dir', $cfg = array('master_server', 'php_dir', 'ext_dir', 'doc_dir',
'bin_dir', 'data_dir', 'test_dir'); 'bin_dir', 'data_dir', 'test_dir');
foreach ($cfg as $k) { foreach ($cfg as $k) {
$info[$k] = $this->config->get($k); $info[$k] = $this->config->get($k);