- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-10-g85d0111
by dan＠archlinux.org 22 Jan '11

22 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, maint has been updated via 85d0111da8413dc7879f6259afc0e5621c2d2634 (commit) from 30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (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 85d0111da8413dc7879f6259afc0e5621c2d2634 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 21 10:36:51 2011 -0600 3.4.3 release preparation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 3 +++ configure.ac | 4 ++-- doc/index.txt | 1 + src/pacman/pacman.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

22 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 8

[pacman-dev] [PATCH] repo-add: only attempt to create deltas when asked
by Allan McRae 22 Jan '11

22 Jan '11

repo-add should only attempt to create the delta file when using the -d option. Also adjust a couple of tests to use the "double bracket" syntax. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2929c96..9b79022 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -234,9 +234,9 @@ db_write_entry() if [[ -d $pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" else - if [ $DELTA -eq 1 ]; then + if (( DELTA )); then pkgentry=$(find_pkgentry $pkgname) - if [ -n "$pkgentry" ]; then + if [[ -n $pkgentry ]]; then local oldfilename=$(grep -A1 FILENAME $pkgentry/desc | tail -n1) local oldfile="$(dirname $1)/$oldfilename" fi @@ -296,14 +296,16 @@ db_write_entry() fi # create a delta file - if [ -n "$oldfilename" ]; then - if [ -f "$oldfile" ]; then - delta=$(pkgdelta -q $oldfile $1) - if [ -f "$delta" ]; then - db_write_delta $delta + if (( DELTA )); then + if [[ -n $oldfilename ]]; then + if [[ -f $oldfile ]]; then + delta=$(pkgdelta -q $oldfile $1) + if [[ -f $delta ]]; then + db_write_delta $delta + fi + else + warning "$(gettext "Old package file not found: %s")" "$oldfilename" fi - else - warning "$(gettext "Old package file not found: %s")" "$oldfilename" fi fi -- 1.7.3.5

1 0

[pacman-dev] [PATCH] Makefile: Use git describe --dirty for GIT VERSION
by Xavier Chantry 22 Jan '11

22 Jan '11

dirty indicates if the repo has uncommited changes or not when building, so dont hardcode this info. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- doc/Makefile.am | 2 +- scripts/Makefile.am | 2 +- src/pacman/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 6405cf0..37dab13 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -60,7 +60,7 @@ dist-hook: $(MAKE) $(AM_MAKEFLAGS) all if USE_GIT_VERSION -GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty +GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') REAL_PACKAGE_VERSION = $(GIT_VERSION) else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2962b91..ae6ce36 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = \ MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp if USE_GIT_VERSION -GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty +GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') REAL_PACKAGE_VERSION = $(GIT_VERSION) else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 8c14562..31e8b13 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE if USE_GIT_VERSION -GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty +GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') DEFS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif -- 1.7.3.5

1 0

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

22 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 3863e48788e2424c4f1469e72dabda6fba595c4c (commit) via c86ff120c870a2d0e0427567ae7449e23ad42954 (commit) via 01c8f39ab8db36ad7ac1c2078a8c1a5b7504192a (commit) via aff3e63c451ead18571a8abed56e911f71906fe6 (commit) via b40c8e292244c497ddb557428b8bd152ed7f0482 (commit) via c49f1980429f88cd0a73340df7c1e9d02e7026a7 (commit) via f65edb7f299537357354b5bd637353db6c7ddcd1 (commit) via a88cb03a58909304603a794e42070656fca6b626 (commit) from 665528d7bac99228849d1162f78c0817bc619eee (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 3863e48788e2424c4f1469e72dabda6fba595c4c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 21 10:11:59 2011 -0600 Add a likely_pkg hint argument to sync_db_read In most (all?) cases, we will process all files for a given sync database entry sequentially. The code currently does an _alpm_pkg_find() for every file in the database, but we had the "current" package readily available. Shift some local variables around a bit to expose this to sync_db_read() and use it if the package is the correct one. On my system, this cuts calls to _alpm_pkg_find() from 20,769 to 10,349 calls during a -Qu operation, and results in a ~30% speedup of the same operation (0.35 sec -> 0.27 sec). This benefit should be apparent anywhere we read in the full contents of the sync databases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c86ff120c870a2d0e0427567ae7449e23ad42954 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 19 12:20:32 2011 -0600 Improve splitname memory allocation We don't need to create a temporary copy of the string if we are smart with our pointer manipulation and string copying. This saves a bunch of string duplication during database parsing, both local and sync. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01c8f39ab8db36ad7ac1c2078a8c1a5b7504192a Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 19 12:00:39 2011 -0600 Improve depends string parsing Remove the need for an unconditional string duplication by using pointer arithmetic instead, and strndup() instead of an unspecified-length strdup(). This should reduce memory churn a fair amount as this is called pretty frequently during database loads. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aff3e63c451ead18571a8abed56e911f71906fe6 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 19 12:00:39 2011 -0600 Add strndup fallback function to libalpm util The same fallback we are currently using in the pacman frontend. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b40c8e292244c497ddb557428b8bd152ed7f0482 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 19 12:22:33 2011 -0600 Update valgrind suppressions file We haven't tweaked this in a while, but some of the old stuff seems to no longer be necessary and there are a few new things we should add. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c49f1980429f88cd0a73340df7c1e9d02e7026a7 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 20 15:41:03 2011 -0600 Add a pactest for the situation in FS#7524 Confirming the current behavior. And yes, the error message is still no better than it was when this was reported 3.5 years ago. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f65edb7f299537357354b5bd637353db6c7ddcd1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 18 13:19:25 2011 -0600 Fix integrity check status when installing from file When installing packages from a file, the integrity check count stays at (0/x) complete. This ensures it is bumped to (x/x) at the end of the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a88cb03a58909304603a794e42070656fca6b626 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 10 13:56:27 2011 -0600 makepkg: perform all sanity checks before erroring out It is pretty annoying to get one, fix it, and then get another. We should be able to continue on through most of the sanity checks in one go so the user gets all the error messages at once. Also ensure $pkgbase is defined by the time we call this function; previously we printed nothing where a package name should have been due to this oversight. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 26 ++++++++++++-------- lib/libalpm/deps.c | 53 +++++++++++++++-------------------------- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 49 +++++++++++++++++++++++++++----------- lib/libalpm/util.h | 5 ++++ scripts/makepkg.sh.in | 37 +++++++++++++++-------------- test/pacman/tests/sync407.py | 38 ++++++++++++++++++++++++++++++ valgrind.supp | 27 +++++++++++---------- 8 files changed, 148 insertions(+), 90 deletions(-) create mode 100644 test/pacman/tests/sync407.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] Add strndup fallback function to libalpm util
by Dan McGee 20 Jan '11

20 Jan '11

The same fallback we are currently using in the pacman frontend. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 5 +++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2eee5e4..81d950e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -937,4 +937,26 @@ long _alpm_parsedate(const char *line) return(atol(line)); } +#ifndef HAVE_STRNDUP +/* A quick and dirty implementation derived from glibc */ +static size_t strnlen(const char *s, size_t max) +{ + register const char *p; + for(p = s; *p && max--; ++p); + return(p - s); +} + +char *strndup(const char *s, size_t n) +{ + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); + + if (new == NULL) + return NULL; + + new[len] = '\0'; + return (char *) memcpy(new, s, len); +} +#endif + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index be5c1d9..015e9bf 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -50,6 +50,7 @@ #define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) /* This strdup macro is NULL safe- copying NULL will yield NULL */ #define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) +#define STRNDUP(r, s, l, action) do { if(s != NULL) { r = strndup(s, l); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) #define FREE(p) do { free(p); p = NULL; } while(0) @@ -101,6 +102,10 @@ long _alpm_parsedate(const char *line); char *strsep(char **, const char *); #endif +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n); +#endif + /* check exported library symbols with: nm -C -D <lib> */ #define SYMEXPORT __attribute__((visibility("default"))) #define SYMHIDDEN __attribute__((visibility("internal"))) -- 1.7.3.5

1 2

[pacman-dev] when upgrading display versions
by Divan Santana 20 Jan '11

20 Jan '11

Hi Pacman Devs, Hope this is the correct place to ask such a question... I'm new to Arch Linux and loving the Arch so far. I'm impressed and pleasantly surprised by pacman as a package management system. One thing that would be nice, and I think it's in line with The Arch Way (openness perhaps ;) is when updating to display(or be able to display) the versions of the packages being upgraded. I know one sees the new version being installed but not the currently installed version so one can quickly compare before proceeding/deciding to upgrade. I know one can easily achieve this with queries and small scripts(such as below) but it would really be quite nice to pass a pacman parameter and be able to see the output. I think it's quite important as Arch being a rolling distro sometimes you get major updates of packages and it would be nice to see straight away which are major updates and which are minor. Script to do this I use is: for package in `pacman -Qu | awk {'print $1'}`; do echo "`pacman -Q $package` to `pacman -Si $package | grep Version | awk {'print $NF'}`"; done Other package management programs + arguments that do this is: zypper -v up apt-get dist-upgrade -V Anyway it's a minor thing perhaps the best is to log a feature request at https://bugs.archlinux.org ? Better(and also in line with the Arch Way) would be contribute the code and not request it but unfortunately I can't help with that since I know so little programming. Greetings :) -- Divan Santana

3 3

[pacman-dev] Silly output with checking package integrity progress bar
by Dan McGee 20 Jan '11

20 Jan '11

Another bit of fallout: :: Retrieving packages from community... picard-0.12.1-5-x86_64 607.1K 347.1K/s 00:00:02 [##################################################] 100% pv-1.2.0-1-x86_64 26.8K 119.7K/s 00:00:00 [##################################################] 100% :: File pyqt-4.8.2-2-x86_64.pkg.tar.xz is corrupted. Do you want to delete it? [Y/n] y[##############------------------------------------] 29% (23/24) checking package integrity [##################################################] 100% error: failed to commit transaction (invalid or corrupted package) pyqt-4.8.2-2-x86_64.pkg.tar.xz is invalid or corrupted Errors occurred, no packages were upgraded. Notice how the bar overlapped with the meter since we never hit 100% and line wrapped. Perhaps we should hold all of these conversations until after the integrity check is complete, if possible? -Dan

1 0

[pacman-dev] [PATCH] Allow files entries to be read from a sync database
by Dan McGee 19 Jan '11

19 Jan '11

Nothing will use this yet, but we might as well read the info in while processing the database. The drawback would be vastly increased memory usage, so we might want to add a flag enabling/disabling the loading of this data. This will at least for now be unused by pacman, but a pkgfile.c program at least now has the option of using standard libalpm interfaces to search for file ownership. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Thoughts from the peanut gallery? -Dan lib/libalpm/be_sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b11499c..58ff3c3 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -282,7 +282,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr } if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0 - || strcmp(filename, "deltas") == 0) { + || strcmp(filename, "deltas") == 0 || strcmp(filename, "files") == 0) { while(_alpm_archive_fgets(archive, &buf) == ARCHIVE_OK) { char *line = _alpm_strtrim(buf.line); @@ -357,6 +357,8 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr READ_AND_STORE_ALL(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { READ_AND_STORE_ALL(pkg->deltas); + } else if(strcmp(line, "%FILES%") == 0) { + READ_AND_STORE_ALL(pkg->files); } } } else { -- 1.7.3.5

3 3

[pacman-dev] [PATCH] Fix integrity check status when installing from file
by Allan McRae 19 Jan '11

19 Jan '11

When installing packages from a file, the integrity check count stays at (0/x) complete. This ensures it is bumped to (x/x) at the end of the process. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I'm not sure this is the best way to fix this issue... But given the loop is essentially doing nothing in this case, I do not see the point in updating the progress bar as we go. lib/libalpm/sync.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b1eab55..bbb319c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -957,6 +957,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) pmpkg_t *spkg = i->data; int percent = (current * 100) / numtargs; if(spkg->origin == PKG_FROM_FILE) { + current++; continue; /* pkg_load() has been already called, this package is valid */ } PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent, -- 1.7.3.5

3 4

[pacman-dev] New Guy Wants to Change Everything
by Westley Martínez 18 Jan '11

18 Jan '11

Hello I'm Anikom15 and I'm new. You might know me from the Arch Linux forums but whatever. I'm interested in helping develop pacman considering the fact I've been using the program for so long I figure I should give something back, and maybe get better at C coding, too. Okay, one question: why does the source code use tabs instead of spaces? Is there a specific reason as to why? In my experience spaces makes everything easier because tabs can mess up alignment if the editor isn't set properly. I know what you're thinking, "These new people they come in and wanna change everything and then leave". I don't wanna change anything unnecessarily, I'd just like an explanation. Now just between you and me I think some other conventions the code is using like return statements being written like a function call are stupid as well, but those don't have dire consequences like the tabs can potentially have. Sorry if I sound a little invasive, I don't collaborate much.

4 4

[pacman-dev] [PATCH] remove ":: " from messages
by Vojtěch Gondžala 18 Jan '11

18 Jan '11

Hi all, there is an simple patch for remove prefix "::" from messages, all magic chars are in function `info_msg' like "warning: : and "error: " prefixes in `pm_*printf'. It will be better for translators to, and it's first step prepare for colorize output support for pacman. -- Vojtěch "vogo" Gondžala

2 1

[pacman-dev] Using libalpm with Vala
by Rémy Oudompheng 14 Jan '11

14 Jan '11

Hello, I became recently interested in Vala, and I did several experiments to try interfacing it with libalpm. Vala is an object-oriented language created to be used mainly with glib2/gtk, and writing Vala bindings is especially lightweight : it is only a matter of writing a "dictionary" between C functions and methods. I think it might be a nice alternative to C when writing small command line or GTK utilities. I have put an example of how the C version of pactree would be written in Vala, at http://github.com/remyoudompheng/libalpm-vala Memory management is especially tricky, as I am new to Vala, and not very familiar with the internals of libalpm. So for the moment, only a very small set of functions are wrapped and this version of pactree does not segfault. Feel free to make any comments. Regards, Rémy.

1 0

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

14 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 665528d7bac99228849d1162f78c0817bc619eee (commit) via 5615b716887960260016646c2d0f812806abe2ec (commit) via 30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (commit) via cae2bdafec93381284ba487010738d72d0992aab (commit) via 8e30a46adbe350a9741bbb9748334a4adc9742f6 (commit) via 9e8af82c97992ab15e4c182af84f06afd4885dc7 (commit) from dd265921559b187cba59e83bfdbfda11bcec2f1e (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 665528d7bac99228849d1162f78c0817bc619eee Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 13 09:33:01 2011 -0600 repo-add: fix misguided conditional correction I tried to move things around here when testing and did a bit too much; the warning message always showed regardless of delta inclusion in the call. Fix it so we only warn if we have a filename, but the file couldn't be located. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5615b716887960260016646c2d0f812806abe2ec Merge: dd26592 30f53cf Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 09:23:24 2011 -0600 Merge branch 'maint' Conflicts: lib/libalpm/be_files.c ----------------------------------------------------------------------- Summary of changes: scripts/repo-add.sh.in | 14 ++++++++------ src/pacman/pacman.c | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-9-g30f53cf
by dan＠archlinux.org 14 Jan '11

14 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, maint has been updated via 30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (commit) via cae2bdafec93381284ba487010738d72d0992aab (commit) via 8e30a46adbe350a9741bbb9748334a4adc9742f6 (commit) via 9e8af82c97992ab15e4c182af84f06afd4885dc7 (commit) from 6ddc115c7f52d6d172ca3879f96cc782bb526313 (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 30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 12 09:17:22 2011 -0600 Fix double read issue in maint releases This is essentially a backport/cherry-pick of commit 33240e87b99e from master, but has to be done by hand because the DB format has diverged. Read more in the commit message used there, which follows. 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. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cae2bdafec93381284ba487010738d72d0992aab 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> (cherry picked from commit 0d4dd09993971924d379be4d0944d72f4c77b021) commit 8e30a46adbe350a9741bbb9748334a4adc9742f6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 23:16:52 2011 -0600 Make debug config messages consistent in capitalization Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9e8af82c97992ab15e4c182af84f06afd4885dc7 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 11 23:15:44 2011 -0600 Back out anticipated epoch changes After all the debate as to what to do on maint, we are going to end up just incorporating epoch into the version string, so we don't need this separate field at all. Revert commit 5c8083baa4a and also kill the force flag we were recording here as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 22 ++++++++++------------ src/pacman/pacman.c | 4 ++-- test/pacman/pmdb.py | 10 ++++------ 3 files changed, 16 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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