archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

* accept optional tmpdir arg in mkTempDir

Browse source 
* handle changelog releases without filelist
This commit is contained in:
Stig Bakken 2002-03-28 23:44:31 +00:00
parent 8474d7944d
commit a50c40cc24
1 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
pear/PEAR/Common.php
View file

@ -169,13 +169,22 @@ class PEAR_Common extends PEAR
/** /**
* Create and register a temporary directory. * Create and register a temporary directory.
* *
* @param string (optional) Directory to use as tmpdir. Will use
* system defaults (for example /tmp or c:\windows\temp) if not
* specified
*
* @return string name of created directory * @return string name of created directory
* *
* @access public * @access public
*/ */
function mkTempDir() function mkTempDir($tmpdir = '')
{ {
if (!$tmpdir = System::mktemp('-d pear')) { if ($tmpdir) {
$topt = "-t $tmpdir ";
} else {
$topt = '';
}
if (!$tmpdir = System::mktemp($topt . '-d pear')) {
return false; return false;
} }
$this->addTempFile($tmpdir); $this->addTempFile($tmpdir);
@ -662,7 +671,6 @@ class PEAR_Common extends PEAR
if (@sizeof($pkginfo['changelog']) > 0) { if (@sizeof($pkginfo['changelog']) > 0) {
$ret .= " <changelog>\n"; $ret .= " <changelog>\n";
foreach ($pkginfo['changelog'] as $oldrelease) { foreach ($pkginfo['changelog'] as $oldrelease) {
var_dump($oldrelease);
$ret .= $this->_makeReleaseXml($oldrelease, true); $ret .= $this->_makeReleaseXml($oldrelease, true);
} }
$ret .= " </changelog>\n"; $ret .= " </changelog>\n";
@ -718,29 +726,27 @@ class PEAR_Common extends PEAR
} }
$ret .= "$indent </deps>\n"; $ret .= "$indent </deps>\n";
} }
$ret .= "$indent <filelist>\n"; if (isset($pkginfo['filelist'])) {
/* $ret .= "$indent <filelist>\n";
ob_start(); foreach ($pkginfo['filelist'] as $file => $fa) {
var_dump($pkginfo['filelist']); if ($fa['role'] == 'extsrc') {
$tmp = ob_get_contents(); $ret .= "$indent <libfile>\n";
ob_end_clean(); $ret .= "$indent <libname>$file</libname>\n";
$ret .= $tmp; $ret .= "$indent <sources>$fa[sources]</sources>\n";
*/ $ret .= "$indent </libfile>\n";
foreach ($pkginfo['filelist'] as $file => $fa) { } else {
if ($fa['role'] == 'extsrc') { $ret .= "$indent <file role=\"$fa[role]\"";
$ret .= "$indent <libfile>\n"; if (isset($fa['baseinstalldir'])) {
$ret .= "$indent <libname>$file</libname>\n"; $ret .= " baseinstalldir=\"$fa[baseinstalldir]\"";
$ret .= "$indent <sources>$fa[sources]</sources>\n"; }
$ret .= "$indent </libfile>\n"; if (isset($fa['md5sum'])) {
} else { $ret .= " md5sum=\"$fa[md5sum]\"";
$ret .= "$indent <file role=\"$fa[role]\""; }
if (isset($fa['baseinstalldir'])) { $ret .= ">$file</file>\n";
$ret .= " baseinstalldir=\"$fa[baseinstalldir]\"";
} }
$ret .= ">$file</file>\n";
} }
$ret .= "$indent </filelist>\n";
} }
$ret .= "$indent </filelist>\n";
$ret .= "$indent </release>\n"; $ret .= "$indent </release>\n";
return $ret; return $ret;
} }