maintain original file perms

tvvcox · tvvcox · commit cf70755a0514 · 2001-08-19T12:30:24.000Z
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
@@ -227,10 +227,12 @@ function _installFile($file, $dest_dir, $atts)
             }
             $this->log(2, "+ created dir $dest_dir");
         }
+        $orig_perms = fileperms($file);
         if (!@copy($file, $dest_file)) {
             $this->log(0, "failed to copy $file to $dest_file");
             return false;
         }
+        chmod($dest_file, $orig_perms);
         $this->log(2, "+ copy $file to $dest_file");
         // FIXME Update Package database here
         //$this->updatePackageListFrom("$d/$file");
diff --git a/pear/PEAR/Packager.php b/pear/PEAR/Packager.php
@@ -154,19 +154,24 @@ function package($pkgfile = 'package.xml')
                     return $this->raiseError("could not mkdir $dir");
                 }
             }
+            //Maintain original file perms
+            $orig_perms = fileperms($fname);
             if (!@copy($fname, $file)) {
                 $this->log(0, "could not copy $fname to $file");
             } else {
                 $this->log(2, "+ copying from $fname to $file");
             }
+            chmod($file, $orig_perms);
         }
         // XXX TODO: Rebuild the package file as the old method did?
 
         // This allows build packages from different pear pack def files
-        if (!@copy($pkgfile, $this->tmpdir . DIRECTORY_SEPARATOR . 'package.xml')) {
-            return $this->raiseError("could not copy $pkgfile to " . $this->tmpdir);
+        $dest_pkgfile = $this->tmpdir . DIRECTORY_SEPARATOR . 'package.xml';
+        $this->log(2, "+ copying package $pkgfile to $dest_pkgfile");
+        if (!@copy($pkgfile, $dest_pkgfile)) {
+            return $this->raiseError("could not copy $pkgfile to $dest_pkgfile");
         }
-        $this->log(2, "+ copying package $pkgfile to " . $this->tmpdir);
+        chmod($dest_pkgfile, 0644);
 
         // TAR the Package -------------------------------------------
         chdir(dirname($this->tmpdir));

Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,12 @@ function _installFile($file, $dest_dir, $atts)`
`227`	`227`	`}`
`228`	`228`	`$this->log(2, "+ created dir $dest_dir");`
`229`	`229`	`}`
	`230`	`+ $orig_perms = fileperms($file);`
`230`	`231`	`if (!@copy($file, $dest_file)) {`
`231`	`232`	`$this->log(0, "failed to copy $file to $dest_file");`
`232`	`233`	`return false;`
`233`	`234`	`}`
	`235`	`+ chmod($dest_file, $orig_perms);`
`234`	`236`	`$this->log(2, "+ copy $file to $dest_file");`
`235`	`237`	`// FIXME Update Package database here`
`236`	`238`	`//$this->updatePackageListFrom("$d/$file");`
Original file line number	Diff line number	Diff line change
`@@ -154,19 +154,24 @@ function package($pkgfile = 'package.xml')`
`154`	`154`	`return $this->raiseError("could not mkdir $dir");`
`155`	`155`	`}`
`156`	`156`	`}`
	`157`	`+ //Maintain original file perms`
	`158`	`+ $orig_perms = fileperms($fname);`
`157`	`159`	`if (!@copy($fname, $file)) {`
`158`	`160`	`$this->log(0, "could not copy $fname to $file");`
`159`	`161`	`} else {`
`160`	`162`	`$this->log(2, "+ copying from $fname to $file");`
`161`	`163`	`}`
	`164`	`+ chmod($file, $orig_perms);`
`162`	`165`	`}`
`163`	`166`	`// XXX TODO: Rebuild the package file as the old method did?`
`164`	`167`
`165`	`168`	`// This allows build packages from different pear pack def files`
`166`		`- if (!@copy($pkgfile, $this->tmpdir . DIRECTORY_SEPARATOR . 'package.xml')) {`
`167`		`- return $this->raiseError("could not copy $pkgfile to " . $this->tmpdir);`
	`169`	`+ $dest_pkgfile = $this->tmpdir . DIRECTORY_SEPARATOR . 'package.xml';`
	`170`	`+ $this->log(2, "+ copying package $pkgfile to $dest_pkgfile");`
	`171`	`+ if (!@copy($pkgfile, $dest_pkgfile)) {`
	`172`	`+ return $this->raiseError("could not copy $pkgfile to $dest_pkgfile");`
`168`	`173`	`}`
`169`		`- $this->log(2, "+ copying package $pkgfile to " . $this->tmpdir);`
	`174`	`+ chmod($dest_pkgfile, 0644);`
`170`	`175`
`171`	`176`	`// TAR the Package -------------------------------------------`
`172`	`177`	`chdir(dirname($this->tmpdir));`