mlot/alien
1
0
Fork 0
mirror of https://github.com/Project-OSS-Revival/alien.git synced 2026-04-24 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silence error message when deleting build tree after making an rpm, if rpmbuild has already deleted it.

Browse Source
This commit is contained in:
Joey Hess
2011-01-06 13:47:37 -04:00
parent 143131c8c0
commit 9b37ec8545
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Alien/Package.pm
View File

@@ -339,14 +339,17 @@ sub DESTROY {
die "alien internal error: unpacked_tree is set to '/'. Please file a bug report!"; die "alien internal error: unpacked_tree is set to '/'. Please file a bug report!";
} }
# Just in case some dir perms are too screwed up for rm to work and if (-d $this->unpacked_tree) {
# we're not running as root. NB: can't use xargs # Just in case some dir perms are too screwed up for
$this->do('find', $this->unpacked_tree, '-type', 'd', # rm to work and we're not running as root. NB: can't
'-exec', 'chmod', '755', '{}', ';'); # use xargs
$this->do('find', $this->unpacked_tree, '-type', 'd',
'-exec', 'chmod', '755', '{}', ';');
$this->do('rm', '-rf', $this->unpacked_tree) $this->do('rm', '-rf', $this->unpacked_tree)
or die "unable to delete temporary directory '".$this->unpacked_tree."': $!"; or die "unable to delete temporary directory '".$this->unpacked_tree."': $!";
$this->unpacked_tree(''); $this->unpacked_tree('');
}
$?=$exitcode; $?=$exitcode;
} }

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
alien (8.84) UNRELEASED; urgency=low
* Silence error message when deleting build tree after making an rpm,
if rpmbuild has already deleted it.
-- Joey Hess <joeyh@debian.org> Thu, 06 Jan 2011 13:47:10 -0400
alien (8.83) unstable; urgency=low alien (8.83) unstable; urgency=low
* Correct handling of arch all packages in deb arch check. Closes: #596209 * Correct handling of arch all packages in deb arch check. Closes: #596209