- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-270-ga501b72
by Dan McGee 07 Jul '07

07 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via a501b72e40062c9e606a787657582d1859c35d35 (commit) via b5f8a44bebc906bf6a29d30c159802b0c1a7dbb1 (commit) via 49f447d02c803e5a2f63582ce78cabb850ebfa89 (commit) via 15e1ce2e709e0a16dd54ea3b5eaab0003e32b62d (commit) from 6b7b9743181078aa7152daffdfc1eaeb46304c0f (commit) - Log ----------------------------------------------------------------- commit a501b72e40062c9e606a787657582d1859c35d35 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 19:35:32 2007 -0400 Make paragraph text in scripts single strings It is much easier for translators to deal with paragraphs as strings rather than by lines. Take all usage and version information and convert it to this format. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b5f8a44bebc906bf6a29d30c159802b0c1a7dbb1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 18:43:24 2007 -0400 Move scripts from *.in to *.sh.in so gettext can determine type If we move the scripts from *.in to *.sh.in and *.py.in, gettext can pull the required strings to translate a whole lot easier. Do this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 49f447d02c803e5a2f63582ce78cabb850ebfa89 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 17:59:08 2007 -0400 First step of moving translations from src/pacman/po to po/ Move the translations from src/pacman/po to just po/ so we can include the scripts gettext translations in the same message catalog as that of the pacman frontend. The libalpm message catalog, for now, will remain a separate existence. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 15e1ce2e709e0a16dd54ea3b5eaab0003e32b62d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 12:11:55 2007 -0400 Various small fixes as suggested by some static code checkers I ran flawfinder and sparse over the pacman source code and found a few things that were worth fixing (and were quick fixes). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: Makefile.am | 4 +- configure.ac | 2 +- lib/libalpm/add.c | 7 - lib/libalpm/alpm.c | 5 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/util.c | 8 +- {lib/libalpm/po => po}/.gitignore | 0 {lib/libalpm/po => po}/LINGUAS | 0 {lib/libalpm/po => po}/Makefile.in.in | 0 {src/pacman/po => po}/Makevars | 2 +- po/POTFILES.in | 22 ++ {src/pacman/po => po}/de.po | 0 {src/pacman/po => po}/en_GB.po | 0 {src/pacman/po => po}/es.po | 0 {src/pacman/po => po}/fr.po | 0 {src/pacman/po => po}/hu.po | 0 {src/pacman/po => po}/it.po | 0 {src/pacman/po => po}/pacman.pot | 0 {src/pacman/po => po}/pl_PL.po | 0 {src/pacman/po => po}/pt_BR.po | 0 {lib/libalpm/po => po}/remove-potcdate.sin | 0 {src/pacman/po => po}/ru_RU.po | 0 scripts/Makefile.am | 44 ++-- scripts/{abs.in => abs.sh.in} | 26 +- scripts/{gensync.in => gensync.sh.in} | 44 ++-- scripts/{makepkg.in => makepkg.sh.in} | 13 +- scripts/{makeworld.in => makeworld.sh.in} | 9 +- .../{pacman-optimize.in => pacman-optimize.sh.in} | 35 +- scripts/{rankmirrors.in => rankmirrors.py.in} | 8 +- scripts/{repo-add.in => repo-add.sh.in} | 33 +- scripts/{repo-remove.in => repo-remove.sh.in} | 29 +- scripts/{updatesync.in => updatesync.sh.in} | 41 +-- src/pacman/Makefile.am | 2 - src/pacman/po/.gitignore | 6 - src/pacman/po/LINGUAS | 10 - src/pacman/po/Makefile.in.in | 355 -------------------- src/pacman/po/POTFILES.in | 12 - src/pacman/po/remove-potcdate.sin | 19 - 38 files changed, 162 insertions(+), 576 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 6b7b9743181078aa7152daffdfc1eaeb46304c0f \ a501b72e40062c9e606a787657582d1859c35d35

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-266-g6b7b974
by Dan McGee 06 Jul '07

06 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 6b7b9743181078aa7152daffdfc1eaeb46304c0f (commit) from 59d9ccf48d84fd1e59f78cb4dcf428e53d1c6911 (commit) - Log ----------------------------------------------------------------- commit 6b7b9743181078aa7152daffdfc1eaeb46304c0f Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 00:33:26 2007 -0400 Fix up pactest TODO Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: pactest/TODO | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 59d9ccf48d84fd1e59f78cb4dcf428e53d1c6911 \ 6b7b9743181078aa7152daffdfc1eaeb46304c0f

1 0

[pacman-dev] makepkg -L fails
by Andreas Radke 03 Jul '07

03 Jul '07

while makepkg without the logging works when compiling udev: http://bugs.archlinux.org/task/7507 pacman 3.0.5-1 on x86_64 AndyRTR

5 4

[pacman-dev] [PATCH] Change the exit code for pacman_deptest().
by Andrew Fyfe 02 Jul '07

02 Jul '07

Changed the exit code for missing deps from 1 to 127 because 1 is used for other errors. makepkg breaks if pacman exits with 1 for any reason other than a missing dep. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg.in | 2 +- src/pacman/deptest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.in b/scripts/makepkg.in index 8be44c6..96c94ea 100644 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -296,7 +296,7 @@ check_deps() { pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ $ret -eq 1 ]; then #unresolved deps + if [ $ret -eq 127 ]; then #unresolved deps echo "$pmout" elif [ $ret -ne 0 ]; then error "$(gettext "Pacman returned a fatal error (%i): %s")" "$ret" "$pmout" diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 264ba1c..5addfb3 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -79,7 +79,7 @@ int pacman_deptest(alpm_list_t *targets) if(!found) { printf("%s\n", saved_target); - retval = 1; + retval = 127; } free(saved_target); } -- 1.5.2.2

2 2

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-265-g59d9ccf
by Dan McGee 02 Jul '07

02 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 59d9ccf48d84fd1e59f78cb4dcf428e53d1c6911 (commit) via 4d9b5d4a2a4cf96de8d6b4afa34a4d3424bf96b4 (commit) via 4d286e567b18a44715cb5dee37e7179a79cdef87 (commit) from 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 (commit) - Log ----------------------------------------------------------------- commit 59d9ccf48d84fd1e59f78cb4dcf428e53d1c6911 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 2 10:06:03 2007 -0400 Reduce delay in pactest when running MODIFIED tests pactest was sleeping for 3 seconds, which is unnecessary. Reduce it to 1.5 seconds and clean up the code a bit anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d9b5d4a2a4cf96de8d6b4afa34a4d3424bf96b4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 2 11:29:05 2007 +0200 pacman/query.c : return after a query on all packages. Previously, the following error was displayed even after a valid and successful query operation on all packages, like -Q , -Ql, -Qi, -Qil : no targets specified (use -h for help) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 4d286e567b18a44715cb5dee37e7179a79cdef87 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 23:27:20 2007 -0400 Update 'submitting-patches' Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: pactest/pmenv.py | 6 ++---- src/pacman/query.c | 1 + submitting-patches | 20 ++++++++++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 \ 59d9ccf48d84fd1e59f78cb4dcf428e53d1c6911

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-262-g89ed15c
by Dan McGee 02 Jul '07

02 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 (commit) via 7a42e24400499873c3b9e1e2315edc808d753734 (commit) via f55f7f100f650ff040f8721cf761a060af1c05fe (commit) via cd3a63681338b7510846837dcc169d276cf75458 (commit) via 19f66083f0aef92af84761fd62245270e97c6f33 (commit) via d70116bfbc535cac9eb941a570c34479e68a1b8d (commit) from 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 (commit) - Log ----------------------------------------------------------------- commit 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 2 00:57:47 2007 +0200 pacman/packages.c : print an error for files that can't be stated. The -Ql operation is supposed to print all files but directories. stat was used for detecting directories. However, when stat failed, (because the file doesn't exist or is not readable), the files were still displayed just like the others. Now, these files are printed on stderr, with the corresponding error message. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 7a42e24400499873c3b9e1e2315edc808d753734 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jun 30 00:49:17 2007 +0200 libalpm/add.c : fix for FS #7484 Adds the ARCHIVE_EXTRACT_NO_OVERWRITE libarchive flags for extracting files and directories. This will prevent symlinks for being overwritten by directories. All other files that need to be extracted should already have been deleted previously by pacman. This flag is not used for extracting files in backup array to /tmp/alpm_XXXX, because this file is created by mkstemp first, and so needs to be overwritten by the file from the archive. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit f55f7f100f650ff040f8721cf761a060af1c05fe Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 2 02:12:36 2007 +0200 libalpm/add.c,util.c : log ARCHIVE_WARN warning to debug output. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit cd3a63681338b7510846837dcc169d276cf75458 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 20:22:42 2007 -0400 Remove unnecessary and extra includes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19f66083f0aef92af84761fd62245270e97c6f33 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 20:03:15 2007 -0400 Add mode and type checking to pactest for files Add the ability to check the permissions and type of a file within the framework of pactest. Two new rules can be used: self.addrule("FILE_TYPE=bin/foo|file") self.addrule("FILE_MODE=bin/bar|644") TODO: add the ability to add different types of files (eg links) via the test package building framework, and add the ability to change the modes on files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d70116bfbc535cac9eb941a570c34479e68a1b8d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 18:40:43 2007 -0400 Move Doxygen manpage generation to doc/ directory Instead of doing the doxygen work in the libalpm/ dir, do it with the rest of the docs in the doc/ dir. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: {lib/libalpm => doc}/Doxyfile | 25 +++------------------- doc/Makefile.am | 9 +++++++- lib/libalpm/Makefile.am | 10 --------- lib/libalpm/add.c | 22 +++++++++++++++++-- lib/libalpm/db.c | 7 ------ lib/libalpm/remove.c | 7 ------ lib/libalpm/server.c | 1 - lib/libalpm/sync.c | 2 - lib/libalpm/util.c | 17 +++++++++++--- pactest/pmrule.py | 45 ++++++++++++++++++++++++++-------------- pactest/tests/mode001.py | 12 +++++++++++ pactest/tests/type001.py | 13 +++++++++++ src/pacman/package.c | 11 +++++++-- 13 files changed, 106 insertions(+), 75 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 \ 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328

1 0

[pacman-dev] pacman -Ql
by Xavier 02 Jul '07

02 Jul '07

I found it weird that pacman -Ql listed two directories : pacman -Ql | grep "/$" cups /var/spool/cups/tmp/ ttf-ms-fonts /tmp/ttf-ms-fonts/ I found the explanation here : http://bbs.archlinux.org/viewtopic.php?pid=259654#p259654 I think this code is wrong, but don't know how to fix it.. Why does it have to use stat for dir though ? Can't it just check for the trailing slash ? And then, stat could be used for the feature request of this thread, ie checking that all files from package actually exist on the filesystem. But in this case, root access will be needed here, otherwise it'll get it wrong..

2 3

[pacman-dev] [PATCH] Change the exit code for pacman_deptest() and some clean up.
by Andrew Fyfe 30 Jun '07

30 Jun '07

Changed the exit code for missing deps from 1 to 128 because 1 is used for other errors. makepkg breaks if pacman exits with 1 for any reason other than a missing dep. Changed alpm_splitdeps( deptest ) so it doesn't change the value of deptest. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- lib/libalpm/deps.c | 4 +++- scripts/makepkg.in | 2 +- src/pacman/deptest.c | 16 +++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 524136b..b259c4b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -442,7 +442,9 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) if(depstring == NULL) { return(NULL); } - newstr = strdup(depstring); + + newstr = calloc(strlen(depstring)+1, sizeof(char)); + strncpy(newstr, depstring, strlen(depstring)); depend = malloc(sizeof(pmdepend_t)); if(depend == NULL) { diff --git a/scripts/makepkg.in b/scripts/makepkg.in index 8be44c6..12459f9 100644 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -296,7 +296,7 @@ check_deps() { pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ $ret -eq 1 ]; then #unresolved deps + if [ $ret -eq 128 ]; then #unresolved deps echo "$pmout" elif [ $ret -ne 0 ]; then error "$(gettext "Pacman returned a fatal error (%i): %s")" "$ret" "$pmout" diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 264ba1c..8a731ae 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -27,6 +27,7 @@ #include <alpm.h> #include <alpm_list.h> +#include <deps.h> /* pacman */ #include "pacman.h" @@ -52,20 +53,14 @@ int pacman_deptest(alpm_list_t *targets) alpm_list_t *j, *provides; target = alpm_list_getdata(i); - - /* splitdep modifies the string... we'll compensate for now */ - char *saved_target = NULL; - saved_target = calloc(strlen(target)+1, sizeof(char)); - strncpy(saved_target, target, strlen(target)); - dep = alpm_splitdep(target); - pkg = alpm_db_get_pkg(alpm_option_get_localdb(), target); + pkg = alpm_db_get_pkg(alpm_option_get_localdb(), dep->name); if(pkg && alpm_depcmp(pkg, dep)) { found = 1; } else { /* not found, can we find anything that provides this in the local DB? */ - provides = alpm_db_whatprovides(alpm_option_get_localdb(), target); + provides = alpm_db_whatprovides(alpm_option_get_localdb(), dep->name); for(j = provides; j; j = alpm_list_next(j)) { pmpkg_t *pkg; pkg = alpm_list_getdata(j); @@ -78,10 +73,9 @@ int pacman_deptest(alpm_list_t *targets) } if(!found) { - printf("%s\n", saved_target); - retval = 1; + printf("%s\n", target); + retval = 128; } - free(saved_target); } return(retval); } -- 1.5.2.2

3 12

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-256-g2657a2b
by Chantry Xavier 29 Jun '07

29 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 (commit) via 1a3b3bc1300b42dc2f554a6faa09b5ece2d3321c (commit) from 78bac81a58355a6d42760e1974005dbcdd8e8dcf (commit) - Log ----------------------------------------------------------------- commit 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jun 28 19:28:34 2007 +0200 libalpm/add.c : ignore libarchive warning. With libarchive 2.2.3 (previously 1.3.1), archive_read_extract now returns ARCHIVE_WARN when a package is extracted as user, because for example, UID=0 or SUID bit can't be set. This patch makes pacman not treating these warnings as errors anymore, but simply ignoring them. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 1a3b3bc1300b42dc2f554a6faa09b5ece2d3321c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jun 28 16:59:34 2007 +0200 libalpm/util.c : stat returns 0 on success Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Diffstat: lib/libalpm/add.c | 17 +++++++++++------ lib/libalpm/util.c | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 78bac81a58355a6d42760e1974005dbcdd8e8dcf \ 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6

1 0

[pacman-dev] difficult symlink "puzzle"
by Nagy Gabor 29 Jun '07

29 Jun '07

Hi! I ran into a difficult problem: What about symlink directories, if an other package wants to pull some new files to them? Let me explain with an example: See packages git (it contains: /usr/lib/perl5/site_perl/5.8.8/Git.pm). However, /usr/lib/perl5/site_perl/5.8.8/ is a symlink to /usr/lib/perl5/site_perl/current/. What should the package manager do here? The current situation: git package simply overwrites /usr/lib/perl5/site_perl/5.8.8/ symlink with a regular directory, so the dir 5.8.8 contains only git.pm now :-( If we install git first then perl's install script cannot do anything useful with the existing 5.8.8 dir: result is the same :-( The problem main problem, that currently I cannot solve this problem: if pacman treated the 5.8.8 symlink as an existing dir (in the first example), then Git.pm would be copied to current, which easily can run out of pacman's control (if the 5.8.8 symlink will be deleted later with a forced -Rd perl). It's hard to find a good solution imho, pacman should follow dir symlink during package install, and something should be recorded into db (to FILES: 5.8.8/file->current/file), but the precise handling of this would cause big overhead, and is not easy... Bye, ngaba

3 4