[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-242-gdd26592
Dan McGee
dan at archlinux.org
Tue Jan 11 22:24:11 EST 2011
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 at archlinux.org>
Date: Tue Jan 11 21:20:12 2011 -0600
Merge branch 'diskspace-fixes'
commit 57c5afd69c4c70ad85676bab32150d6182a3def9
Merge: 0284cf2 33240e8
Author: Dan McGee <dan at 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 at archlinux.org>
Date: Tue Jan 11 21:20:07 2011 -0600
Merge branch 'repo-add-improvements'
commit 33240e87b99e5aebd0e64a672ea307a698edb32f
Author: Dan McGee <dan at 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 at archlinux.org>
commit 25fab402c79aeaa5b72959c7bfd2e541a1b34045
Author: Dan McGee <dan at 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 at archlinux.org>
commit 6942bba75db596a70d5ba408785bf461e691bc9c
Author: Dan McGee <dan at 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 at archlinux.org>
commit 55bff19b7692e01a0bf276c742c77f03fb445160
Author: Dan McGee <dan at 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 at archlinux.org>
commit fe6e90c21f1561ee54deedbc707f5afc964d3cae
Author: Dan McGee <dan at 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 at archlinux.org>
commit 9a82cb92a446bce05186460bc5b5b12c4df7e5a1
Author: Dan McGee <dan at 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 at archlinux.org>
commit d0c327df172942da18f1e5c9b6afb183e4d9ee18
Author: Dan McGee <dan at 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 at archlinux.org>
commit eda4d9ec00be1108ab4336a438299a283c5a0a90
Author: PyroPeter <abi1789 at 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 at googlemail.com>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit b04a56dbe90f43622158410234fabea96d0d7f07
Author: Dan McGee <dan at 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 at archlinux.org>
commit 0d4dd09993971924d379be4d0944d72f4c77b021
Author: Dan McGee <dan at 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 at archlinux.org>
commit 7ce90bb135c04b4421ca2824099e6e72659721b1
Author: Dan McGee <dan at 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 at archlinux.org>
commit a9cbd15260b396c38b7d5ffe5669994e65f9a86f
Author: Dan McGee <dan at 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 at archlinux.org>
commit 3e1bdfa93c0c0c1a966ba24f8013754a8a87f0ec
Author: Dan McGee <dan at 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 at archlinux.org>
commit 5f140a62debb7d55436af7f84b0ecf5696f46c86
Author: Dan McGee <dan at 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 at archlinux.org>
commit 842cbc9ea4036036cf00b3b2eeccc11ad531cd2e
Author: Dan McGee <dan at 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 at archlinux.org>
commit d03b57f459fb9ab9288991a70c4e7297a7c1d150
Author: Dan McGee <dan at 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 at 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
More information about the pacman-dev
mailing list