[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-314-ge41ca0f

[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  e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (commit)
       via  392fffe24126c1d0404ead75c1743411fe65310a (commit)
       via  e0daaea38cf7b06bdf9534d793f7fb64cc59cbf6 (commit)
       via  5c1ba2d5fd5263525a0355cdce900b58dc41c916 (commit)
       via  d7c3164fd5824f1e300d2c7ee92f5c2446461c03 (commit)
       via  ea3439f928a72bd942a810651565cb01e99b5293 (commit)
       via  44e9fdd0e848382337edb97d41e7317638a67bac (commit)
       via  717fdb8ee0fd23cf72fc7d2832317f513caefa2c (commit)
       via  d6f31dc78852939f7f83648529887caca2ac9294 (commit)
      from  0c62b36c19d67939d7a84159c86a5de73fd9d36f (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 e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8
Merge: 392fffe 5c1ba2d
Author: Dan McGee <dan at archlinux.org>
Date:   Tue Jul 10 08:41:18 2012 -0500

    Merge branch 'maint'
    
    Conflicts:
    	etc/makepkg.conf.in

commit 392fffe24126c1d0404ead75c1743411fe65310a
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Tue Jul 3 23:53:24 2012 -0400

    pacman: be more descriptive when opening an include fails
    
    if fopen returns NULL, append the libc strerror-ized error message to
    our own error message.
    
    Signed-off-by: Dave Reisner <dreisner at archlinux.org>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit e0daaea38cf7b06bdf9534d793f7fb64cc59cbf6
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Mon Jul 2 23:42:30 2012 -0400

    update comments referring to alpm_option_get_syncdbs
    
    This function was renamed alpm_get_syncdbs as part of b488f229d.
    
    Signed-off-by: Dave Reisner <dreisner at archlinux.org>

commit ea3439f928a72bd942a810651565cb01e99b5293
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sun Jun 10 21:44:19 2012 -0400

    diskspace: log errors when opening the mount table fails
    
    Signed-off-by: Dave Reisner <dreisner at archlinux.org>
    Signed-off-by: Dan McGee <dan at archlinux.org>

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

Summary of changes:
 doc/.gitignore                       |    1 +
 doc/Makefile.am                      |    4 +++
 doc/pactree.8.txt                    |   62 ++++++++++++++++++++++++++++++++++
 etc/makepkg.conf.in                  |    6 ++--
 lib/libalpm/be_sync.c                |    2 +-
 lib/libalpm/conflict.c               |   37 ++++++++++++++++----
 lib/libalpm/db.c                     |    2 +-
 lib/libalpm/diskspace.c              |    6 ++++
 src/pacman/conf.c                    |    3 +-
 test/pacman/tests/fileconflict009.py |   20 +++++++++++
 test/pacman/tests/fileconflict010.py |   20 +++++++++++
 test/pacman/tests/fileconflict012.py |   17 ++++++++++
 12 files changed, 168 insertions(+), 12 deletions(-)
 create mode 100644 doc/pactree.8.txt
 create mode 100644 test/pacman/tests/fileconflict009.py
 create mode 100644 test/pacman/tests/fileconflict010.py
 create mode 100644 test/pacman/tests/fileconflict012.py


hooks/post-receive
-- 
The official pacman repository