cvs: pear-core / package-PEAR.xml package2.xml /PEAR/PackageFile/Generator v2.php
[email protected] ("Greg Beaver")
| Newsgroups | php.pear.cvs,php.pear.core |
|---|---|
| Message-ID | <cvscellog1210656564@cvsserver> |
cellog Tue May 13 05:29:24 2008 UTC
Modified files:
/pear-core package-PEAR.xml package2.xml
/pear-core/PEAR/PackageFile/Generator v2.php
Log:
* Fix Bug #13883 file permissions not preserved on packaging [cellog]
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.528&r2=1.529&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.528 pear-core/package-PEAR.xml:1.529
--- pear-core/package-PEAR.xml:1.528 Tue May 13 05:28:51 2008
+++ pear-core/package-PEAR.xml Tue May 13 05:29:24 2008
@@ -104,6 +104,7 @@
* Fix Bug #13485 pear package-validate brings up ASCII issues [dufuz]
* Fix Bug #13508 undefined index errors when installing a remote bundle [cellog/tswicegood]
* Fix Bug #13525 pear package-validate is not showing warnings even if there are [dufuz]
+ * Fix Bug #13883 file permissions not preserved on packaging [cellog]
</notes>
<provides type="class" name="OS_Guess"/>
<provides type="class" name="System"/>
http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.428&r2=1.429&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.428 pear-core/package2.xml:1.429
--- pear-core/package2.xml:1.428 Tue May 13 05:28:51 2008
+++ pear-core/package2.xml Tue May 13 05:29:24 2008
@@ -109,6 +109,7 @@
* Fix Bug #13485 pear package-validate brings up ASCII issues [dufuz]
* Fix Bug #13508 undefined index errors when installing a remote bundle [cellog/tswicegood]
* Fix Bug #13525 pear package-validate is not showing warnings even if there are [dufuz]
+ * Fix Bug #13883 file permissions not preserved on packaging [cellog]
</notes>
<contents>
<dir name="/">
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/PackageFile/Generator/v2.php?r1=1.38&r2=1.39&diff_format=u
Index: pear-core/PEAR/PackageFile/Generator/v2.php
diff -u pear-core/PEAR/PackageFile/Generator/v2.php:1.38 pear-core/PEAR/PackageFile/Generator/v2.php:1.39
--- pear-core/PEAR/PackageFile/Generator/v2.php:1.38 Thu Jan 3 20:26:37 2008
+++ pear-core/PEAR/PackageFile/Generator/v2.php Tue May 13 05:29:24 2008
@@ -16,7 +16,7 @@
* @author Stephan Schmidt (original XML_Serializer code)
* @copyright 1997-2008 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v2.php,v 1.38 2008/01/03 20:26:37 cellog Exp $
+ * @version CVS: $Id: v2.php,v 1.39 2008/05/13 05:29:24 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -213,6 +213,7 @@
if (!file_exists($file)) {
return $packager->raiseError("File does not exist: $fname");
} else {
+ $origperms = fileperms($file);
$tfile = $packageDir . DIRECTORY_SEPARATOR . $fname;
unset($orig['attribs']);
if (count($orig)) { // file with tasks
@@ -245,6 +246,7 @@
System::mkdir(array('-p', dirname($tfile)));
copy($file, $tfile);
}
+ chmod($tfile, $origperms);
$filelist[$i++] = $tfile;
$this->_packagefile->setFileAttribute($fname, 'md5sum', md5_file($tfile), $i - 1);
$packager->log(2, "Adding file $fname");
@@ -873,7 +875,7 @@
// | Authors: Stephan Schmidt <[email protected]> |
// +----------------------------------------------------------------------+
//
-// $Id: v2.php,v 1.38 2008/01/03 20:26:37 cellog Exp $
+// $Id: v2.php,v 1.39 2008/05/13 05:29:24 cellog Exp $
/**
* error code for invalid chars in XML name