From 5ae02e6ae72b7648318e319eba9ab02f489d858a Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Wed, 28 May 2008 23:25:40 +0200 Subject: Don't display filename on -Qip operation. Some previous commits apparently broke the get_filename function for package loaded with pkg_load (on a -Qip operation) because this field was no longer filled. Now pkg_load fills it. But the -Qip operation needs to be run like this : -Qip , so the filename is already known. There is no need to display it again. Besides, on a normal -Qi operation, the filename is not displayed either because this information is not stored in the local database. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/be_package.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/be_package.c') diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 85112fd4..c0ec3bcf 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -144,6 +144,10 @@ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full) RET_ERR(PM_ERR_WRONG_ARGS, NULL); } + if(stat(pkgfile, &st) != 0) { + RET_ERR(PM_ERR_PKG_OPEN, NULL); + } + if((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE, NULL); } @@ -162,9 +166,8 @@ static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full) RET_ERR(PM_ERR_MEMORY, NULL); } - if(stat(pkgfile, &st) == 0) { - newpkg->size = st.st_size; - } + newpkg->filename = strdup(pkgfile); + newpkg->size = st.st_size; /* If full is false, only read through the archive until we find our needed * metadata. If it is true, read through the entire archive, which serves -- cgit v1.2.3-24-g4f1b