summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-17 10:34:49 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-04-17 10:34:49 +0300
commit1a5d6d06d6819481b6f78b6091a3a6380a22c0cc (patch)
tree034113c7d297479f9e6a9e6d338b975ddba44a29
parent820098d6adc302bfa920243bcbe6e8ff8c40c582 (diff)
downloadapk-tools-1a5d6d06d6819481b6f78b6091a3a6380a22c0cc.tar.gz
apk-tools-1a5d6d06d6819481b6f78b6091a3a6380a22c0cc.tar.bz2
apk-tools-1a5d6d06d6819481b6f78b6091a3a6380a22c0cc.tar.xz
apk-tools-1a5d6d06d6819481b6f78b6091a3a6380a22c0cc.zip
fix issue introduced in previous xattr error handling changes
-rw-r--r--src/archive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/archive.c b/src/archive.c
index dab9f4d..e58f6d5 100644
--- a/src/archive.c
+++ b/src/archive.c
@@ -494,7 +494,7 @@ int apk_archive_entry_extract(int atfd, const struct apk_file_info *ae,
if (r != -ENOTSUP)
apk_error("Failed to set xattrs on %s: %s",
fn, strerror(-r));
- if (!ret) ret = -errno;
+ if (!ret) ret = r;
}
}
@@ -512,5 +512,5 @@ int apk_archive_entry_extract(int atfd, const struct apk_file_info *ae,
}
}
- return 0;
+ return ret;
}