[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-423-g1ce7f39
Dan McGee
dan at archlinux.org
Sun Jul 3 15:46:05 EDT 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 1ce7f39ad73c5c96870c6036014afad3d49a8edf (commit)
via c839415e3fb4bcde11de3cb7595cec93501bed13 (commit)
via 26195f8da1c860a9f79f2d20ab576b06dad55e00 (commit)
via 6a6fc3107f477e579b0dd21553d48e073e3efdf4 (commit)
via a2995f586e492e0d2cb85e7e9ebb5f3857891465 (commit)
via 06840f14b465d9db53646ab0cbc2d4b3526bd255 (commit)
via a7b02d07f49927b11ab2d3bec41013c3a9e90283 (commit)
via ab79b13079ea6c0c7b66e4c5d14686f06ba759ae (commit)
via f612e5ede7f76458911b78adca3323c61a669dd0 (commit)
via 925d74f38d21121440edad3f7917c4326e2bd1db (commit)
via de8b9a85a571716926e6b0f1a680fbb1d1cc8e94 (commit)
via afc96f2ab3d05f14a73e81f871164f01423b5572 (commit)
via bd88a8d5511c24db55dd2a5c04161918571dbfbd (commit)
via 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 (commit)
via 3189d3bc4a7b5f3e92db14256e307e9a58071b2a (commit)
via 39262acab6b956bbc4491d3b90e967a09828e732 (commit)
via ca43fdd92f06a6997c53e45bfed6fb27f3044de5 (commit)
via d796d1cdda15889fc0793eae50582d75f07d55d5 (commit)
via f818f570c555668314fa9ca657fba2fe3ffd8bd4 (commit)
via eb39a9482b711d58a6c12840800f2372dee0c120 (commit)
from cf1401a04d5179c89af6460b812e171cc2da19f0 (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 1ce7f39ad73c5c96870c6036014afad3d49a8edf
Merge: c839415 afc96f2
Author: Dan McGee <dan at archlinux.org>
Date: Sun Jul 3 14:44:57 2011 -0500
Merge remote-tracking branch 'allan/ALPM'
Conflicts:
lib/libalpm/be_local.c
lib/libalpm/be_package.c
lib/libalpm/conflict.c
lib/libalpm/diskspace.c
lib/libalpm/dload.c
lib/libalpm/remove.c
commit c839415e3fb4bcde11de3cb7595cec93501bed13
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jun 16 15:40:02 2011 -0500
conflict code tweaks and cleanups
We can take advantage of a few things on our new and improved filelist
in this code.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 26195f8da1c860a9f79f2d20ab576b06dad55e00
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jun 16 14:51:04 2011 -0500
diskspace: remove all libarchive usage
Now that the filelists capture mode and size information, we can read
the data from there and prevent having to loop through and uncompress
every archive to check required diskspace usage.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 6a6fc3107f477e579b0dd21553d48e073e3efdf4
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jun 16 13:16:49 2011 -0500
Move alpm filelists to a struct object
This allows us to capture size and mode data when building filelists
from package files. Future patches will take advantage of this newly
available information, and frontends can use it as well.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit a2995f586e492e0d2cb85e7e9ebb5f3857891465
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jun 16 15:38:02 2011 -0500
pactest: add a few more checks to fileconflict checks
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 06840f14b465d9db53646ab0cbc2d4b3526bd255
Author: Dan McGee <dan at archlinux.org>
Date: Sun Jul 3 10:31:03 2011 -0500
Fix debug logger without a newline
Signed-off-by: Dan McGee <dan at archlinux.org>
commit a7b02d07f49927b11ab2d3bec41013c3a9e90283
Author: Allan McRae <allan at archlinux.org>
Date: Sun Jul 3 10:18:00 2011 +1000
Do not replicate files list when removing packages
This saves replicating the potentially large list of files in a package
that is being removed.
Signed-off-by: Allan McRae <allan at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit ab79b13079ea6c0c7b66e4c5d14686f06ba759ae
Author: Allan McRae <allan at archlinux.org>
Date: Sun Jul 3 10:10:36 2011 +1000
Add alpm_list_previous method
Helper function to get the previous item in a list
Signed-off-by: Allan McRae <allan at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit f612e5ede7f76458911b78adca3323c61a669dd0
Author: Dan McGee <dan at archlinux.org>
Date: Sun Jul 3 13:39:13 2011 -0500
checkdeps: remove unnecessary list join and copy
We can just perform the same search operation on both lists.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 925d74f38d21121440edad3f7917c4326e2bd1db
Author: Dan McGee <dan at archlinux.org>
Date: Sun Jul 3 13:37:04 2011 -0500
be_local: use macros in database loading similar to be_sync
This removes some of the repetition in the code for reading and parsing
database file lines.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit de8b9a85a571716926e6b0f1a680fbb1d1cc8e94
Author: Dan McGee <dan at archlinux.org>
Date: Sun Jul 3 13:07:19 2011 -0500
be_sync: make READ_NEXT() a no-arg macro
We passed in 'line', but not 'buf.line'. In addition, the macros
building off of READ_NEXT() assume variable names anyway. Since we only
use these macros in one function, might as well simplify them.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit afc96f2ab3d05f14a73e81f871164f01423b5572
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:39 2011 +1000
Prefix _alpm_errno_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit bd88a8d5511c24db55dd2a5c04161918571dbfbd
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:39 2011 +1000
Prefix alpm_transprog_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 495ba26e63ec5cb6b8def29f4e22ea7c444348d8
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:39 2011 +1000
Prefix alpm_transconv_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 3189d3bc4a7b5f3e92db14256e307e9a58071b2a
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:39 2011 +1000
Prefix alpm_transevt_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 39262acab6b956bbc4491d3b90e967a09828e732
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:39 2011 +1000
Prefix alpm_transflag_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit ca43fdd92f06a6997c53e45bfed6fb27f3044de5
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:38 2011 +1000
Prefix alpm_loglevel_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit d796d1cdda15889fc0793eae50582d75f07d55d5
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:38 2011 +1000
Prefix alpm_fileconflicttype_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit f818f570c555668314fa9ca657fba2fe3ffd8bd4
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:38 2011 +1000
Prefix alpm_depmod_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
commit eb39a9482b711d58a6c12840800f2372dee0c120
Author: Allan McRae <allan at archlinux.org>
Date: Sat Jul 2 02:01:38 2011 +1000
Prefix alpm_pkgreason_t members with ALPM
Signed-off-by: Allan McRae <allan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
lib/libalpm/add.c | 166 +++++++++++-----------
lib/libalpm/alpm.c | 2 +-
lib/libalpm/alpm.h | 255 +++++++++++++++++----------------
lib/libalpm/alpm_list.c | 18 +++
lib/libalpm/alpm_list.h | 1 +
lib/libalpm/be_local.c | 193 +++++++++++---------------
lib/libalpm/be_package.c | 72 ++++++-----
lib/libalpm/be_sync.c | 90 ++++++------
lib/libalpm/conflict.c | 131 ++++++++++--------
lib/libalpm/conflict.h | 3 +
lib/libalpm/db.c | 70 +++++-----
lib/libalpm/delta.c | 4 +-
lib/libalpm/deps.c | 100 +++++++-------
lib/libalpm/diskspace.c | 87 ++++--------
lib/libalpm/dload.c | 30 ++--
lib/libalpm/error.c | 102 +++++++-------
lib/libalpm/handle.c | 30 ++--
lib/libalpm/log.c | 6 +-
lib/libalpm/package.c | 42 +++++-
lib/libalpm/package.h | 4 +
lib/libalpm/remove.c | 161 +++++++++++-----------
lib/libalpm/signing.c | 56 ++++----
lib/libalpm/sync.c | 174 ++++++++++++------------
lib/libalpm/trans.c | 54 ++++----
lib/libalpm/util.c | 56 ++++----
lib/libalpm/util.h | 4 +-
src/pacman/callback.c | 80 ++++++------
src/pacman/conf.c | 110 ++++++++--------
src/pacman/database.c | 16 +-
src/pacman/package.c | 16 +-
src/pacman/pacman.c | 66 +++++-----
src/pacman/query.c | 38 +++---
src/pacman/remove.c | 18 ++--
src/pacman/sync.c | 70 +++++-----
src/pacman/upgrade.c | 28 ++--
src/pacman/util.c | 28 ++--
src/util/cleanupdelta.c | 6 +-
src/util/testdb.c | 4 +-
src/util/testpkg.c | 10 +-
test/pacman/tests/fileconflict001.py | 3 +
test/pacman/tests/fileconflict002.py | 9 +-
41 files changed, 1220 insertions(+), 1193 deletions(-)
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list