better error hanlding

tvvcox · tvvcox · commit df54bca0a0cc · 2001-08-19T12:37:51.000Z
diff --git a/pear/PEAR/Packager.php b/pear/PEAR/Packager.php
@@ -155,13 +155,13 @@ function package($pkgfile = 'package.xml')
                 }
             }
             //Maintain original file perms
-            $orig_perms = fileperms($fname);
+            $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);
             }
-            chmod($file, $orig_perms);
         }
         // XXX TODO: Rebuild the package file as the old method did?
 

Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,13 @@ function package($pkgfile = 'package.xml')`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`//Maintain original file perms`
`158`		`- $orig_perms = fileperms($fname);`
	`158`	`+ $orig_perms = @fileperms($fname);`
`159`	`159`	`if (!@copy($fname, $file)) {`
`160`	`160`	`$this->log(0, "could not copy $fname to $file");`
`161`	`161`	`} else {`
`162`	`162`	`$this->log(2, "+ copying from $fname to $file");`
	`163`	`+ @chmod($file, $orig_perms);`
`163`	`164`	`}`
`164`		`- chmod($file, $orig_perms);`
`165`	`165`	`}`
`166`	`166`	`// XXX TODO: Rebuild the package file as the old method did?`
`167`	`167`