summaryrefslogtreecommitdiff
path: root/apt-inst/dirstream.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 14:21:00 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-03-13 14:21:00 +0100
commitb829fb2602a506a01cb2b3fd371e975784d4377c (patch)
treea0999795c61b95e3a9ec2cf30575e22e1b4d7337 /apt-inst/dirstream.cc
parentb3887af24029cdc6179470fcb8587fff39a3eee9 (diff)
parent544cc111be38bd0a3dfc887da3a70610b3cabe9e (diff)
merged from debian-experimental2
Diffstat (limited to 'apt-inst/dirstream.cc')
-rw-r--r--apt-inst/dirstream.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index bb0bf96c1..65d1aa188 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -46,15 +46,13 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
// fchmod deals with umask and fchown sets the ownership
if (fchmod(iFd,Itm.Mode) != 0)
{
- _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);
close(iFd);
- return false;
+ return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);
}
if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
{
- return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);
close(iFd);
- return false;
+ return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);
}
Fd = iFd;
return true;