[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.1-123-gc5addd9

[Dan McGee]

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  c5addd94e3a817504688e684bf62786df7faa3e7 (commit)
       via  272e9b355b17ab663ac4a0d9515d381dcf6f03ec (commit)
       via  ff1974c6e9aa97a6b0cf5e2ce82da70fd70c510c (commit)
       via  2f71d1dc0084f7ee44afb9766e81847974820420 (commit)
       via  40fd8123a292ad16610367922dbdff66460bc676 (commit)
       via  37df0d4f4fb042f8fbb39525d8d338968dd912bb (commit)
       via  fc334b4e77553643bf9cdec47a4469ea7c62566b (commit)
       via  6a8b1c4f8433e95e713e3c6f152ba717c90d1dc9 (commit)
       via  38e5a4a54f1be3b678e5ab55b97f81be88824119 (commit)
       via  0458572a6e9db0030f305c25e951434a099ae754 (commit)
       via  c37710734694c5a64da924bbfbbcfc07496e241e (commit)
       via  a46183783504e01a505222c47d1f7fccfeec70e9 (commit)
       via  0e03c0849ddd799f60e6cf11084b8b62828cce89 (commit)
       via  d8d89d8d27794d493ed2aa9eba4649e6e3ff4a9d (commit)
       via  7f6d986ac93e3465db6a4ed5c3ac77b72d890e68 (commit)
       via  39fd8bc318d4a90aab704f892cd80c22f5c7345f (commit)
       via  20c4928ee155db7b43b9f5b440a2cb199f178bb4 (commit)
       via  a164c8405a0fb08cc7783d51796fbb76d0e4f493 (commit)
       via  541c2470b8ad8c1c0c925d2474da44384b5d7d66 (commit)
       via  3089c833ffa548d8965414d461bef023855dc34f (commit)
      from  d3d18a42d2a12f65c51dec34608921cec7b42068 (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 c5addd94e3a817504688e684bf62786df7faa3e7
Merge: 2f71d1d 272e9b3
Author: Dan McGee <dan at archlinux.org>
Date:   Tue Apr 5 00:48:36 2011 -0500

    Merge branch 'maint'
    
    Conflicts:
    	lib/libalpm/be_sync.c
    	lib/libalpm/db.c
    	src/pacman/util.c

commit 2f71d1dc0084f7ee44afb9766e81847974820420
Author: Xavier Chantry <chantry.xavier at gmail.com>
Date:   Sat Apr 2 23:19:53 2011 +0200

    pacman.c : useless extra parenthesis
    
    clang 3.0 git complained about these
    
    Signed-off-by: Xavier Chantry <chantry.xavier at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit a46183783504e01a505222c47d1f7fccfeec70e9
Author: Xavier Chantry <chantry.xavier at gmail.com>
Date:   Sat Apr 2 15:53:18 2011 +0200

    dload: dont forget to initialize open_mode
    
    That's a funny one, building with optimization levels (with both gcc and
    clang) caused open_mode to always be set to "ab", which worked.
    
    This was spotted both with clang-analyzer, and by Jakob who reported a
    segfault as he was using an un-optimized build.
    
    Signed-off-by: Xavier Chantry <chantry.xavier at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 0e03c0849ddd799f60e6cf11084b8b62828cce89
Author: Xavier Chantry <chantry.xavier at gmail.com>
Date:   Sat Apr 2 15:49:42 2011 +0200

    configure.ac: we use fabs now so -lm is needed
    
    Signed-off-by: Xavier Chantry <chantry.xavier at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 3089c833ffa548d8965414d461bef023855dc34f
Author: Dan McGee <dan at archlinux.org>
Date:   Wed Mar 30 20:20:16 2011 -0500

    Unify filelist operation functions in conflict checking
    
    We had two functions that were oh so similar but slightly different. We
    can combine them and add some conditional operation stuff to decide what
    to return.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

-----------------------------------------------------------------------

Summary of changes:
 configure.ac            |    3 ++
 lib/libalpm/be_local.c  |    2 +-
 lib/libalpm/be_sync.c   |   17 ++++++++--
 lib/libalpm/conflict.c  |   76 +++++++++++++++-------------------------------
 lib/libalpm/db.c        |    2 +-
 lib/libalpm/dload.c     |    3 +-
 lib/libalpm/package.c   |    9 +++++
 lib/libalpm/pkghash.c   |    3 +-
 lib/libalpm/util.c      |    1 +
 scripts/makepkg.sh.in   |   25 +++++++--------
 src/pacman/pacman.c     |    2 +-
 src/pacman/util.c       |   18 ++++++++---
 test/util/vercmptest.sh |    2 +-
 13 files changed, 83 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
The official pacman repository