[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-9-g30f53cf

[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, maint has been updated
       via  30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (commit)
       via  cae2bdafec93381284ba487010738d72d0992aab (commit)
       via  8e30a46adbe350a9741bbb9748334a4adc9742f6 (commit)
       via  9e8af82c97992ab15e4c182af84f06afd4885dc7 (commit)
      from  6ddc115c7f52d6d172ca3879f96cc782bb526313 (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 30f53cfe8d3f07bc9f350387b55ddf8579dd75e3
Author: Dan McGee <dan at archlinux.org>
Date:   Wed Jan 12 09:17:22 2011 -0600

    Fix double read issue in maint releases
    
    This is essentially a backport/cherry-pick of commit 33240e87b99e from
    master, but has to be done by hand because the DB format has diverged. Read
    more in the commit message used there, which follows.
    
    Due to the way we funk around with package data loading, we had a condition
    where the filelist got doubled up because it was loaded twice.
    
    Packages are originally loaded with INFRQ_BASE. In an upgrade/sync, the
    package is checked for file conflicts next, leaving us in an "INFRQ_BASE |
    INFRQ_FILES" state. Later, when committing a single package, we have an
    explicit call to _alpm_local_db_read() with INFRQ_ALL as the level. Because
    the package's level did not match this, we skipped over our previous "does
    the incoming level match where I'm at" shortcut, and continued to load
    things again, because of a lack of fine-grained checking for each of DESC,
    FILES, and INSTALL.
    
    The end result is we loaded the filelist twice, causing our remove logic to
    iterate twice over the installed files, spewing a bunch of "cannot find file
    X" messages.
    
    Fix the problem by doing a bit more bitmasking logic throughout the load
    method, and also fix the sanity check at the beginning of the function- this
    should *only* be used for local packages as opposed to the "not a package"
    check that was there before.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit cae2bdafec93381284ba487010738d72d0992aab
Author: Dan McGee <dan at archlinux.org>
Date:   Tue Jan 11 18:43:28 2011 -0600

    pactest: build the filelist using a set()
    
    This will prevent duplicates, which we had plenty of once I made a few tests
    that had a list of files greater than the normal two. The previous logic was
    not working quite right.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>
    (cherry picked from commit 0d4dd09993971924d379be4d0944d72f4c77b021)

commit 8e30a46adbe350a9741bbb9748334a4adc9742f6
Author: Dan McGee <dan at archlinux.org>
Date:   Tue Jan 11 23:16:52 2011 -0600

    Make debug config messages consistent in capitalization
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 9e8af82c97992ab15e4c182af84f06afd4885dc7
Author: Dan McGee <dan at archlinux.org>
Date:   Tue Jan 11 23:15:44 2011 -0600

    Back out anticipated epoch changes
    
    After all the debate as to what to do on maint, we are going to end up just
    incorporating epoch into the version string, so we don't need this separate
    field at all. Revert commit 5c8083baa4a and also kill the force flag we were
    recording here as well.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

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

Summary of changes:
 lib/libalpm/be_files.c |   22 ++++++++++------------
 src/pacman/pacman.c    |    4 ++--
 test/pacman/pmdb.py    |   10 ++++------
 3 files changed, 16 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
The official pacman repository