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 6f86f46c965d2268c533d9cedf873b922a598bb1 (commit) via 00c57ddae718e0794b2673378b070423a830ace3 (commit) via d53388fb90ee9594e07b8f00cc45436e6318c972 (commit) via e0e33c329ff249d7862a0e7ec508794faa98efd8 (commit) via a71f4c4c6a7775503b29ab856f8a5ce2801f2967 (commit) via a27d7f6071969623362785df50546cf48e8f1d2e (commit) from 1a0aaa20df29234250ecc0f9fc3f56bb8cf22ca1 (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 6f86f46c965d2268c533d9cedf873b922a598bb1 Author: Dan McGee <dan@archlinux.org> Date: Sun Jan 6 10:30:23 2008 -0600 Remove makeworld from pacman package This is an Arch-specific tool (although others could find use in it), so off to the standalone ABS package it goes. Signed-off-by: Dan McGee <dan@archlinux.org> commit 00c57ddae718e0794b2673378b070423a830ace3 Author: Dan McGee <dan@archlinux.org> Date: Sun Jan 6 10:26:21 2008 -0600 Remove stuff that was a little too Arch-specific from manpage footer Signed-off-by: Dan McGee <dan@archlinux.org> commit d53388fb90ee9594e07b8f00cc45436e6318c972 Author: Dan McGee <dan@archlinux.org> Date: Sun Jan 6 10:23:49 2008 -0600 install: install prototype PKGBUILD and install to datadir Move the prototypes out of contrib/ and into the top level directory, and install them to what is usually /usr/share/pacman/ on a package install. Signed-off-by: Dan McGee <dan@archlinux.org> commit e0e33c329ff249d7862a0e7ec508794faa98efd8 Author: Dan McGee <dan@archlinux.org> Date: Sat Jan 5 22:00:21 2008 -0600 Remove hardcoded DBEXT value from script Signed-off-by: Dan McGee <dan@archlinux.org> commit a71f4c4c6a7775503b29ab856f8a5ce2801f2967 Author: Chantry Xavier <shiningxc@gmail.com> Date: Sun Jan 6 10:59:41 2008 +0100 conflict.c : fix for FS#8156, detect conflict between symlink and dir. The previous fileconflict check (package vs filesystem) skipped the conflict when the file on the filesystem was a directory or a symlink to a directory, no matter what the file in the package was. Now, the conflict will only be skipped if the file in the package is a directory (so compatible with a dir or a dir symlink on the filesystem). So in the case of 8156 (new fileconflict003 pactest for this case), instead of silently ignoring the extraction of the test symlink, pacman will now fail because of a file conflict between the test symlink in the pkg2 package and the test directory on the filesystem. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> commit a27d7f6071969623362785df50546cf48e8f1d2e Author: Chantry Xavier <shiningxc@gmail.com> Date: Sun Jan 6 10:33:17 2008 +0100 bugfix in pactest when creating a symlink at the top level. Trying to make a symlink at the top level previously made pactest fail. For example : "test -> test2/" as a file in a package. The path to the test symlink was empty in this case, but the python code still tried to chdir in "", which failed. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 + contrib/PKGBUILD.proto => PKGBUILD.proto | 0 contrib/Makefile.am | 2 - contrib/README | 3 - doc/footer.txt | 7 +- doc/makepkg.8.txt | 3 - lib/libalpm/conflict.c | 17 ++- pactest/tests/fileconflict003.py | 18 +++ pactest/util.py | 3 +- contrib/proto.install => proto.install | 0 scripts/.gitignore | 1 - scripts/Makefile.am | 4 +- scripts/makeworld.sh.in | 192 ------------------------------ scripts/rankmirrors.py.in | 6 +- 14 files changed, 43 insertions(+), 217 deletions(-) rename contrib/PKGBUILD.proto => PKGBUILD.proto (100%) create mode 100644 pactest/tests/fileconflict003.py rename contrib/proto.install => proto.install (100%) delete mode 100644 scripts/makeworld.sh.in hooks/post-receive -- The official pacman repository