[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-210-g344ced2

[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  344ced22c347b347b55818bb93579ffa2eb9c70b (commit)
       via  60b6cde637338657e72312aef1ff1d04314df745 (commit)
       via  5d15bb68f7b6b3e25be286ddf7a615553a173b8f (commit)
       via  45f90de0eb9c33eee0deb63bae9aabe5988b8733 (commit)
       via  bfd6817112b34b552e9139bdc582d048bcba38b9 (commit)
       via  a3ecbec6b584b3595c041850e4c8bf242f7ce74a (commit)
      from  8ebc07744ac58ed1e42af3a52d998587fca85f8b (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 344ced22c347b347b55818bb93579ffa2eb9c70b
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Mon Jul 20 17:23:19 2009 +0200

    Fix one bug with .paccheck leftover file
    
    This happens for example if you install a new package, and one of its
    backup config file is already on the file system.
    
    If the local file was different, it was saved to .pacorig which is fine.
    
    However if the local file and pkg file were the same, the pkg file
    (temporarily extracted as .paccheck) was left on the system.
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 60b6cde637338657e72312aef1ff1d04314df745
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Mon Jul 20 14:52:16 2009 +0200

    Fix 2 minor memleaks
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 5d15bb68f7b6b3e25be286ddf7a615553a173b8f
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Sun Jul 19 19:49:59 2009 +0200

    Do not create .pacsave with -R, if the file is unchanged
    
    This fixes FS#15546
    
    Also fix the interface of unlink_file which was really stupid..
    (alpm_list_t used with only one element)
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 45f90de0eb9c33eee0deb63bae9aabe5988b8733
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Sun Jul 19 16:54:12 2009 +0200

    Fix klibc conflict case.
    
    A package can now replace symdir->dir by dir without fileconflicts.
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit bfd6817112b34b552e9139bdc582d048bcba38b9
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Fri Jul 17 15:48:57 2009 +0200

    Fix fileconflict004
    
    When one package wants to replace a directory by a file, we check that all
    files in that directory were owned by that package.
    
    Additionally pacman can be more verbose when the extraction of the symlink
    (or file) fails. The patch to add.c looks more complex than it is, I just
    moved and reindented code to handle cases 10 and 11 together.
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit a3ecbec6b584b3595c041850e4c8bf242f7ce74a
Author: Xavier Chantry <shiningxc at gmail.com>
Date:   Fri Jul 17 19:33:13 2009 +0200

    pactest : safety check with MODE
    
    check that the file exists first, otherwise pactest just breaks.
    
    Signed-off-by: Xavier Chantry <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

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

Summary of changes:
 lib/libalpm/add.c                                  |   55 ++++++++--------
 lib/libalpm/conflict.c                             |   70 ++++++++++++++++++++
 lib/libalpm/handle.c                               |    1 +
 lib/libalpm/remove.c                               |   47 +++++++------
 lib/libalpm/sync.c                                 |    1 +
 pactest/pmrule.py                                  |    7 ++-
 pactest/tests/fileconflict004.py                   |    2 -
 pactest/tests/fileconflict005.py                   |    1 -
 .../{fileconflict005.py => fileconflict006.py}     |    7 +-
 pactest/tests/fileconflict007.py                   |   17 +++++
 pactest/tests/remove010.py                         |    4 +-
 11 files changed, 152 insertions(+), 60 deletions(-)
 copy pactest/tests/{fileconflict005.py => fileconflict006.py} (81%)
 create mode 100644 pactest/tests/fileconflict007.py


hooks/post-receive
--
The official pacman repository