summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-11 22:56:34 +0200
committerDan McGee <dan@archlinux.org>2011-04-11 22:56:34 +0200
commit8df7208d7b0f4cec2421e9e167baaae4dea27bf7 (patch)
tree4af64974d77d56158c1063e1cf220cb4c78edcd2
parentc5addd94e3a817504688e684bf62786df7faa3e7 (diff)
downloadpacman-8df7208d7b0f4cec2421e9e167baaae4dea27bf7.tar.gz
pacman-8df7208d7b0f4cec2421e9e167baaae4dea27bf7.tar.xz
Don't create two pmpkg_t objects in be_package
Ensure we only have one- this looks like the result of a bad merge from old 2008 signing code with the current stuff which has changed quite a bit. Originally-seen-by: Rémy Oudompheng <remyoudompheng@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/be_package.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 9316cdfe..c54e288e 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -289,15 +289,6 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
RET_ERR(PM_ERR_PKG_OPEN, NULL);
}
- newpkg = _alpm_pkg_new();
- if(newpkg == NULL) {
- archive_read_finish(archive);
- RET_ERR(PM_ERR_MEMORY, NULL);
- }
-
- newpkg->filename = strdup(pkgfile);
- newpkg->size = st.st_size;
-
_alpm_log(PM_LOG_DEBUG, "starting package load for %s\n", pkgfile);
/* If full is false, only read through the archive until we find our needed