[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.1-35-g1fc83f4

[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  1fc83f4af6d827bf2e69c7a10e3d2010c9211974 (commit)
       via  9fbb77c91ba411fa46b1f2955893e7a39291f46a (commit)
       via  9bfbd739176ebc41e4ec93dcd21264b87640aa5b (commit)
       via  ea828b5693d389d24c744841385b16cb37a32fce (commit)
       via  f432ce41e0892b17d062d8d64ac221e7bc4d718c (commit)
       via  0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818 (commit)
       via  f950c2630798e03bbee314c4a3f2749d1293a2b3 (commit)
       via  11692e0eef79e016859bb182917e56a12a14f734 (commit)
      from  88cbee3c24768470cc0d4abe050e98b989807a67 (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 1fc83f4af6d827bf2e69c7a10e3d2010c9211974
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date:   Sun Jan 27 12:24:50 2008 +0100

    pmsyncpkg_t cleanup
    
    Fix for sync044.py and reason001.py.
    Rename sync->data to sync->removes (alpm_list_t *)
    Replace pmsynctype_t sync->type by pmpkgreason_t sync->newreason
    
    The type field was set to UPGRADE or DEPEND or REPLACE.
    Instead of using type = UPGRADE or DEPEND, we now rather use a
    "pmpkgreason_t newreason" field directly (= explicit or depend) which allows
    a better handling of the install reason.
    And the REPLACE type is now deduced implicitly when the sync->removes list
    is not empty.
    
    Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 9fbb77c91ba411fa46b1f2955893e7a39291f46a
Merge: 9bfbd739176ebc41e4ec93dcd21264b87640aa5b 0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818
Author: Dan McGee <dan at archlinux.org>
Date:   Sun Jan 27 11:54:52 2008 -0600

    Merge branch 'maint'

commit 9bfbd739176ebc41e4ec93dcd21264b87640aa5b
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date:   Fri Jan 25 21:52:35 2008 +0100

    Fix PM_ERR_CONFLICTING_DEPS handling in sync.c
    
    * eliminate asymmetry (innerconflict vs. outerconflict)
    * fix a memleak (in case of PM_ERR_MEMORY deps wasn't freed)
    * fix wrong pmconflict_t duplication (*retconflict = *conflict)
    
    Note: the new code introduces some code duplication which shall disappear by
    fixing FS#7524.
    
    Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit ea828b5693d389d24c744841385b16cb37a32fce
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date:   Fri Jan 25 21:31:20 2008 +0100

    New _alpm_conflict_dup function
    
    Added function to cleanly duplicate a conflict.
    
    Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit f432ce41e0892b17d062d8d64ac221e7bc4d718c
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date:   Mon Jan 14 14:29:41 2008 +0100

    small sync.c code clean-up
    
    Remove unnecessary synclist_free function, and use our standard way
    (alpm_list_free_inner + alpm_list_free) instead.
    This slightly reduces code duplication.
    
    Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu>
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

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

Summary of changes:
 doc/makepkg.8.txt      |    2 +-
 lib/libalpm/alpm.h     |   11 +---
 lib/libalpm/conflict.c |   11 ++++
 lib/libalpm/conflict.h |    1 +
 lib/libalpm/sync.c     |  147 +++++++++++++++++++----------------------------
 lib/libalpm/sync.h     |    6 +-
 scripts/makepkg.sh.in  |    2 +-
 src/pacman/sync.c      |    9 +--
 src/pacman/util.c      |   25 ++++-----
 9 files changed, 93 insertions(+), 121 deletions(-)


hooks/post-receive
--
The official pacman repository