- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-203-g0ac96d9
by dan＠archlinux.org 02 Jun '10

02 Jun '10

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 0ac96d94ec3a8a2f3a3857810dbd9109c5cd3235 (commit) via 844d82fad811626b0b8e54db60ee4b3ea32a3cb9 (commit) via ccea1b55766200c1ab371cf0f3b38c4cebdb2063 (commit) via 2710b256cc260db6a0805c83fb3fcf9e32aa3d86 (commit) from 5dffef787df72cc407708242d14f07496bb37791 (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 0ac96d94ec3a8a2f3a3857810dbd9109c5cd3235 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 2 13:24:22 2010 -0500 Move vercmp tests into util/ testing directory Now that not everything is in 'pactest/', we can separate out the parts a bit more and leave the pacman/ directory to be just pactest. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 844d82fad811626b0b8e54db60ee4b3ea32a3cb9 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 30 14:41:59 2010 +1000 Move pacman test suite Move the test suite to test/pacman in order to make a logical location for a future makepkg test suite. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccea1b55766200c1ab371cf0f3b38c4cebdb2063 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 30 10:18:00 2010 +1000 Fix typo in pactest Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2710b256cc260db6a0805c83fb3fcf9e32aa3d86 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 29 11:17:10 2010 +1000 Remove unnecessary error catching from PKGBUILD protos The use of "|| return 1" is no longer necessary in PKGBUILDs. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 10 +++++----- PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- autoclean.sh | 4 ++-- configure.ac | 4 ++-- {pactest => test/pacman}/.gitignore | 0 {pactest => test/pacman}/ChangeLog | 0 {pactest => test/pacman}/Makefile.am | 3 +-- {pactest => test/pacman}/README | 0 {pactest => test/pacman}/TODO | 0 {pactest => test/pacman}/pactest.py | 0 {pactest => test/pacman}/pmdb.py | 0 {pactest => test/pacman}/pmenv.py | 0 {pactest => test/pacman}/pmfile.py | 0 {pactest => test/pacman}/pmpkg.py | 0 {pactest => test/pacman}/pmrule.py | 0 {pactest => test/pacman}/pmtest.py | 0 {pactest => test/pacman}/tests/.gitignore | 0 {pactest => test/pacman}/tests/Makefile.am | 0 {pactest => test/pacman}/tests/config001.py | 0 {pactest => test/pacman}/tests/config002.py | 0 {pactest => test/pacman}/tests/database001.py | 0 {pactest => test/pacman}/tests/database002.py | 0 {pactest => test/pacman}/tests/database010.py | 0 {pactest => test/pacman}/tests/database011.py | 0 {pactest => test/pacman}/tests/database012.py | 0 {pactest => test/pacman}/tests/depconflict100.py | 0 {pactest => test/pacman}/tests/depconflict110.py | 0 {pactest => test/pacman}/tests/depconflict111.py | 0 {pactest => test/pacman}/tests/depconflict120.py | 0 {pactest => test/pacman}/tests/deptest001.py | 0 {pactest => test/pacman}/tests/dummy001.py | 0 {pactest => test/pacman}/tests/fileconflict001.py | 0 {pactest => test/pacman}/tests/fileconflict002.py | 0 {pactest => test/pacman}/tests/fileconflict003.py | 0 {pactest => test/pacman}/tests/fileconflict004.py | 0 {pactest => test/pacman}/tests/fileconflict005.py | 0 {pactest => test/pacman}/tests/fileconflict006.py | 0 {pactest => test/pacman}/tests/fileconflict007.py | 0 {pactest => test/pacman}/tests/ignore001.py | 0 {pactest => test/pacman}/tests/ignore002.py | 0 {pactest => test/pacman}/tests/ignore003.py | 0 {pactest => test/pacman}/tests/ignore004.py | 0 {pactest => test/pacman}/tests/ignore005.py | 0 {pactest => test/pacman}/tests/ldconfig001.py | 0 {pactest => test/pacman}/tests/ldconfig002.py | 0 {pactest => test/pacman}/tests/ldconfig003.py | 0 {pactest => test/pacman}/tests/mode001.py | 0 {pactest => test/pacman}/tests/mode002.py | 0 {pactest => test/pacman}/tests/mode003.py | 0 {pactest => test/pacman}/tests/pacman001.py | 0 {pactest => test/pacman}/tests/pacman002.py | 0 {pactest => test/pacman}/tests/pacman003.py | 0 {pactest => test/pacman}/tests/pacman004.py | 0 {pactest => test/pacman}/tests/provision001.py | 0 {pactest => test/pacman}/tests/provision010.py | 0 {pactest => test/pacman}/tests/provision011.py | 0 {pactest => test/pacman}/tests/provision012.py | 0 {pactest => test/pacman}/tests/provision020.py | 0 {pactest => test/pacman}/tests/provision021.py | 0 {pactest => test/pacman}/tests/provision022.py | 0 {pactest => test/pacman}/tests/query001.py | 0 {pactest => test/pacman}/tests/query002.py | 0 {pactest => test/pacman}/tests/query003.py | 0 {pactest => test/pacman}/tests/query004.py | 0 {pactest => test/pacman}/tests/query005.py | 0 {pactest => test/pacman}/tests/reason001.py | 0 {pactest => test/pacman}/tests/remove001.py | 2 +- {pactest => test/pacman}/tests/remove010.py | 0 {pactest => test/pacman}/tests/remove011.py | 0 {pactest => test/pacman}/tests/remove020.py | 0 {pactest => test/pacman}/tests/remove021.py | 0 {pactest => test/pacman}/tests/remove030.py | 0 {pactest => test/pacman}/tests/remove040.py | 0 {pactest => test/pacman}/tests/remove041.py | 0 {pactest => test/pacman}/tests/remove042.py | 0 {pactest => test/pacman}/tests/remove043.py | 0 {pactest => test/pacman}/tests/remove044.py | 0 {pactest => test/pacman}/tests/remove045.py | 0 {pactest => test/pacman}/tests/remove047.py | 0 {pactest => test/pacman}/tests/remove049.py | 0 {pactest => test/pacman}/tests/remove050.py | 0 {pactest => test/pacman}/tests/remove051.py | 0 {pactest => test/pacman}/tests/remove052.py | 0 {pactest => test/pacman}/tests/remove060.py | 0 {pactest => test/pacman}/tests/scriptlet001.py | 0 {pactest => test/pacman}/tests/scriptlet002.py | 0 {pactest => test/pacman}/tests/smoke001.py | 0 {pactest => test/pacman}/tests/symlink001.py | 0 {pactest => test/pacman}/tests/sync001.py | 0 {pactest => test/pacman}/tests/sync002.py | 0 {pactest => test/pacman}/tests/sync003.py | 0 {pactest => test/pacman}/tests/sync009.py | 0 {pactest => test/pacman}/tests/sync010.py | 0 {pactest => test/pacman}/tests/sync011.py | 0 {pactest => test/pacman}/tests/sync012.py | 0 {pactest => test/pacman}/tests/sync020.py | 0 {pactest => test/pacman}/tests/sync021.py | 0 {pactest => test/pacman}/tests/sync030.py | 0 {pactest => test/pacman}/tests/sync031.py | 0 {pactest => test/pacman}/tests/sync040.py | 0 {pactest => test/pacman}/tests/sync041.py | 0 {pactest => test/pacman}/tests/sync042.py | 0 {pactest => test/pacman}/tests/sync043.py | 0 {pactest => test/pacman}/tests/sync044.py | 0 {pactest => test/pacman}/tests/sync045.py | 0 {pactest => test/pacman}/tests/sync050.py | 0 {pactest => test/pacman}/tests/sync100.py | 0 {pactest => test/pacman}/tests/sync1000.py | 0 {pactest => test/pacman}/tests/sync1003.py | 0 {pactest => test/pacman}/tests/sync1004.py | 0 {pactest => test/pacman}/tests/sync1008.py | 0 {pactest => test/pacman}/tests/sync101.py | 0 {pactest => test/pacman}/tests/sync102.py | 0 {pactest => test/pacman}/tests/sync103.py | 0 {pactest => test/pacman}/tests/sync104.py | 0 {pactest => test/pacman}/tests/sync110.py | 0 {pactest => test/pacman}/tests/sync1100.py | 0 {pactest => test/pacman}/tests/sync1101.py | 0 {pactest => test/pacman}/tests/sync1102.py | 0 {pactest => test/pacman}/tests/sync1103.py | 0 {pactest => test/pacman}/tests/sync120.py | 0 {pactest => test/pacman}/tests/sync130.py | 0 {pactest => test/pacman}/tests/sync131.py | 0 {pactest => test/pacman}/tests/sync132.py | 0 {pactest => test/pacman}/tests/sync133.py | 0 {pactest => test/pacman}/tests/sync134.py | 0 {pactest => test/pacman}/tests/sync135.py | 0 {pactest => test/pacman}/tests/sync136.py | 0 {pactest => test/pacman}/tests/sync137.py | 0 {pactest => test/pacman}/tests/sync138.py | 0 {pactest => test/pacman}/tests/sync150.py | 0 {pactest => test/pacman}/tests/sync200.py.in | 0 {pactest => test/pacman}/tests/sync300.py | 0 {pactest => test/pacman}/tests/sync301.py | 0 {pactest => test/pacman}/tests/sync400.py | 0 {pactest => test/pacman}/tests/sync401.py | 0 {pactest => test/pacman}/tests/sync402.py | 0 {pactest => test/pacman}/tests/sync403.py | 0 {pactest => test/pacman}/tests/sync404.py | 0 {pactest => test/pacman}/tests/sync405.py | 0 {pactest => test/pacman}/tests/sync406.py | 0 {pactest => test/pacman}/tests/sync500.py | 0 {pactest => test/pacman}/tests/sync501.py | 0 {pactest => test/pacman}/tests/sync890.py | 0 {pactest => test/pacman}/tests/sync891.py | 0 {pactest => test/pacman}/tests/sync892.py | 0 {pactest => test/pacman}/tests/sync893.py | 0 {pactest => test/pacman}/tests/sync895.py | 0 {pactest => test/pacman}/tests/sync896.py | 0 {pactest => test/pacman}/tests/sync897.py | 0 {pactest => test/pacman}/tests/sync898.py | 0 {pactest => test/pacman}/tests/sync899.py | 0 {pactest => test/pacman}/tests/sync900.py | 0 {pactest => test/pacman}/tests/sync901.py | 0 {pactest => test/pacman}/tests/sync990.py | 0 {pactest => test/pacman}/tests/sync992.py | 0 {pactest => test/pacman}/tests/sync993.py | 0 {pactest => test/pacman}/tests/sync999.py | 0 {pactest => test/pacman}/tests/trans001.py | 0 {pactest => test/pacman}/tests/type001.py | 0 {pactest => test/pacman}/tests/unresolvable001.py | 0 {pactest => test/pacman}/tests/upgrade001.py | 0 {pactest => test/pacman}/tests/upgrade002.py | 0 {pactest => test/pacman}/tests/upgrade003.py | 0 {pactest => test/pacman}/tests/upgrade004.py | 0 {pactest => test/pacman}/tests/upgrade005.py | 0 {pactest => test/pacman}/tests/upgrade010.py | 0 {pactest => test/pacman}/tests/upgrade011.py | 0 {pactest => test/pacman}/tests/upgrade012.py | 0 {pactest => test/pacman}/tests/upgrade013.py | 0 {pactest => test/pacman}/tests/upgrade014.py | 0 {pactest => test/pacman}/tests/upgrade015.py | 0 {pactest => test/pacman}/tests/upgrade016.py | 0 {pactest => test/pacman}/tests/upgrade020.py | 0 {pactest => test/pacman}/tests/upgrade021.py | 0 {pactest => test/pacman}/tests/upgrade022.py | 0 {pactest => test/pacman}/tests/upgrade023.py | 0 {pactest => test/pacman}/tests/upgrade024.py | 0 {pactest => test/pacman}/tests/upgrade025.py | 0 {pactest => test/pacman}/tests/upgrade026.py | 0 {pactest => test/pacman}/tests/upgrade030.py | 0 {pactest => test/pacman}/tests/upgrade031.py | 0 {pactest => test/pacman}/tests/upgrade032.py | 0 {pactest => test/pacman}/tests/upgrade040.py | 0 {pactest => test/pacman}/tests/upgrade041.py | 0 {pactest => test/pacman}/tests/upgrade042.py | 0 {pactest => test/pacman}/tests/upgrade043.py | 0 {pactest => test/pacman}/tests/upgrade045.py | 0 {pactest => test/pacman}/tests/upgrade046.py | 0 {pactest => test/pacman}/tests/upgrade050.py | 0 {pactest => test/pacman}/tests/upgrade051.py | 0 {pactest => test/pacman}/tests/upgrade052.py | 0 {pactest => test/pacman}/tests/upgrade053.py | 0 {pactest => test/pacman}/tests/upgrade054.py | 0 {pactest => test/pacman}/tests/upgrade055.py | 0 {pactest => test/pacman}/tests/upgrade056.py | 0 {pactest => test/pacman}/tests/upgrade057.py | 0 {pactest => test/pacman}/tests/upgrade058.py | 0 {pactest => test/pacman}/tests/upgrade059.py | 0 {pactest => test/pacman}/tests/upgrade060.py | 0 {pactest => test/pacman}/tests/upgrade061.py | 0 {pactest => test/pacman}/tests/upgrade070.py | 0 {pactest => test/pacman}/tests/upgrade071.py | 0 {pactest => test/pacman}/tests/upgrade072.py | 0 {pactest => test/pacman}/tests/upgrade073.py | 0 {pactest => test/pacman}/tests/upgrade074.py | 0 {pactest => test/pacman}/tests/upgrade075.py | 0 {pactest => test/pacman}/tests/upgrade076.py | 0 {pactest => test/pacman}/tests/upgrade080.py | 0 {pactest => test/pacman}/tests/upgrade081.py | 0 {pactest => test/pacman}/tests/upgrade082.py | 0 {pactest => test/pacman}/tests/upgrade083.py | 0 {pactest => test/pacman}/tests/upgrade084.py | 0 {pactest => test/pacman}/tests/upgrade090.py | 0 {pactest => test/pacman}/tests/xfercommand001.py | 0 {pactest => test/pacman}/util.py | 0 test/util/Makefile.am | 9 +++++++++ {pactest => test/util}/vercmptest.sh | 0 219 files changed, 22 insertions(+), 14 deletions(-) rename {pactest => test/pacman}/.gitignore (100%) rename {pactest => test/pacman}/ChangeLog (100%) rename {pactest => test/pacman}/Makefile.am (90%) rename {pactest => test/pacman}/README (100%) rename {pactest => test/pacman}/TODO (100%) rename {pactest => test/pacman}/pactest.py (100%) rename {pactest => test/pacman}/pmdb.py (100%) rename {pactest => test/pacman}/pmenv.py (100%) rename {pactest => test/pacman}/pmfile.py (100%) rename {pactest => test/pacman}/pmpkg.py (100%) rename {pactest => test/pacman}/pmrule.py (100%) rename {pactest => test/pacman}/pmtest.py (100%) rename {pactest => test/pacman}/tests/.gitignore (100%) rename {pactest => test/pacman}/tests/Makefile.am (100%) rename {pactest => test/pacman}/tests/config001.py (100%) rename {pactest => test/pacman}/tests/config002.py (100%) rename {pactest => test/pacman}/tests/database001.py (100%) rename {pactest => test/pacman}/tests/database002.py (100%) rename {pactest => test/pacman}/tests/database010.py (100%) rename {pactest => test/pacman}/tests/database011.py (100%) rename {pactest => test/pacman}/tests/database012.py (100%) rename {pactest => test/pacman}/tests/depconflict100.py (100%) rename {pactest => test/pacman}/tests/depconflict110.py (100%) rename {pactest => test/pacman}/tests/depconflict111.py (100%) rename {pactest => test/pacman}/tests/depconflict120.py (100%) rename {pactest => test/pacman}/tests/deptest001.py (100%) rename {pactest => test/pacman}/tests/dummy001.py (100%) rename {pactest => test/pacman}/tests/fileconflict001.py (100%) rename {pactest => test/pacman}/tests/fileconflict002.py (100%) rename {pactest => test/pacman}/tests/fileconflict003.py (100%) rename {pactest => test/pacman}/tests/fileconflict004.py (100%) rename {pactest => test/pacman}/tests/fileconflict005.py (100%) rename {pactest => test/pacman}/tests/fileconflict006.py (100%) rename {pactest => test/pacman}/tests/fileconflict007.py (100%) rename {pactest => test/pacman}/tests/ignore001.py (100%) rename {pactest => test/pacman}/tests/ignore002.py (100%) rename {pactest => test/pacman}/tests/ignore003.py (100%) rename {pactest => test/pacman}/tests/ignore004.py (100%) rename {pactest => test/pacman}/tests/ignore005.py (100%) rename {pactest => test/pacman}/tests/ldconfig001.py (100%) rename {pactest => test/pacman}/tests/ldconfig002.py (100%) rename {pactest => test/pacman}/tests/ldconfig003.py (100%) rename {pactest => test/pacman}/tests/mode001.py (100%) rename {pactest => test/pacman}/tests/mode002.py (100%) rename {pactest => test/pacman}/tests/mode003.py (100%) rename {pactest => test/pacman}/tests/pacman001.py (100%) rename {pactest => test/pacman}/tests/pacman002.py (100%) rename {pactest => test/pacman}/tests/pacman003.py (100%) rename {pactest => test/pacman}/tests/pacman004.py (100%) rename {pactest => test/pacman}/tests/provision001.py (100%) rename {pactest => test/pacman}/tests/provision010.py (100%) rename {pactest => test/pacman}/tests/provision011.py (100%) rename {pactest => test/pacman}/tests/provision012.py (100%) rename {pactest => test/pacman}/tests/provision020.py (100%) rename {pactest => test/pacman}/tests/provision021.py (100%) rename {pactest => test/pacman}/tests/provision022.py (100%) rename {pactest => test/pacman}/tests/query001.py (100%) rename {pactest => test/pacman}/tests/query002.py (100%) rename {pactest => test/pacman}/tests/query003.py (100%) rename {pactest => test/pacman}/tests/query004.py (100%) rename {pactest => test/pacman}/tests/query005.py (100%) rename {pactest => test/pacman}/tests/reason001.py (100%) rename {pactest => test/pacman}/tests/remove001.py (83%) rename {pactest => test/pacman}/tests/remove010.py (100%) rename {pactest => test/pacman}/tests/remove011.py (100%) rename {pactest => test/pacman}/tests/remove020.py (100%) rename {pactest => test/pacman}/tests/remove021.py (100%) rename {pactest => test/pacman}/tests/remove030.py (100%) rename {pactest => test/pacman}/tests/remove040.py (100%) rename {pactest => test/pacman}/tests/remove041.py (100%) rename {pactest => test/pacman}/tests/remove042.py (100%) rename {pactest => test/pacman}/tests/remove043.py (100%) rename {pactest => test/pacman}/tests/remove044.py (100%) rename {pactest => test/pacman}/tests/remove045.py (100%) rename {pactest => test/pacman}/tests/remove047.py (100%) rename {pactest => test/pacman}/tests/remove049.py (100%) rename {pactest => test/pacman}/tests/remove050.py (100%) rename {pactest => test/pacman}/tests/remove051.py (100%) rename {pactest => test/pacman}/tests/remove052.py (100%) rename {pactest => test/pacman}/tests/remove060.py (100%) rename {pactest => test/pacman}/tests/scriptlet001.py (100%) rename {pactest => test/pacman}/tests/scriptlet002.py (100%) rename {pactest => test/pacman}/tests/smoke001.py (100%) rename {pactest => test/pacman}/tests/symlink001.py (100%) rename {pactest => test/pacman}/tests/sync001.py (100%) rename {pactest => test/pacman}/tests/sync002.py (100%) rename {pactest => test/pacman}/tests/sync003.py (100%) rename {pactest => test/pacman}/tests/sync009.py (100%) rename {pactest => test/pacman}/tests/sync010.py (100%) rename {pactest => test/pacman}/tests/sync011.py (100%) rename {pactest => test/pacman}/tests/sync012.py (100%) rename {pactest => test/pacman}/tests/sync020.py (100%) rename {pactest => test/pacman}/tests/sync021.py (100%) rename {pactest => test/pacman}/tests/sync030.py (100%) rename {pactest => test/pacman}/tests/sync031.py (100%) rename {pactest => test/pacman}/tests/sync040.py (100%) rename {pactest => test/pacman}/tests/sync041.py (100%) rename {pactest => test/pacman}/tests/sync042.py (100%) rename {pactest => test/pacman}/tests/sync043.py (100%) rename {pactest => test/pacman}/tests/sync044.py (100%) rename {pactest => test/pacman}/tests/sync045.py (100%) rename {pactest => test/pacman}/tests/sync050.py (100%) rename {pactest => test/pacman}/tests/sync100.py (100%) rename {pactest => test/pacman}/tests/sync1000.py (100%) rename {pactest => test/pacman}/tests/sync1003.py (100%) rename {pactest => test/pacman}/tests/sync1004.py (100%) rename {pactest => test/pacman}/tests/sync1008.py (100%) rename {pactest => test/pacman}/tests/sync101.py (100%) rename {pactest => test/pacman}/tests/sync102.py (100%) rename {pactest => test/pacman}/tests/sync103.py (100%) rename {pactest => test/pacman}/tests/sync104.py (100%) rename {pactest => test/pacman}/tests/sync110.py (100%) rename {pactest => test/pacman}/tests/sync1100.py (100%) rename {pactest => test/pacman}/tests/sync1101.py (100%) rename {pactest => test/pacman}/tests/sync1102.py (100%) rename {pactest => test/pacman}/tests/sync1103.py (100%) rename {pactest => test/pacman}/tests/sync120.py (100%) rename {pactest => test/pacman}/tests/sync130.py (100%) rename {pactest => test/pacman}/tests/sync131.py (100%) rename {pactest => test/pacman}/tests/sync132.py (100%) rename {pactest => test/pacman}/tests/sync133.py (100%) rename {pactest => test/pacman}/tests/sync134.py (100%) rename {pactest => test/pacman}/tests/sync135.py (100%) rename {pactest => test/pacman}/tests/sync136.py (100%) rename {pactest => test/pacman}/tests/sync137.py (100%) rename {pactest => test/pacman}/tests/sync138.py (100%) rename {pactest => test/pacman}/tests/sync150.py (100%) rename {pactest => test/pacman}/tests/sync200.py.in (100%) rename {pactest => test/pacman}/tests/sync300.py (100%) rename {pactest => test/pacman}/tests/sync301.py (100%) rename {pactest => test/pacman}/tests/sync400.py (100%) rename {pactest => test/pacman}/tests/sync401.py (100%) rename {pactest => test/pacman}/tests/sync402.py (100%) rename {pactest => test/pacman}/tests/sync403.py (100%) rename {pactest => test/pacman}/tests/sync404.py (100%) rename {pactest => test/pacman}/tests/sync405.py (100%) rename {pactest => test/pacman}/tests/sync406.py (100%) rename {pactest => test/pacman}/tests/sync500.py (100%) rename {pactest => test/pacman}/tests/sync501.py (100%) rename {pactest => test/pacman}/tests/sync890.py (100%) rename {pactest => test/pacman}/tests/sync891.py (100%) rename {pactest => test/pacman}/tests/sync892.py (100%) rename {pactest => test/pacman}/tests/sync893.py (100%) rename {pactest => test/pacman}/tests/sync895.py (100%) rename {pactest => test/pacman}/tests/sync896.py (100%) rename {pactest => test/pacman}/tests/sync897.py (100%) rename {pactest => test/pacman}/tests/sync898.py (100%) rename {pactest => test/pacman}/tests/sync899.py (100%) rename {pactest => test/pacman}/tests/sync900.py (100%) rename {pactest => test/pacman}/tests/sync901.py (100%) rename {pactest => test/pacman}/tests/sync990.py (100%) rename {pactest => test/pacman}/tests/sync992.py (100%) rename {pactest => test/pacman}/tests/sync993.py (100%) rename {pactest => test/pacman}/tests/sync999.py (100%) rename {pactest => test/pacman}/tests/trans001.py (100%) rename {pactest => test/pacman}/tests/type001.py (100%) rename {pactest => test/pacman}/tests/unresolvable001.py (100%) rename {pactest => test/pacman}/tests/upgrade001.py (100%) rename {pactest => test/pacman}/tests/upgrade002.py (100%) rename {pactest => test/pacman}/tests/upgrade003.py (100%) rename {pactest => test/pacman}/tests/upgrade004.py (100%) rename {pactest => test/pacman}/tests/upgrade005.py (100%) rename {pactest => test/pacman}/tests/upgrade010.py (100%) rename {pactest => test/pacman}/tests/upgrade011.py (100%) rename {pactest => test/pacman}/tests/upgrade012.py (100%) rename {pactest => test/pacman}/tests/upgrade013.py (100%) rename {pactest => test/pacman}/tests/upgrade014.py (100%) rename {pactest => test/pacman}/tests/upgrade015.py (100%) rename {pactest => test/pacman}/tests/upgrade016.py (100%) rename {pactest => test/pacman}/tests/upgrade020.py (100%) rename {pactest => test/pacman}/tests/upgrade021.py (100%) rename {pactest => test/pacman}/tests/upgrade022.py (100%) rename {pactest => test/pacman}/tests/upgrade023.py (100%) rename {pactest => test/pacman}/tests/upgrade024.py (100%) rename {pactest => test/pacman}/tests/upgrade025.py (100%) rename {pactest => test/pacman}/tests/upgrade026.py (100%) rename {pactest => test/pacman}/tests/upgrade030.py (100%) rename {pactest => test/pacman}/tests/upgrade031.py (100%) rename {pactest => test/pacman}/tests/upgrade032.py (100%) rename {pactest => test/pacman}/tests/upgrade040.py (100%) rename {pactest => test/pacman}/tests/upgrade041.py (100%) rename {pactest => test/pacman}/tests/upgrade042.py (100%) rename {pactest => test/pacman}/tests/upgrade043.py (100%) rename {pactest => test/pacman}/tests/upgrade045.py (100%) rename {pactest => test/pacman}/tests/upgrade046.py (100%) rename {pactest => test/pacman}/tests/upgrade050.py (100%) rename {pactest => test/pacman}/tests/upgrade051.py (100%) rename {pactest => test/pacman}/tests/upgrade052.py (100%) rename {pactest => test/pacman}/tests/upgrade053.py (100%) rename {pactest => test/pacman}/tests/upgrade054.py (100%) rename {pactest => test/pacman}/tests/upgrade055.py (100%) rename {pactest => test/pacman}/tests/upgrade056.py (100%) rename {pactest => test/pacman}/tests/upgrade057.py (100%) rename {pactest => test/pacman}/tests/upgrade058.py (100%) rename {pactest => test/pacman}/tests/upgrade059.py (100%) rename {pactest => test/pacman}/tests/upgrade060.py (100%) rename {pactest => test/pacman}/tests/upgrade061.py (100%) rename {pactest => test/pacman}/tests/upgrade070.py (100%) rename {pactest => test/pacman}/tests/upgrade071.py (100%) rename {pactest => test/pacman}/tests/upgrade072.py (100%) rename {pactest => test/pacman}/tests/upgrade073.py (100%) rename {pactest => test/pacman}/tests/upgrade074.py (100%) rename {pactest => test/pacman}/tests/upgrade075.py (100%) rename {pactest => test/pacman}/tests/upgrade076.py (100%) rename {pactest => test/pacman}/tests/upgrade080.py (100%) rename {pactest => test/pacman}/tests/upgrade081.py (100%) rename {pactest => test/pacman}/tests/upgrade082.py (100%) rename {pactest => test/pacman}/tests/upgrade083.py (100%) rename {pactest => test/pacman}/tests/upgrade084.py (100%) rename {pactest => test/pacman}/tests/upgrade090.py (100%) rename {pactest => test/pacman}/tests/xfercommand001.py (100%) rename {pactest => test/pacman}/util.py (100%) create mode 100644 test/util/Makefile.am rename {pactest => test/util}/vercmptest.sh (100%) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] [arch-dev] [signoff] openssl 1.0.0a
by Allan McRae 02 Jun '10

02 Jun '10

On 02/06/10 10:43, Pierre Schmitz wrote: > On Wed, 02 Jun 2010 09:12:45 +1000, Allan McRae<allan(a)archlinux.org> > wrote: >> vercmp and pacman include the same source file for comparisons so should > >> be fine. >> >> There might have been a change a while back (3.2 I think) when there >> were heaps of discussions about version numbers and how they are sorted. > >> At the moment the scheme is the same as what rpm uses (except rpm has >> epochs to deal with cases like this). >> >> Allan > > Btw: is this a bug in vercmp? > > [pierre@opteron ~]$ vercmp 1.0.0a 1.0.0.a > 0 > [pierre@opteron ~]$ vercmp 1.0.0 1.0.0.a > -1 > [pierre@opteron ~]$ vercmp 1.0.0 1.0.0a > 1 > > If both versions are equal why aren't they if compared with others? > Certainly looks like a bug to me. Forwarding to pacman-dev Allan

1 0

[pacman-dev] [PATCH] Fix typo in pactest
by Allan McRae 30 May '10

30 May '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- pactest/tests/remove001.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pactest/tests/remove001.py b/pactest/tests/remove001.py index d20dd07..02d00a4 100644 --- a/pactest/tests/remove001.py +++ b/pactest/tests/remove001.py @@ -6,4 +6,4 @@ self.args = "-R " + "foo "*5 self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXISTS=foo") +self.addrule("PKG_EXIST=foo") -- 1.7.1

2 2

[pacman-dev] [PATCH] [makepkg] use double brackets
by Andres P 29 May '10

29 May '10

Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..be076a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -345,7 +345,7 @@ download_file() { run_pacman() { local ret=0 if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then - if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + if [[ $(type -p sudo) ]] && sudo -l $PACMAN &>/dev/null; then sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? else su -c "$PACMAN $PACMAN_OPTS $*" || ret=$? @@ -519,7 +519,7 @@ generate_checksums() { msg "$(gettext "Generating checksums for source files...")" plain "" - if [ ! $(type -p openssl) ]; then + if [[ ! $(type -p openssl) ]]; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi @@ -580,7 +580,7 @@ generate_checksums() { check_checksums() { (( ! ${#source[@]} )) && return 0 - if [ ! $(type -p openssl) ]; then + if [[ ! $(type -p openssl) ]]; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi @@ -1296,7 +1296,7 @@ check_sanity() { if (( ${#pkgname[@]} > 1 )); then for pkg in ${pkgname[@]}; do - if [ "$(type -t package_${pkg})" != "function" ]; then + if [[ $(type -t package_${pkg}) != "function" ]]; then error "$(gettext "missing package function for split package '%s'")" "$pkg" return 1 fi @@ -1333,27 +1333,27 @@ devel_check() { # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then - [ $(type -p darcs) ] || return 0 + [[ $(type -p darcs) ]] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then - [ $(type -p cvs) ] || return 0 + [[ $(type -p cvs) ]] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then - [ $(type -p git) ] || return 0 + [[ $(type -p git) ]] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then - [ $(type -p svn) ] || return 0 + [[ $(type -p svn) ]] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then - [ $(type -p bzr) ] || return 0 + [[ $(type -p bzr) ]] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then - [ $(type -p hg) ] || return 0 + [[ $(type -p hg) ]] || return 0 msg "$(gettext "Determining latest hg revision...")" if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo @@ -1555,7 +1555,7 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # PROGRAM START # determine whether we have gettext; make it a no-op if we do not -if [ ! $(type -t gettext) ]; then +if [[ ! $(type -t gettext) ]]; then gettext() { echo "$@" } @@ -1729,7 +1729,7 @@ if (( ! INFAKEROOT )); then plain "$(gettext "Please rerun makepkg without the --asroot flag.")" exit 1 # $E_USER_ABORT elif [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then - if [ ! $(type -p fakeroot) ]; then + if [[ ! $(type -p fakeroot) ]]; then error "$(gettext "Fakeroot must be installed if using the 'fakeroot' option")" plain "$(gettext "in the BUILDENV array in %s.")" "$MAKEPKG_CONF" exit 1 @@ -1749,7 +1749,7 @@ fi # check for sudo if we will need it during makepkg execution if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if [ ! "$(type -p sudo)" ]; then + if [[ ! $(type -p sudo) ]]; then warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" fi fi @@ -1810,9 +1810,9 @@ fi if [[ $(! type -t build) = "function" ]]; then BUILDFUNC=1 fi -if [ "$(type -t package)" = "function" ]; then +if [[ $(type -t package) = "function" ]]; then PKGFUNC=1 -elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then +elif [[ $SPLITPKG -eq 0 && $(type -t package_${pkgname}) = "function" ]]; then SPLITPKG=1 fi @@ -1921,7 +1921,7 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then if (( NODEPS || ( REPKG && PKGFUNC ) )); then warning "$(gettext "Skipping dependency checks.")" fi -elif [ $(type -p "${PACMAN%% *}") ]; then +elif [[ $(type -p "${PACMAN%% *}") ]]; then if (( RMDEPS )); then original_pkglist=($(run_pacman -Qq | sort)) # required by remove_dep fi -- 1.7.1

6 24

[pacman-dev] [PATCH] Remove unnecessary error catching from PKGBUILD protos
by Allan McRae 29 May '10

29 May '10

The use of "|| return 1" is no longer necessary in PKGBUILDs. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 484cb1a..d7f1de1 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -29,7 +29,7 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr - make || return 1 + make } package_pkg1() { diff --git a/PKGBUILD.proto b/PKGBUILD.proto index b4d9c94..ebbdf0a 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -30,7 +30,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 + make } package() { -- 1.7.1

1 0

Re: [pacman-dev] [arch-dev-public] [signoff] dash 0.5.6-1
by Xavier Chantry 28 May '10

28 May '10

On Fri, May 28, 2010 at 10:57 AM, Pierre Schmitz <pierre(a)archlinux.de> wrote: > > I would say make sure that core packages are fine with /bin/sh being dash > and then move it to testing. This should speed up things. For the install > scripts: why can't pacman just call /bin/bash? I mean makpekg and the > PKGBUILDS need bash anyway. > I think that the two pending patches from Jonathan Conder on my branch http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=working would make this cleaner and easier to do. 1) switch from popen to execl : popen implicitely calls /bin/sh, so when we had /bin/sh=dash and wants bash, it would call /bin/dash then /bin/bash. But execl gives us more control. 2) ldconfig is now called directly so if we do the change /bin/sh -> /bin/bash, it only affects scriptlet executions. But I am pretty sure we talked about this before, maybe there was a bug report, and some people suggested to make the shell path configurable. Thinking about it now, I would be fine with just calling /bin/bash directly. If we consider pacman project as a whole, it's pretty much tied to bash anyway.

3 2

[pacman-dev] [PATCH 1/2] makepkg: less code rep with single redirection
by Andres P 27 May '10

27 May '10

Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..7f27361 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -904,56 +904,56 @@ write_pkginfo() { size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating .PKGINFO file...")" - echo "# Generated by makepkg $myver" >.PKGINFO + echo "# Generated by makepkg $myver" if (( INFAKEROOT )); then - echo "# using $(fakeroot -v)" >>.PKGINFO - fi - echo "# $(LC_ALL=C date -u)" >>.PKGINFO - echo "pkgname = $1" >>.PKGINFO - (( SPLITPKG )) && echo pkgbase = $pkgbase >>.PKGINFO - echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO - echo "pkgdesc = $pkgdesc" >>.PKGINFO - echo "url = $url" >>.PKGINFO - echo "builddate = $builddate" >>.PKGINFO - echo "packager = $packager" >>.PKGINFO - echo "size = $size" >>.PKGINFO - echo "arch = $PKGARCH" >>.PKGINFO + echo "# using $(fakeroot -v)" + fi + echo "# $(LC_ALL=C date -u)" + echo "pkgname = $1" + (( SPLITPKG )) && echo pkgbase = $pkgbase + echo "pkgver = $pkgver-$pkgrel" + echo "pkgdesc = $pkgdesc" + echo "url = $url" + echo "builddate = $builddate" + echo "packager = $packager" + echo "size = $size" + echo "arch = $PKGARCH" if [[ $(check_option force) = "y" ]]; then - echo "force = true" >> .PKGINFO + echo "force = true" fi local it for it in "${license[@]}"; do - echo "license = $it" >>.PKGINFO + echo "license = $it" done for it in "${replaces[@]}"; do - echo "replaces = $it" >>.PKGINFO + echo "replaces = $it" done for it in "${groups[@]}"; do - echo "group = $it" >>.PKGINFO + echo "group = $it" done for it in "${depends[@]}"; do - echo "depend = $it" >>.PKGINFO + echo "depend = $it" done for it in "${optdepends[@]}"; do - echo "optdepend = $it" >>.PKGINFO + echo "optdepend = $it" done for it in "${conflicts[@]}"; do - echo "conflict = $it" >>.PKGINFO + echo "conflict = $it" done for it in "${provides[@]}"; do - echo "provides = $it" >>.PKGINFO + echo "provides = $it" done for it in "${backup[@]}"; do - echo "backup = $it" >>.PKGINFO + echo "backup = $it" done for it in "${packaging_options[@]}"; do local ret="$(check_option $it)" if [[ $ret != "?" ]]; then if [[ $ret = y ]]; then - echo "makepkgopt = $it" >>.PKGINFO + echo "makepkgopt = $it" else - echo "makepkgopt = !$it" >>.PKGINFO + echo "makepkgopt = !$it" fi fi done @@ -964,7 +964,7 @@ write_pkginfo() { warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi -} +} > .PKGINFO check_package() { cd "$pkgdir" -- 1.7.1

3 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-199-g5dffef7
by dan＠archlinux.org 27 May '10

27 May '10

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 5dffef787df72cc407708242d14f07496bb37791 (commit) via fe1e3471f47d9da3bac4cedce250cd2ce04368b4 (commit) via 3064f8d08d8f8048aa064aa07c47b3059df7b56e (commit) from 80f7c1707c2b25cbb88120f5d12e7e038beba36c (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 5dffef787df72cc407708242d14f07496bb37791 Author: Allan McRae <allan(a)archlinux.org> Date: Thu May 27 23:47:18 2010 +1000 repo-add: symlink to db file to reponame.db This is a small step towards allowing pacman to handle databases with variable compression types. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe1e3471f47d9da3bac4cedce250cd2ce04368b4 Author: Andres P <aepd87(a)gmail.com> Date: Tue May 25 16:32:07 2010 -0430 makepkg: remove code duplication in buildscript parsing Merges code in two almost identical chunks in create_srcpackage and check_sanity. Also discards the space kept by regex in ae73d75660 and earlier, since the for loop discards it later on. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3064f8d08d8f8048aa064aa07c47b3059df7b56e Author: Dan McGee <dan(a)archlinux.org> Date: Tue May 25 10:23:12 2010 -0500 Update pacsearch to work with new Qs/Ss output Now that we have the '[installed]' text, update pacsearch to look for it and highlight it instead of the former '***' prefix. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsearch | 44 +++++++++++++++++++--------------------- scripts/makepkg.sh.in | 51 +++++++++++++---------------------------------- scripts/repo-add.sh.in | 1 + 3 files changed, 36 insertions(+), 60 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: refactor absolute filename detection
by Cedric Staniewski 27 May '10

27 May '10

Move the absolute filename detection to a new function to reduce code duplication. This patch also fixes the --allsource option that did not include remote source files if they reside in $startdir instead of $SRCDEST. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- Finally finished this quiet old patch[1]. However, I am not completely happy with it: 1) error_source_file_not_found is an ugly name; need to find a better/shorter one. It's not possible to correctly exit makepkg from within a subshell anymore which why these file=... || error_source_file_not_found checks are necessary. 2) The part in download_sources is rather ugly too. Do we really need to distinguish between source files from build dir and from cache? I think I've tested every changed function, but please do further testing. This patch is rebased on master and Dieter's patch[2]. [1] http://mailman.archlinux.org/pipermail/pacman-dev/2009-October/009755.html [2] http://mailman.archlinux.org/pipermail/pacman-dev/2010-May/010779.html scripts/makepkg.sh.in | 106 +++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 51 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9741879..96c5d12 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -179,6 +179,32 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR # 1) "filename::http://path/to/file" # 2) "http://path/to/file" +# return the absolute filename of an source entry +# +# this function accepts a source entry or the already extracted filename of a +# source entry as input +get_absolute_filename() { + local file="$(get_filename "$1")" + + if [[ -f "$startdir/$file" ]] ; then + file="$startdir/$file" + else + if [[ -f "$SRCDEST/$file" ]] ; then + file="$SRCDEST/$file" + else + return 1 + fi + fi + + echo "$file" +} + +error_source_file_not_found() { + error "$(gettext "Unable to find source file %s.")" "$file" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_FILE +} + # extract the filename from a source entry get_filename() { # if a filename is specified, use it @@ -458,20 +484,24 @@ download_sources() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - local url=$(get_url "$netfile") - if [[ -f $startdir/$file ]]; then - msg2 "$(gettext "Found %s in build dir")" "$file" - rm -f "$srcdir/$file" - ln -s "$startdir/$file" "$srcdir/" - continue - elif [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Using cached copy of %s")" "$file" - rm -f "$srcdir/$file" - ln -s "$SRCDEST/$file" "$srcdir/" + local file + if file=$(get_absolute_filename "$netfile"); then + if [[ ${file%/*} = $startdir ]]; then + msg2 "$(gettext "Found %s in build dir")" "${file##*/}" + elif [[ ${file%/*} = $SRCDEST ]]; then + msg2 "$(gettext "Using cached copy of %s")" "${file##*/}" + else + # should never be reached + error 'Source file found but it neither exists in $startdir nor $SRCDEST.' + exit 1 + fi + ln -sf "$file" "$srcdir/" continue fi + file=$(get_filename "$netfile") + local url=$(get_url "$netfile") + # if we get here, check to make sure it was a URL, else fail if [[ $file = $url ]]; then error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file" @@ -553,18 +583,7 @@ generate_checksums() { local netfile for netfile in "${source[@]}"; do - local file="$(get_filename "$netfile")" - - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s to generate checksum.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi - + local file="$(get_absolute_filename "$netfile")" || error_source_file_not_found local sum="$(openssl dgst -${integ} "$file")" sum=${sum##* } (( ct )) && echo -n "$indent" @@ -600,14 +619,10 @@ check_checksums() { file="$(get_filename "$file")" echo -n " $file ... " >&2 - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - echo "$(gettext "NOT FOUND")" >&2 - errors=1 - found=0 - else - file="$SRCDEST/$file" - fi + if ! file="$(get_absolute_filename "$file")"; then + echo "$(gettext "NOT FOUND")" >&2 + errors=1 + found=0 fi if (( $found )) ; then @@ -645,25 +660,17 @@ extract_sources() { msg "$(gettext "Extracting Sources...")" local netfile for netfile in "${source[@]}"; do - file=$(get_filename "$netfile") + absfile="$(get_absolute_filename "$netfile")" || error_source_file_not_found + file=${absfile##*/} if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi - if [[ ! -f $file ]] ; then - if [[ ! -f $SRCDEST/$file ]] ; then - error "$(gettext "Unable to find source file %s for extraction.")" "$file" - plain "$(gettext "Aborting...")" - exit 1 - else - file="$SRCDEST/$file" - fi - fi # fix flyspray #6246 - local file_type=$(file -bizL "$file") + local file_type=$(file -bizL "$absfile") local ext=${file##*.} local cmd='' case "$file_type" in @@ -693,10 +700,10 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [[ $cmd = bsdtar ]]; then - $cmd -xf "$file" || ret=$? + $cmd -xf "$absfile" || ret=$? else rm -f "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=$? + $cmd -dcf "$absfile" > "${file%.*}" || ret=$? fi if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" @@ -1091,13 +1098,10 @@ create_srcpackage() { local netfile for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - if [[ -f $netfile ]]; then - msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif (( SOURCEONLY == 2 )) && [[ -f $SRCDEST/$file ]]; then - msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + if [[ -f $netfile ]] || (( SOURCEONLY == 2 )); then + local file=$(get_absolute_filename "$netfile") || error_source_file_not_found + msg2 "$(gettext "Adding %s...")" "${file##*/}" + ln -s "$file" "${srclinks}/${pkgbase}" fi done -- 1.7.1

3 3

[pacman-dev] [PATCH] repo-add: symlink to db file to reponame.db
by Allan McRae 27 May '10

27 May '10

This is a small step towards allowing pacman to handle databases with variable compression types. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Although this does relatively little, it would be good to have it in before pacman-3.4 so that in a later release we could set DBEXT=.db or get rid of it altogether. scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0e46c37..7bde600 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -487,6 +487,7 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" + ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}" else msg "$(gettext "No packages modified, nothing to do.")" exit 1 -- 1.7.1

1 0