[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-248-g665528d

[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  665528d7bac99228849d1162f78c0817bc619eee (commit)
       via  5615b716887960260016646c2d0f812806abe2ec (commit)
       via  30f53cfe8d3f07bc9f350387b55ddf8579dd75e3 (commit)
       via  cae2bdafec93381284ba487010738d72d0992aab (commit)
       via  8e30a46adbe350a9741bbb9748334a4adc9742f6 (commit)
       via  9e8af82c97992ab15e4c182af84f06afd4885dc7 (commit)
      from  dd265921559b187cba59e83bfdbfda11bcec2f1e (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 665528d7bac99228849d1162f78c0817bc619eee
Author: Dan McGee <dan at archlinux.org>
Date:   Thu Jan 13 09:33:01 2011 -0600

    repo-add: fix misguided conditional correction
    
    I tried to move things around here when testing and did a bit too much; the
    warning message always showed regardless of delta inclusion in the call. Fix
    it so we only warn if we have a filename, but the file couldn't be located.
    
    Signed-off-by: Dan McGee <dan at archlinux.org>

commit 5615b716887960260016646c2d0f812806abe2ec
Merge: dd26592 30f53cf
Author: Dan McGee <dan at archlinux.org>
Date:   Wed Jan 12 09:23:24 2011 -0600

    Merge branch 'maint'
    
    Conflicts:
    	lib/libalpm/be_files.c

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

Summary of changes:
 scripts/repo-add.sh.in |   14 ++++++++------
 src/pacman/pacman.c    |    4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The official pacman repository