[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-232-gb196cc4
Dan McGee
dan at archlinux.org
Mon Jul 7 22:46:40 EDT 2008
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 b196cc43a50e6fd1dfa9425d7ff8a9302e6fec84 (commit)
via d92b0e674d60e53a43fe9f6d5bc5f311364285c6 (commit)
via 30702350fa442fd6d450f909cda7124369e68f77 (commit)
via 72c0ab5c51d5119b6f81c768b1a0f6ff499df292 (commit)
via 8856146d71cb4cc512b0cf3414fbc231635822d3 (commit)
via 616b5967b8581d51f9e08dd4178c921eee617d4b (commit)
via f7199f36ba5a2b42da51cd227855caaa43c51d58 (commit)
via 2122eb1428ac754e9f5d675b4c4fa62b0286d3b6 (commit)
via 5f701005ed70fe08bb9932d1a1fe02c59cbc5bb0 (commit)
via 11695bd0d7d8efa32066c3adf25007a896661da9 (commit)
via d534488f2d0b6ca9e90591e74af555fe242dfe39 (commit)
via b15fb504a19831200b86a43646d8def89560b61c (commit)
via 74eb2f5c6132b0529dd22b33a14232e7059551c1 (commit)
via 7edb2e5b0d55505b49d682f6f4c5b4b1e49c3b72 (commit)
from d594b6e7978d14b5ca4cd9c295fa9b829c5565bd (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 b196cc43a50e6fd1dfa9425d7ff8a9302e6fec84
Merge: 30702350fa442fd6d450f909cda7124369e68f77 d92b0e674d60e53a43fe9f6d5bc5f311364285c6
Author: Dan McGee <dan at archlinux.org>
Date: Mon Jul 7 21:39:42 2008 -0500
Merge branch 'maint'
commit 30702350fa442fd6d450f909cda7124369e68f77
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Sat Jul 5 10:48:26 2008 +0200
Remove requiredby from pactests
Also remove some meaningless pactests (broken requiredby, requiredby*.py
tests). requiredby001.py was renamed to upgrade076.py.
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 72c0ab5c51d5119b6f81c768b1a0f6ff499df292
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Sun Jul 6 01:22:13 2008 +0200
Resolvedeps rework
I divided resolvedeps into 2 functions. The new _alpm_resolvedep function
will resolve one dependency, for example the 'foo>=1.0-1' dependency. It
can be useful in sync_addtarget refactoring.
The resolvedeps parameters were changed, to be coherent with recursedeps:
* the target-list is an alpm_list* instead of alpm_list**. This is OK,
because alpm_list_add == alpm_list_add_last
* syncpkg param was removed. list contains the to-be-installed packages,
resolvedeps will add the required dependencies into this list
* trans param was removed, it was used in QUESTION() only, which can be used
on the main (handle->trans) transaction only (because the front-end cannot
access our pseudo-transactions at all!).
The patch fixes some wrong dynamic pmdepmissing_t usage.
I did a behavior change (and sync1003.py was modified accordingly), which
needs some explanation: The old resolvedeps didn't elect packages from
'remove' list. I've dropped this because I don't want that 2nd excluding
list param. In fact, in real life, we ~never need this rule. Resolvedeps is
called before checkconflicts, so only -Su's %REPLACES% packages are sitting
in 'remove' list. This means, that we have the replacement packages in our
target list. Usually "foo replaces bar" means, that bar isn't in our repos
any more, so resolvedeps *cannot* elect it; but usually it won't try it at
all, because foo is in the target list, and it is expected to satisfy
'bar>=1.0-1'-like dependencies too. Since checkdeps and checkconflicts is
done after resolvedeps, this cannot cause any harm.
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 8856146d71cb4cc512b0cf3414fbc231635822d3
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Sun Jul 6 01:18:11 2008 +0200
Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function
PM_TRANS_CONV_INSTALL_IGNOREPKG callback function can get 2 params: foo, bar
in this order (packages), bar can be NULL.
Old API:
foo, NULL: Do you want to install foo from IgnorePkg?
foo, bar: foo requires bar from IgnorePkg. Do you want to install bar?
New API:
foo, bar: Do you want to install foo from IgnorePkg? (If bar!=NULL:) bar
requires it.
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 616b5967b8581d51f9e08dd4178c921eee617d4b
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Fri Jul 4 15:39:26 2008 +0200
New _alpm_find_dep_satisfier function
This function finds the first satisfier package in a pkglist. Using it
instead of _alpm_find_dep_satisfiers eliminates some memleaks and it is
faster. (_alpm_find_dep_satisfiers and _alpm_find_pkg_satisfiers will be
removed soon.)
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit f7199f36ba5a2b42da51cd227855caaa43c51d58
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Tue Jul 1 22:53:13 2008 +0200
New _alpm_dep_edge function
The function is introduced to kill some code duplication. The function name
uses the 'dependency graph' terminology.
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 2122eb1428ac754e9f5d675b4c4fa62b0286d3b6
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Tue Jul 1 21:06:32 2008 +0200
Don't duplicate packages in requiredby list
This is a "fix" for FS#10226. I think that multiple versioned dependencies
are quite common now, and the old behavior is quite annoying there. This
patch won't cause any slow-down.
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 5f701005ed70fe08bb9932d1a1fe02c59cbc5bb0
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date: Tue Jul 1 20:23:20 2008 +0200
Use $PKGEXT (from /etc/makepkg.conf) in bacman
Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 11695bd0d7d8efa32066c3adf25007a896661da9
Author: Xavier Chantry <shiningxc at gmail.com>
Date: Tue Jun 17 00:09:45 2008 +0200
repo-add cleanup.
* change ln -s to ln -sf in the Makefile to prevent a failure when the link
already exists.
* make test_repo_db_file simpler and more natural, move the complexity out
of it.
* remove one $cmd = repo-remove check that wasn't needed
Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit b15fb504a19831200b86a43646d8def89560b61c
Author: Carlo Bersani <carlocci at gmail.com>
Date: Sun Jun 22 21:21:05 2008 -0500
bacman: fix issue with symlink early copy
test -e tries to resolve the link before testing, so if the link is copied
before the actual file, the script exited. This fixes the issue.
[Dan: also add some improved quoting in the script]
Signed-off-by: Carlo Bersani <carlocci at gmail.com>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 74eb2f5c6132b0529dd22b33a14232e7059551c1
Author: Allan McRae <mcrae_allan at hotmail.com>
Date: Sun Jun 22 20:11:54 2008 +1000
Additional path quoting and srcdir/pkgdir usage
Removes the remaining $startdir/{src,pkg} usage and adds quoting
around (hopefully) all remaining path variables
Signed-off-by: Allan McRae <mcrae_allan at hotmail.com>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 7edb2e5b0d55505b49d682f6f4c5b4b1e49c3b72
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jun 19 19:28:56 2008 -0500
Add information on version comparison to manpages
Signed-off-by: Dan McGee <dan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
contrib/bacman | 22 +-
doc/PKGBUILD.5.txt | 3 +-
doc/pacman.8.txt | 8 +-
lib/libalpm/deps.c | 262 ++++++++++-----------
lib/libalpm/deps.h | 8 +-
lib/libalpm/package.c | 19 +-
lib/libalpm/po/hu.po | 2 +-
lib/libalpm/sync.c | 12 +-
pactest/tests/remove040.py | 3 -
pactest/tests/remove041.py | 2 -
pactest/tests/remove042.py | 2 -
pactest/tests/remove043.py | 3 -
pactest/tests/remove045.py | 3 -
pactest/tests/remove046.py | 10 -
pactest/tests/remove047.py | 1 -
pactest/tests/remove048.py | 10 -
pactest/tests/remove049.py | 1 -
pactest/tests/requiredby002.py | 16 --
pactest/tests/requiredby003.py | 16 --
pactest/tests/requiredby004.py | 20 --
pactest/tests/requiredby005.py | 21 --
pactest/tests/requiredby006.py | 21 --
pactest/tests/sync010.py | 2 -
pactest/tests/sync060.py | 15 --
pactest/tests/sync1000.py | 2 -
pactest/tests/sync1003.py | 17 +-
pactest/tests/sync300.py | 1 -
pactest/tests/sync400.py | 1 -
pactest/tests/sync895.py | 2 -
pactest/tests/sync896.py | 2 -
pactest/tests/sync900.py | 3 -
pactest/tests/sync901.py | 3 -
pactest/tests/upgrade052.py | 1 -
pactest/tests/upgrade053.py | 1 -
pactest/tests/upgrade054.py | 1 -
pactest/tests/upgrade055.py | 3 -
pactest/tests/upgrade056.py | 4 -
pactest/tests/upgrade057.py | 2 -
pactest/tests/upgrade058.py | 1 -
pactest/tests/upgrade059.py | 2 -
pactest/tests/upgrade060.py | 1 -
pactest/tests/upgrade061.py | 1 -
pactest/tests/upgrade073.py | 2 -
pactest/tests/{requiredby001.py => upgrade076.py} | 6 +-
scripts/Makefile.am | 2 +-
scripts/makepkg.sh.in | 19 +-
scripts/repo-add.sh.in | 28 +-
src/pacman/callback.c | 4 +-
48 files changed, 191 insertions(+), 400 deletions(-)
delete mode 100644 pactest/tests/remove046.py
delete mode 100644 pactest/tests/remove048.py
delete mode 100644 pactest/tests/requiredby002.py
delete mode 100644 pactest/tests/requiredby003.py
delete mode 100644 pactest/tests/requiredby004.py
delete mode 100644 pactest/tests/requiredby005.py
delete mode 100644 pactest/tests/requiredby006.py
delete mode 100644 pactest/tests/sync060.py
rename pactest/tests/{requiredby001.py => upgrade076.py} (71%)
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list