summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-04-28 00:27:05 +0200
committerDan McGee <dan@archlinux.org>2008-04-28 00:27:05 +0200
commit245efca759adfcaf7e8d032477a9fe6e22860d86 (patch)
tree7dd38054a353ad84f601e9b5d0b9bd181e575698 /lib/libalpm
parent6d79ba2db0f37f46b925a509ef83724fc0f61184 (diff)
downloadpacman-245efca759adfcaf7e8d032477a9fe6e22860d86.tar.gz
pacman-245efca759adfcaf7e8d032477a9fe6e22860d86.tar.xz
Remove unnecessary archive_entry_set_pathname() calls
I'm not sure why these were ever here, as by this point we have already extracted the file meaning a call to this function is basically a no-op. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/add.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index ca4cfa9a..6795d522 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -500,19 +500,16 @@ static int extract_single_file(struct archive *archive,
/* move the existing file to the "pacorig" */
if(rename(filename, newpath)) {
- archive_entry_set_pathname(entry, filename);
_alpm_log(PM_LOG_ERROR, _("could not rename %s (%s)\n"), filename, strerror(errno));
alpm_logaction("error: could not rename %s (%s)\n", filename, strerror(errno));
errors++;
} else {
/* copy the tempfile we extracted to the real path */
if(_alpm_copyfile(tempfile, filename)) {
- archive_entry_set_pathname(entry, filename);
_alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno));
alpm_logaction("error: could not copy tempfile to %s (%s)\n", filename, strerror(errno));
errors++;
} else {
- archive_entry_set_pathname(entry, filename);
_alpm_log(PM_LOG_WARNING, _("%s saved as %s\n"), filename, newpath);
alpm_logaction("warning: %s saved as %s\n", filename, newpath);
}
@@ -531,7 +528,6 @@ static int extract_single_file(struct archive *archive,
_alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), filename, strerror(errno));
errors++;
}
- archive_entry_set_pathname(entry, filename);
} else {
/* there's no sense in installing the same file twice, install
* ONLY is the original and package hashes differ */