- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-242-gdd26592
by dan＠archlinux.org 12 Jan '11

12 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via dd265921559b187cba59e83bfdbfda11bcec2f1e (commit) via 57c5afd69c4c70ad85676bab32150d6182a3def9 (commit) via 0284cf2128eb0179a3598ee21a951c5b3c11be40 (commit) via 33240e87b99e5aebd0e64a672ea307a698edb32f (commit) via 25fab402c79aeaa5b72959c7bfd2e541a1b34045 (commit) via 6942bba75db596a70d5ba408785bf461e691bc9c (commit) via 55bff19b7692e01a0bf276c742c77f03fb445160 (commit) via fe6e90c21f1561ee54deedbc707f5afc964d3cae (commit) via 9a82cb92a446bce05186460bc5b5b12c4df7e5a1 (commit) via d0c327df172942da18f1e5c9b6afb183e4d9ee18 (commit) via eda4d9ec00be1108ab4336a438299a283c5a0a90 (commit) via b04a56dbe90f43622158410234fabea96d0d7f07 (commit) via 0d4dd09993971924d379be4d0944d72f4c77b021 (commit) via 7ce90bb135c04b4421ca2824099e6e72659721b1 (commit) via a9cbd15260b396c38b7d5ffe5669994e65f9a86f (commit) via 3e1bdfa93c0c0c1a966ba24f8013754a8a87f0ec (commit) via 5f140a62debb7d55436af7f84b0ecf5696f46c86 (commit) via 842cbc9ea4036036cf00b3b2eeccc11ad531cd2e (commit) via d03b57f459fb9ab9288991a70c4e7297a7c1d150 (commit) from 281a4c0a4f2de217b5d23939fb78b3bbfccc34ca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dd265921559b187cba59e83bfdbfda11bcec2f1e Merge: 57c5afd 25fab40 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 21:20:12 2011 -0600 Merge branch 'diskspace-fixes' commit 57c5afd69c4c70ad85676bab32150d6182a3def9 Merge: 0284cf2 33240e8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 21:20:10 2011 -0600 Merge branch 'fix-double-load' commit 0284cf2128eb0179a3598ee21a951c5b3c11be40 Merge: fe6e90c d0c327d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 21:20:07 2011 -0600 Merge branch 'repo-add-improvements' commit 33240e87b99e5aebd0e64a672ea307a698edb32f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 18:46:10 2011 -0600 Fix double filelist issue when upgrading a package Due to the way we funk around with package data loading, we had a condition where the filelist got doubled up because it was loaded twice. Packages are originally loaded with INFRQ_BASE. In an upgrade/sync, the package is checked for file conflicts next, leaving us in an "INFRQ_BASE | INFRQ_FILES" state. Later, when committing a single package, we have an explicit call to _alpm_local_db_read() with INFRQ_ALL as the level. Because the package's level did not match this, we skipped over our previous "does the incoming level match where I'm at" shortcut, and continued to load things again, because of a lack of fine-grained checking for each of DESC, FILES, and INSTALL. The end result is we loaded the filelist twice, causing our remove logic to iterate twice over the installed files, spewing a bunch of "cannot find file X" messages. Fix the problem by doing a bit more bitmasking logic throughout the load method, and also fix the sanity check at the beginning of the function- this should *only* be used for local packages as opposed to the "not a package" check that was there before. A debug log message was added to upgraderemove as well to match the one already in the normal remove codepath. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 25fab402c79aeaa5b72959c7bfd2e541a1b34045 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 21:13:04 2011 -0600 Call archive_read_data_skip() while checking diskspace libarchive eventually calls it anyway, but backtraces make a lot more sense if we call it, as well as matching our precedent from alpm_pkg_load(). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6942bba75db596a70d5ba408785bf461e691bc9c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 19:49:27 2011 -0600 Add error message stating which partition is full This is helpful anyway to the user, and should also be helpful to us if we see problems cropping up in the check during development. Also add a missing ->used = 0 initialization in the code path less taken. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 55bff19b7692e01a0bf276c742c77f03fb445160 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 18:52:30 2011 -0600 Unify two free diskspace error messages Although they won't be the same in the gettext catalog because of the '\n' we should still use the same text. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe6e90c21f1561ee54deedbc707f5afc964d3cae Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 21:12:08 2011 -0600 Add a progressbar for package integrity checking This can take a while too, and it is really easy to add the necessary callback stuff for adding a progressbar. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a82cb92a446bce05186460bc5b5b12c4df7e5a1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 20:16:54 2011 -0600 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(a)archlinux.org> commit d0c327df172942da18f1e5c9b6afb183e4d9ee18 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 17:16:12 2011 -0600 doc: add docs for repo-add -d option This never got added when the option was brought in, so fix it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eda4d9ec00be1108ab4336a438299a283c5a0a90 Author: PyroPeter <abi1789(a)googlemail.com> Date: Tue Jan 11 23:04:20 2011 +0100 repo-add: Create/modify files databases Implements FS#11302. Dan: updated docs to not reference pkgfile. Signed-off-by: PyroPeter <abi1789(a)googlemail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b04a56dbe90f43622158410234fabea96d0d7f07 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 18:44:26 2011 -0600 Add two pactests with non-trivial file counts These are probably useful anyway, but also exposed the double file list bug that will be fixed in a later commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d4dd09993971924d379be4d0944d72f4c77b021 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 18:43:28 2011 -0600 pactest: build the filelist using a set() This will prevent duplicates, which we had plenty of once I made a few tests that had a list of files greater than the normal two. The previous logic was not working quite right. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ce90bb135c04b4421ca2824099e6e72659721b1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 15:15:07 2011 -0600 repo-add: use pushd/popd Rather than explicit cd calls, we can use the directory stack to our advantage. This also removes the need to store and restore $startdir, so kill the variable entirely. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a9cbd15260b396c38b7d5ffe5669994e65f9a86f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:32:43 2011 -0600 pactest: correctly write epoch and force as necessary We were missing this in a few places; also add the ability to check the outcome via a new rule type. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e1bdfa93c0c0c1a966ba24f8013754a8a87f0ec Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 08:44:23 2011 -0600 Use double rather than float everywhere No real need to use the smaller floating point types here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f140a62debb7d55436af7f84b0ecf5696f46c86 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 9 21:40:36 2011 -0600 Progress callback cleanups and fixes * Remove a stale comment * Fix a logic error- the conditional disagreed with the comments * Remove some unnecessary floating point casts Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 842cbc9ea4036036cf00b3b2eeccc11ad531cd2e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 9 20:47:47 2011 -0600 Ensure we use local package when calculating removed size We were checking if a package existed locally, but then using the incoming package to calculate removed size rather than the currently installed package. Also adjust the local variable in the replaces loop to make it more clear that we are always dealing with local packages here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d03b57f459fb9ab9288991a70c4e7297a7c1d150 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 9 20:36:42 2011 -0600 Remove need for floating point division in backend All of these can be done with integer division; the only slightly interesting part is ensuring we round up like before with calling the ceil() function. We can also remove the math library from requirements; now that the only ceil() calls are gone, we don't need this anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 -- doc/repo-add.8.txt | 12 ++++++- lib/libalpm/add.c | 22 ++++++------ lib/libalpm/alpm.h | 1 + lib/libalpm/be_local.c | 22 +++++++------ lib/libalpm/be_package.c | 2 + lib/libalpm/conflict.c | 4 +- lib/libalpm/diskspace.c | 52 ++++++++++++++++++----------- lib/libalpm/error.c | 2 +- lib/libalpm/remove.c | 25 +++++++++----- lib/libalpm/sync.c | 12 ++++++- scripts/repo-add.sh.in | 34 ++++++++++++------- src/pacman/callback.c | 69 +++++++++++++++++++-------------------- src/pacman/package.c | 6 ++-- src/pacman/util.c | 7 ++-- test/pacman/pmdb.py | 12 +++--- test/pacman/pmpkg.py | 4 ++ test/pacman/pmrule.py | 3 ++ test/pacman/tests/remove002.py | 12 +++++++ test/pacman/tests/upgrade006.py | 18 ++++++++++ 20 files changed, 203 insertions(+), 119 deletions(-) create mode 100644 test/pacman/tests/remove002.py create mode 100644 test/pacman/tests/upgrade006.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Unify two free diskspace error messages
by Dan McGee 12 Jan '11

12 Jan '11

Although they won't be the same in the gettext catalog because of the '\n' we should still use the same text. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 4dab9fa..1b144a5 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -58,7 +58,7 @@ const char SYMEXPORT *alpm_strerror(int err) case PM_ERR_WRONG_ARGS: return _("wrong or NULL argument passed"); case PM_ERR_DISK_SPACE: - return _("not enough disk space"); + return _("not enough free disk space"); /* Interface */ case PM_ERR_HANDLE_NULL: return _("library not initialized"); -- 1.7.3.5

1 2

[pacman-dev] [PATCH 1/3] pactest: build the filelist using a set()
by Dan McGee 12 Jan '11

12 Jan '11

This will prevent duplicates, which we had plenty of once I made a few tests that had a list of files greater than the normal two. The previous logic was not working quite right. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/pmdb.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 60460ce..b4d0e2d 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -38,16 +38,14 @@ def _mkfilelist(files): usr/local/bin/ usr/local/bin/dummy """ - i = [] + file_list = set() for f in files: dir = getfilename(f) - i.append(dir) + file_list.add(dir) while "/" in dir: [dir, tmp] = dir.rsplit("/", 1) - if not dir + "/" in files: - i.append(dir + "/") - i.sort() - return i + file_list.add(dir + "/") + return sorted(file_list) def _mkbackuplist(backup): """ -- 1.7.3.5

1 2

[pacman-dev] [PATCH 1/3] repo-add: use pushd/popd
by Dan McGee 11 Jan '11

11 Jan '11

Rather than explicit cd calls, we can use the directory stack to our advantage. This also removes the need to store and restore $startdir, so kill the variable entirely. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d09d1b4..1933950 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -32,7 +32,6 @@ DELTA=0 REPO_DB_FILE= LOCKFILE= CLEAN_LOCK=0 -startdir="$PWD" # ensure we have a sane umask set umask 0022 @@ -73,7 +72,7 @@ specified on the command line from the given repo database. Multiple\n\ packages to remove can be specified on the command line.\n\n")" printf "$(gettext "\ Use the -q/--quiet flag to minimize output to basic messages, warnings,\n\ -and errors\n\n")" +and errors.\n\n")" printf "$(gettext "\ Use the -d/--delta flag to automatically generate and add a delta file\n\ between the old entry and the new one, if the old package file is found\n\ @@ -228,8 +227,7 @@ db_write_entry() return 1 fi - cd "$tmpdir" - + pushd "$tmpdir" >/dev/null if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" else @@ -247,7 +245,7 @@ db_write_entry() # create package directory mkdir "$pkgname-$pkgver" - cd "$pkgname-$pkgver" + pushd "$pkgname-$pkgver" >/dev/null # restore an eventual deltas file [[ -f ../$pkgname.deltas ]] && mv "../$pkgname.deltas" deltas @@ -289,7 +287,8 @@ db_write_entry() write_list_entry "PROVIDES" "$_provides" "depends" write_list_entry "OPTDEPENDS" "$_optdepends" "depends" - cd "$startdir" + popd >/dev/null + popd >/dev/null # create a delta file if [ -n "$oldfilename" -a -f "$oldfile" ]; then @@ -431,7 +430,6 @@ trap_exit() clean_up() { local exit_code=$? - cd "$startdir" [[ -d $tmpdir ]] && rm -rf "$tmpdir" (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE" @@ -503,7 +501,7 @@ if (( success )); then filename=$(basename "$REPO_DB_FILE") - cd "$tmpdir" + pushd "$tmpdir" >/dev/null if [[ -n $(ls) ]]; then bsdtar -c${TAR_OPT}f "$filename" * else @@ -511,7 +509,7 @@ if (( success )); then warning "$(gettext "No packages remain, creating empty database.")" bsdtar -c${TAR_OPT}f "$filename" -T /dev/null fi - cd "$startdir" + popd >/dev/null [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" -- 1.7.3.5

1 2

[pacman-dev] [PATCH 1/4] pactest: Rename epoch pactests
by Dan McGee 11 Jan '11

11 Jan '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/{sync140.py => epoch001.py} | 0 test/pacman/tests/{sync141.py => epoch002.py} | 0 test/pacman/tests/{sync142.py => epoch003.py} | 0 test/pacman/tests/{sync143.py => epoch004.py} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename test/pacman/tests/{sync140.py => epoch001.py} (100%) rename test/pacman/tests/{sync141.py => epoch002.py} (100%) rename test/pacman/tests/{sync142.py => epoch003.py} (100%) rename test/pacman/tests/{sync143.py => epoch004.py} (100%) diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/epoch001.py similarity index 100% rename from test/pacman/tests/sync140.py rename to test/pacman/tests/epoch001.py diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/epoch002.py similarity index 100% rename from test/pacman/tests/sync141.py rename to test/pacman/tests/epoch002.py diff --git a/test/pacman/tests/sync142.py b/test/pacman/tests/epoch003.py similarity index 100% rename from test/pacman/tests/sync142.py rename to test/pacman/tests/epoch003.py diff --git a/test/pacman/tests/sync143.py b/test/pacman/tests/epoch004.py similarity index 100% rename from test/pacman/tests/sync143.py rename to test/pacman/tests/epoch004.py -- 1.7.3.5

2 4

[pacman-dev] Bring in official color support at last?
by Sven-Hendrik Haase 10 Jan '11

10 Jan '11

Hey, I'm not vogo but I know he's been trying to get his work upstream since 3 years and was rejected last time in order to wait for pacman 3.1. We passed that long ago and I think pacman-color should be given another chance to go upstream. The AUR package with the patch is here: http://aur.archlinux.org/packages.php?ID=11827 It is a rather popular package so it might make a fine addition. -- Sven-Hendrik

4 5

[pacman-dev] [PATCH] Progress callback cleanups and fixes
by Dan McGee 10 Jan '11

10 Jan '11

* Remove a stale comment * Fix a logic error- the conditional disagreed with the comments * Remove some unnecessary floating point casts Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 79d3dc4..92920f7 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -78,7 +78,6 @@ static float get_update_timediff(int first_call) retval = 0.0; } else { last_time = this_time; - /* printf("\nupdate retval: %f\n", retval); DEBUG*/ } } @@ -327,8 +326,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, size_t howmany, size_t current) { - float timediff; - /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; int digits, textlen; @@ -342,32 +339,24 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, return; } - infolen = getcols() * 6 / 10; - if (infolen < 50) { - infolen = 50; - } - if(percent == 0) { - timediff = get_update_timediff(1); + get_update_timediff(1); + } else if(percent == 100) { + /* no need for timediff update, but unconditionally continue unless we + * already completed on a previous call */ + if(prevpercent == 100) { + return; + } } else { - timediff = get_update_timediff(0); - } - - if(percent > 0 && percent < 100 && timediff > 0) { - /* only update the progress bar when - * a) we first start - * b) we end the progress - * c) it has been long enough since the last call - */ - return; + if(!pkgname || percent == prevpercent || get_update_timediff(0) < UPDATE_SPEED_SEC) { + /* only update the progress bar when we have a package name, the + * percentage has changed, and it has been long enough. */ + return; + } } - /* if no pkgname, percent is too high or unchanged, then return */ - if(!pkgname || percent == prevpercent) { - return; - } + prevpercent = percent; - prevpercent=percent; /* set text of message to display */ switch (event) { case PM_TRANS_PROGRESS_ADD_START: @@ -389,6 +378,11 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, return; } + infolen = getcols() * 6 / 10; + if (infolen < 50) { + infolen = 50; + } + /* find # of digits in package counts to scale output */ digits = 1; tmp = howmany; @@ -564,11 +558,11 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) xfered_last = xfered; } - file_percent = (int)((float)file_xfered) / ((float)file_total) * 100; + file_percent = (file_xfered * 100) / file_total; if(totaldownload) { - total_percent = (int)((float)list_xfered + file_xfered) / - ((float)list_total) * 100; + total_percent = ((list_xfered + file_xfered) * 100) / + list_total; /* if we are at the end, add the completed file to list_xfered */ if(file_xfered == file_total) { -- 1.7.3.5

1 0

[pacman-dev] [PATCH] Ensure we use local package when calculating removed size
by Dan McGee 10 Jan '11

10 Jan '11

We were checking if a package existed locally, but then using the incoming package to calculate removed size rather than the currently installed package. Also adjust the local variable in the replaces loop to make it more clear that we are always dealing with local packages here. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/diskspace.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index d0f6c64..045369d 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -248,7 +248,6 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) size_t replaces = 0, current = 0, numtargs; int abort = 0; alpm_list_t *targ; - pmpkg_t *pkg; numtargs = alpm_list_count(trans->add); mount_points = mount_point_list(); @@ -261,24 +260,27 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) if(replaces) { numtargs += replaces; for(targ = trans->remove; targ; targ = targ->next, current++) { + pmpkg_t *local_pkg; int percent = (current * 100) / numtargs; PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, numtargs, current); - pkg = targ->data; - calculate_removed_size(mount_points, pkg); + local_pkg = targ->data; + calculate_removed_size(mount_points, local_pkg); } } for(targ = trans->add; targ; targ = targ->next, current++) { + pmpkg_t *pkg, *local_pkg; int percent = (current * 100) / numtargs; PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, numtargs, current); pkg = targ->data; /* is this package already installed? */ - if(_alpm_db_get_pkgfromcache(db_local, pkg->name)) { - calculate_removed_size(mount_points, pkg); + local_pkg = _alpm_db_get_pkgfromcache(db_local, pkg->name); + if(local_pkg) { + calculate_removed_size(mount_points, local_pkg); } calculate_installed_size(mount_points, pkg); -- 1.7.3.5

1 0

[pacman-dev] [PATCH] Remove need for floating point division in backend
by Dan McGee 10 Jan '11

10 Jan '11

All of these can be done with integer division; the only slightly interesting part is ensuring we round up like before with calling the ceil() function. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 14 +++++++------- lib/libalpm/conflict.c | 4 ++-- lib/libalpm/diskspace.c | 18 ++++++++++-------- lib/libalpm/remove.c | 7 +++---- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2f341eb..477c8f5 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -477,8 +477,8 @@ static int extract_single_file(struct archive *archive, return(errors); } -static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, size_t pkg_count, - pmtrans_t *trans, pmdb_t *db) +static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, + size_t pkg_count, pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0; char scriptlet[PATH_MAX+1]; @@ -605,14 +605,14 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, size_t pkg_cou } for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { - double percent; + int percent; if(newpkg->size != 0) { /* Using compressed size for calculations here, as newpkg->isize is not * exact when it comes to comparing to the ACTUAL uncompressed size * (missing metadata sizes) */ int64_t pos = archive_position_compressed(archive); - percent = (double)pos / (double)newpkg->size; + percent = (pos * 100) / newpkg->size; _alpm_log(PM_LOG_DEBUG, "decompression progress: " "%f%% (%"PRId64" / %jd)\n", percent*100.0, pos, (intmax_t)newpkg->size); @@ -620,16 +620,16 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, size_t pkg_cou percent = 1.0; } } else { - percent = 0.0; + percent = 0; } if(is_upgrade) { PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START, - alpm_pkg_get_name(newpkg), (int)(percent * 100), pkg_count, + alpm_pkg_get_name(newpkg), percent, pkg_count, pkg_current); } else { PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START, - alpm_pkg_get_name(newpkg), (int)(percent * 100), pkg_count, + alpm_pkg_get_name(newpkg), percent, pkg_count, pkg_current); } diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 0eaf437..fc25e7d 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -425,8 +425,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, continue; } - double percent = (double)current / (double)numtargs; - PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (int)(percent * 100), + int percent = (current * 100) / numtargs; + PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", percent, numtargs, current); /* CHECK 1: check every target against every target */ _alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s\n", diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 87dca84..d0f6c64 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -178,8 +178,9 @@ static int calculate_removed_size(const alpm_list_t *mount_points, } data = mp->data; - data->blocks_needed -= (long)ceil((double)(st.st_size) / - (double)(data->fsp.f_bsize)); + /* the addition of (divisor - 1) performs ceil() with integer division */ + data->blocks_needed -= + (st.st_size + data->fsp.f_bsize - 1) / data->fsp.f_bsize; data->used = 1; } @@ -229,8 +230,9 @@ static int calculate_installed_size(const alpm_list_t *mount_points, } data = mp->data; - data->blocks_needed += (long)ceil((double)(archive_entry_size(entry)) / - (double)(data->fsp.f_bsize)); + /* the addition of (divisor - 1) performs ceil() with integer division */ + data->blocks_needed += + (archive_entry_size(entry) + data->fsp.f_bsize - 1) / data->fsp.f_bsize; data->used = 1; } @@ -259,8 +261,8 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) if(replaces) { numtargs += replaces; for(targ = trans->remove; targ; targ = targ->next, current++) { - double percent = (double)current / (double)numtargs; - PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", (int)(percent * 100), + int percent = (current * 100) / numtargs; + PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, numtargs, current); pkg = targ->data; @@ -269,8 +271,8 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) } for(targ = trans->add; targ; targ = targ->next, current++) { - double percent = (double)current / (double)numtargs; - PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", (int)(percent * 100), + int percent = (current * 100) / numtargs; + PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, numtargs, current); pkg = targ->data; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index e1249fd..d4e3b94 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -425,14 +425,13 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) /* iterate through the list backwards, unlinking files */ newfiles = alpm_list_reverse(files); for(lp = newfiles; lp; lp = alpm_list_next(lp)) { - double percent; + int percent; unlink_file(info, lp->data, NULL, trans->flags & PM_TRANS_FLAG_NOSAVE); /* update progress bar after each file */ - percent = (double)position / (double)filenum; + percent = (position * 100) / filenum; PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, - (int)(percent * 100), pkg_count, - (pkg_count - targcount + 1)); + percent, pkg_count, (pkg_count - targcount + 1)); position++; } alpm_list_free(newfiles); -- 1.7.3.5

1 0

Re: [pacman-dev] some pacman work
by Xavier Chantry 09 Jan '11

09 Jan '11

About my pending work on http://code.toofishes.net/cgit/xavier/pacman.git/ parseargs: sent to the ML and updated according to feedback depwork: forgot if I send this stuff, should I ? pactree: all the work I did with Dave Reisner on pactree C rewrite, all ready and done now. depends on depwork for find_satisfier sodeps: depends on parseargs because it changes one arg, and on depwork (make depcmp private), because it changes many _alpm_depcmp to _alpm_depcmp_tolerant. This was sent to ML. Nagy said it was ok. I find this distinction between depcmp (ignore -Sdd) vs depcmp_tolerant (respect -Sdd) a bit ugly, but I don't see any better way. I am happy with parseargs, depwork, and pactree. One small worry about depwork and its alpm_find_satisfier function : the purpose of this function is kinda duplicated with "alpm/dep: add alpm_find_dbs_satisfier" I made in working. After writing alpm_find_dbs_satisfier, I thought I would kill alpm_find_satisfier, but both have different advantages, and slightly different purpose. alpm_find_satisfier is very simple : it just calls splitdep+_alpm_find_dep_satisfier, which are both very simple. It just answers this question : is there one satisfier for this dep in this package list ? Perfect for deptest / pacman -T, could be useful for other tools. alpm_find_dbs_satisfier: much more complex, but similar purpose. its goal is to answer : which satisfier would pacman choose for this dep in this list of sync dbs ? Less flexible than alpm_find_satisfier (cannot give any list of package, it has to be one or more db), much uglier and complex code. But it exposes exactly what pacman does to find a satisfier : - search literal in a first pass, provider in a second pass only if no literal - for both pass, it scans the list of sync dbs in order, and the first sync db has priority over the next ones - handles ignorepkg with a QUESTION IgnorePkg callback (but this can be disabled simply with no or empty conversation callback) - handle multiple provision with another QUESTION callback, but same as for ignorepkg I needed alpm_find_dbs_satisfier to migrate pacman frontend to the alpm_add_pkg(pmpkg_t *) interface. I decided to keep alpm_find_satisfier anyway for its simplicity. For the stuff on working, I probably need other mails to present it.

3 4