diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-12 03:16:54 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-12 04:15:04 +0100 |
| commit | 9a82cb92a446bce05186460bc5b5b12c4df7e5a1 (patch) | |
| tree | 3c795e132c429bc15f7ac5504bcaf708e7b09371 | |
| parent | a9cbd15260b396c38b7d5ffe5669994e65f9a86f (diff) | |
| download | pacman-9a82cb92a446bce05186460bc5b5b12c4df7e5a1.tar.gz pacman-9a82cb92a446bce05186460bc5b5b12c4df7e5a1.tar.xz | |
Small fix to download size lookup and a logger
These were just two small things I came across today and found could be
fixed or helpful, so I've added them and I'm not sure what else to bundle
them with. commit_count++
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/be_package.c | 2 | ||||
| -rw-r--r-- | src/pacman/util.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 42f33599..b69161b4 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -279,6 +279,8 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) 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 * metadata. If it is true, read through the entire archive, which serves * as a verfication of integrity and allows us to create the filelist. */ diff --git a/src/pacman/util.c b/src/pacman/util.c index fbc1a184..d91d1d43 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -523,7 +523,9 @@ void display_targets(const alpm_list_t *pkgs, int install) for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); - dlsize += alpm_pkg_download_size(pkg); + if(install) { + dlsize += alpm_pkg_download_size(pkg); + } isize += alpm_pkg_get_isize(pkg); /* print the package size with the output if ShowSize option set */ |