[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-459-ge209955
Dan McGee
dan at archlinux.org
Thu Jul 14 17:12:19 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 e20995560640d11491905bfa80aa993c2efde7c4 (commit)
via 8f72ffbc4521008897fff0819cae4c80f8405391 (commit)
via 0fe93bc34c4f463fbaeaa8be7a00e10bc0bc8b4d (commit)
via 1376ba5b0e261f9bd1988598e8fc3237f9d1fef7 (commit)
via 6907a22b275859dcdf4c80ac6df87099414b0b04 (commit)
via 727e03fe198e58e53434ad445e6156f06daf5e94 (commit)
via 282be6bf4b87678d3b634a5bc6a8a1c097e593ea (commit)
via 7f5b24597bec4d74328c62467ad778f7eaae75a1 (commit)
via af357d6ab00d8ca258dfd7abb689d6fd2eb4090f (commit)
via 36e48573ceee0f707de0dcc55d1da442d949d3dc (commit)
via 00628c7268e3b81045961be51a0ca640aea368b0 (commit)
via 1d53dd716d7c7bea297a532809c4557b805a9918 (commit)
from b678e002714b732d7ea6a48029ac1a5b285d04e5 (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 e20995560640d11491905bfa80aa993c2efde7c4
Author: Dan McGee <dan at archlinux.org>
Date: Tue Jul 5 22:48:50 2011 -0500
doc/PKGBUILD: clarify scriptlet version arguments
It was a bit unclear that both pkgver and pkgrel were included in the
passed version strings; clarify this fact in the manpage. Also include
epoch in the mix now that it exists.
Also make two other minor consistency touchups to code-print variables
in text.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 8f72ffbc4521008897fff0819cae4c80f8405391
Author: Dan McGee <dan at archlinux.org>
Date: Wed Jul 6 13:37:18 2011 -0500
Make alpm_db_set_pkgreason() arguments more sane
This can only ever operate on the local database, and a local package at
that. Change the function signature to take a handle and package object,
add the relevant asserts, and ensure the frontend can detect the package
not found condition when finding packages to pass to this method.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 0fe93bc34c4f463fbaeaa8be7a00e10bc0bc8b4d
Author: Dave Reisner <dreisner at archlinux.org>
Date: Wed Jul 6 09:19:44 2011 -0400
contrib/paclog-pkglist: new contribution
converts a pacman log file to a list of installed packages, which should
match the output of `pacman -Q'.
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 1376ba5b0e261f9bd1988598e8fc3237f9d1fef7
Author: Dave Reisner <dreisner at archlinux.org>
Date: Wed Jul 6 22:19:58 2011 -0400
contrib/bash_completion: update with new makepkg opts
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 6907a22b275859dcdf4c80ac6df87099414b0b04
Author: Dave Reisner <dreisner at archlinux.org>
Date: Fri Jul 8 09:01:37 2011 -0400
makepkg: remove unused -C option from option list
We nuke it from the completion file as well along with its longopt.
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 727e03fe198e58e53434ad445e6156f06daf5e94
Author: Dave Reisner <dreisner at archlinux.org>
Date: Sun Jul 10 19:36:00 2011 -0400
makepkg: skip devel_check when reading from a pipe
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 282be6bf4b87678d3b634a5bc6a8a1c097e593ea
Author: DJ Mills <danielmills1 at gmail.com>
Date: Fri Jul 8 00:31:22 2011 -0400
makepkg: Remove pre-optimization from in_array()
The '[[ -z' test in in_array() is redundant, so remove it.
Signed-off-by: DJ Mills <danielmills1 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit 7f5b24597bec4d74328c62467ad778f7eaae75a1
Author: DJ Mills <danielmills1 at gmail.com>
Date: Fri Jul 8 00:31:23 2011 -0400
makepkg: Remove OPT_TEMP hack in parse_options call
Instead of hacking around the error trap, simply do an explicit
test for failure.
Signed-off-by: DJ Mills <danielmills1 at gmail.com>
Signed-off-by: Allan McRae <allan at archlinux.org>
commit af357d6ab00d8ca258dfd7abb689d6fd2eb4090f
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jul 14 15:32:03 2011 -0500
Allow fileconflict if unowned file moving into backup array
The bulk of this commit is adding new tests to ensure the new behavior
works without disrupting old behavior. This is a relatively sane maneuver
when a package adds a conf file (e.g. '/etc/mercurial/hgrc') that was
not previously in the package, but it is placed in the backup array. In
essence, we can treat the existing file as having always been a part of
the package and do our normal compare/install as pacnew logic checks.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 36e48573ceee0f707de0dcc55d1da442d949d3dc
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jul 14 14:58:46 2011 -0500
Add 'compress' compression format as an available option
This adds the '.tar.Z' option to both repo-add and makepkg for no other
reason than "why not", and because bsdtar supports it natively with the
'-Z' flag. Also update the documentation accordingly.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 00628c7268e3b81045961be51a0ca640aea368b0
Author: Dan McGee <dan at archlinux.org>
Date: Wed Jul 6 09:18:59 2011 -0500
Unify package removal code
This code duplication has always been a rather clumsy casuality of
fixing some past upgrade issues. Unify the removal code across upgrade
and remove operations into a new _alpm_remove_single_package() method
wihch makes it very clear how we handle upgrade and remove differently,
via several conditionals on newpkg.
This commit highlights interesting behavior such as the fact that the
implicit removal in every package upgrade never gets transaction events
or progress callbacks.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 1d53dd716d7c7bea297a532809c4557b805a9918
Author: Dan McGee <dan at archlinux.org>
Date: Tue Jul 5 22:36:40 2011 -0500
include util.h in rawstr.c
Fixes "error: no previous prototype for '_alpm_raw_cmp'
[-Werror=missing-prototypes]" warnings, and also prevents someone from
getting the prototypes and functions out of sync.
Signed-off-by: Dan McGee <dan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
contrib/Makefile.am | 1 +
contrib/bash_completion.in | 10 +-
contrib/paclog-pkglist | 57 ++++++
doc/PKGBUILD.5.txt | 34 ++--
doc/makepkg.conf.5.txt | 3 +-
doc/pacman.conf.5.txt | 11 +-
doc/repo-add.8.txt | 4 +-
lib/libalpm/add.c | 6 +-
lib/libalpm/alpm.h | 7 +-
lib/libalpm/backup.c | 7 +-
lib/libalpm/backup.h | 2 +-
lib/libalpm/conflict.c | 16 ++
lib/libalpm/db.c | 34 ++--
lib/libalpm/rawstr.c | 2 +
lib/libalpm/remove.c | 204 +++++++++----------
lib/libalpm/remove.h | 5 +-
scripts/makepkg.sh.in | 13 +-
scripts/repo-add.sh.in | 1 +
src/pacman/database.c | 3 +-
test/pacman/tests/fileconflict003.py | 2 +-
test/pacman/tests/{upgrade022.py => upgrade027.py} | 13 +-
test/pacman/tests/{upgrade021.py => upgrade028.py} | 13 +-
test/pacman/tests/upgrade029.py | 24 +++
23 files changed, 291 insertions(+), 181 deletions(-)
create mode 100755 contrib/paclog-pkglist
copy test/pacman/tests/{upgrade022.py => upgrade027.py} (51%)
copy test/pacman/tests/{upgrade021.py => upgrade028.py} (51%)
create mode 100644 test/pacman/tests/upgrade029.py
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list