Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/be_package.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-28 12:48:37 -0500
committerDan McGee <dan@archlinux.org>2011-04-20 20:10:27 -0500
commit3c5661ec3cd5cdf2f1c3101d90789c83786a6897 (patch)
tree7f23826062a221b5a8d773ee3f47207a6de37339 /lib/libalpm/be_package.c
parent791928dc48bcd94ef5cb57b4da36fb5e398e30da (diff)
Form the signature file location in one place
Since we do this for all cases anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/be_package.c')
-rw-r--r--lib/libalpm/be_package.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 0c3728f1..8a6ed6c4 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -243,7 +243,6 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
/* attempt to stat the package file, ensure it exists */
if(stat(pkgfile, &st) == 0) {
- char *pgpfile;
int sig_ret;
newpkg = _alpm_pkg_new();
@@ -253,13 +252,9 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
newpkg->filename = strdup(pkgfile);
newpkg->size = st.st_size;
- /* look around for a PGP signature file; load if available */
- MALLOC(pgpfile, strlen(pkgfile) + 5, RET_ERR(PM_ERR_MEMORY, NULL));
- sprintf(pgpfile, "%s.sig", pkgfile);
/* TODO: do something with ret value */
- sig_ret = _alpm_load_signature(pgpfile, &(newpkg->pgpsig));
+ sig_ret = _alpm_load_signature(pkgfile, &(newpkg->pgpsig));
(void)sig_ret;
- FREE(pgpfile);
} else {
/* couldn't stat the pkgfile, return an error */
RET_ERR(PM_ERR_PKG_OPEN, NULL);