[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-603-g2aa7e69

Dan McGee dan at archlinux.org
Sun Nov 18 13:46:43 EST 2007

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  2aa7e69da91c1d7a18473cf05df98c92bd1dc747 (commit)
       via  65fb99133df10143e07c237f04777e01b443c037 (commit)
       via  829a7b904dcb56aa17cd9279f29385dad2814793 (commit)
       via  5f0c241987f31b2cbf1c6ba2146dcca065973b0d (commit)
       via  b118ce55bd01c7ebd42b5b6d4a0f34aa925701d8 (commit)
       via  55a7455135e2d8f2e118928f634dc7976ab6c8b4 (commit)
       via  8f824e70bbaf9cb2b72103fe378d93e3ded8cdee (commit)
       via  e174865bdc154248b8b8fcf03eaa19da78e0f67b (commit)
      from  e28973169d2e5eda8b64ebdda11ece0dc761d978 (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 2aa7e69da91c1d7a18473cf05df98c92bd1dc747
Author: Nagy Gabor <ngaba at bibl.u-szeged.hu>
Date:   Sun Nov 18 14:25:43 2007 +0100

    Add the pmconflict_t type.
    pmdepmissing_t was used for two totally different things :
    missing dependencies, and dependency conflicts.
    So this patch simply adds a type for dep conflicts,
    and convert the code to use it.
    This fix the TODO in conflict.c :
    /* TODO WTF is a 'depmissing' doing indicating a conflict? */
    Additionally, the code in conflict.c now eliminates the duplicated conflicts.
    If pkg1 conflicts with pkg2, and pkg2 conflicts with pkg1, only one of them will be stored.
    However the conflict handling in sync_prepare (sync.c) is still very asymetrical, and very ugly too.
    This should be improved in the future (there is already a pending patch from Nagy that cleans it a lot).
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit 65fb99133df10143e07c237f04777e01b443c037
Author: Chantry Xavier <shiningxc at gmail.com>
Date:   Sun Nov 18 10:29:55 2007 +0100

    Simple s/conflict/fileconflict/ renaming.
    The names related to conflicts are misleading :
    For dependencies conflicts, the type is pmdepmissing,
    and the function names contain just "conflict".
    For file conflicts, the type is pmconflict,
    and some functions contained just "conflict", some others "fileconflict".
    So this is the first step for improving the situation.
    Original idea/patch from Nagy, but the patch already didn't apply anymore,
    so I did it again.
    The main difference is that I kept the conflictype, with the following renaming :
    pmconflicttype_t -> pmfileconflicttype_t
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit 829a7b904dcb56aa17cd9279f29385dad2814793
Author: Chantry Xavier <shiningxc at gmail.com>
Date:   Sat Nov 17 23:35:22 2007 +0100

    Minor rephrasing of the question asked by -Sc.
    Suggested by stonecrest on irc :
    'I think "uninstalled" would be better, as it implies that the package was once
    installed and since removed. Otherwise a user might wonder why there are
    non-installed pkgs in cache'
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit 5f0c241987f31b2cbf1c6ba2146dcca065973b0d
Author: Dan McGee <dan at archlinux.org>
Date:   Sun Nov 18 11:23:10 2007 -0600

    POSIX shell does not specify meaning of source operation
    Just use '.' operator instead. Oops.
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit b118ce55bd01c7ebd42b5b6d4a0f34aa925701d8
Author: Chantry Xavier <shiningxc at gmail.com>
Date:   Sat Nov 17 22:52:03 2007 +0100

    Extend the -Sc operation to also clean up unused sync databases.
    We discussed this with stonecrest on IRC :
    20:46   stonecrest >> someone brings up a good point.. why aren't repos that aren't in the pacman.conf removed from /var/lib/pacman?
    20:46   stonecrest >> i have 118mb and 24 dirs in there, but only 5 repos at present
    21:26   stonecrest >> shining: i guess you could prompt the user on deleting every dir in /var/lib/pacman.. since it shouldn't happen that often except for
                          the first time
    21:30   stonecrest >> could be part of pacman -Sc.. what else were you thinking?
    I already heard about this before, but it sounded dangerous to me. I didn't even think about a simple prompt.
    I also didn't know where this code would fit. And it fits well with -Sc, I borrowed most of the code from sync_cleancache.
    Example session :
    Cache directory: /var/cache/pacman/pkg/
    Do you want to remove non-installed packages from cache? [Y/n] n
    Database directory: /var/lib/pacman/
    Do you want to remove unused repositories? [Y/n]
    Do you want to remove /var/lib/pacman/sync/pacman-git? [Y/n]
    Do you want to remove /var/lib/pacman/sync/deltatest? [Y/n]
    Database directory cleaned up
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 55a7455135e2d8f2e118928f634dc7976ab6c8b4
Author: Nagy Gabor <ngaba at petra.hos.u-szeged.hu>
Date:   Sun Aug 12 23:41:30 2007 +0200

    libalpm/deps.c : improves IgnorePkg handling in resolvedeps.
    resolvedeps will now search for other satisfiers
    when we don't let it add a package from IgnorePkg.
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit 8f824e70bbaf9cb2b72103fe378d93e3ded8cdee
Author: Chantry Xavier <shiningxc at gmail.com>
Date:   Fri Nov 16 15:34:04 2007 +0100

    Remove the IgnorePkg handling from alpm_pkg_compare_version.
    And check the IgnorePkg handling is done correctly in the other places.
    For example, -Qu and -Su will automatically skip the ignored packages (-Su will print a warning),
    but -S will install ignored packages anyway, because it was asked explicitly.
    Signed-off-by: Chantry Xavier <shiningxc at gmail.com>

commit e174865bdc154248b8b8fcf03eaa19da78e0f67b
Author: Dan McGee <dan at archlinux.org>
Date:   Sat Nov 17 12:56:31 2007 -0600

    Don't filter package files output based on dir/file status
    This caused more problems than it solved, especially with -Qlp output
    and files that are new to the new package.
    Signed-off-by: Dan McGee <dan at archlinux.org>


Summary of changes:
 lib/libalpm/add.c      |    6 +-
 lib/libalpm/alpm.h     |   26 ++++++-------
 lib/libalpm/conflict.c |   92 +++++++++++++++++++++++++++++++++++---------
 lib/libalpm/conflict.h |   11 ++++-
 lib/libalpm/db.c       |    6 ++-
 lib/libalpm/deps.c     |   81 +++++++++++++++------------------------
 lib/libalpm/deps.h     |    6 +--
 lib/libalpm/package.c  |   10 -----
 lib/libalpm/remove.c   |    2 +-
 lib/libalpm/sync.c     |   99 ++++++++++++++++++++++-------------------------
 lib/libalpm/trans.c    |    4 +-
 src/pacman/add.c       |   23 +++++------
 src/pacman/package.c   |   12 +-----
 src/pacman/sync.c      |   99 +++++++++++++++++++++++++++++++++++++++++-------
 14 files changed, 282 insertions(+), 195 deletions(-)

The official pacman repository

More information about the pacman-dev mailing list