- Pacman-dev - lists.archlinux.org

[pacman-dev] [patch] for sync1003.py
by Nagy Gabor 06 Aug '07

06 Aug '07

Hi! Patch attached. NOTE: this affects resolvedeps too. TODO: I did a dirty hack in sync_prepare (now sync990.py fails), I will clean it up later. Bye, ngaba

4 10

Re: [pacman-dev] [patch] for sync1003.py
by ngaba＠bibl.u-szeged.hu 03 Aug '07

03 Aug '07

> TODO: I did a dirty hack in sync_prepare (now sync990.py fails), I will Well, that patch is broken: pkg3 should be installed (pkg1 needs it.) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0

[pacman-dev] sync_prepare clean-up III, TODO
by Nagy Gabor 30 Jul '07

30 Jul '07

Hi! Well, the remaining part is very messy and disappointing: The whole conflict checking should be refactored: as I assume this wants to do something similar to checkdeps(...TRANS_TYPE_UPDATE), but that is buggy: this should be fixed as deps.c (conflict001.py shows this.) However, as Xavier said earlier a new data stucture is needed for conflicts; and all conflict resolve stuff should be moved to conflict.c. The second pactest file shows checkdeps cannot get enough information from sync.c to figure out if there is any broken dependency: it should know BOTH the remove and upgrade list to decide properly. Well, both of this bugs needs hard work: a proper conflict resolution is a difficult (probably recursive) problem, it would be easier to let user do this work manually. Bye, ngaba PS: I don't like inefficient pmsyncpkg_t neither.

3 13

[pacman-dev] pacman_deptest function
by Xavier 28 Jul '07

28 Jul '07

I've benn looking at that function again, and here is what I saw in Andrew's commit : +/* TODO: This should use _alpm_checkdeps() */ int pacman_deptest(alpm_list_t *targets) As I tried to explain there : http://www.archlinux.org/pipermail/pacman-dev/2007-June/008654.html checkdeps isn't really what we want. Here, we just want to check that a list of dependencies from the PKGBUILD is already installed locally. checkdeps however checks if we can install a package, by checking its dependencies. And checkdeps gets this information from the sync or local databases, it can't really get the deps list from an external PKGBUILD. But there is at least one way to do that, it's creating a dummy package, with the same list of dependencies as in the PKGBUILD, and work with that in libalpm. I looked at the history of deptest(), and it's actually what Aurelien did at some point : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=0756af675d6b99a1… http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=cda9c6671ced31a7… But it was rather messy, so Aaron cleaned that : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=4dd6c9222879198e… So well, I still have the same opinion that in my earlier answer to Andrew, what pacman_deptest does is just the mythic "search for satisfier" function that Nagy has been talked about for ages, and that is used everywhere in the code :)

2 2

[pacman-dev] Issue while testing largefile support
by Dan McGee 27 Jul '07

27 Jul '07

Interesting debug output while testing largefile support in pacman (http://bugs.archlinux.org/task/7578) [14:55:58] debug: config: finished parsing /usr/local/etc/pacman.conf [14:55:58] debug: registering database 'local' [14:55:58] debug: opening database 'local' [14:55:58] debug: opening database from path '/usr/local/var/lib/pacman/local/' loading package data... [14:55:58] debug: loading target 'largepackage-1-3-i686.pkg.tar.gz' [14:55:58] debug: reading 'largepackage' metadata done. checking dependencies... [14:56:58] debug: looking for unsatisfied dependencies [14:56:58] debug: loading package cache for repository 'local' [14:56:58] debug: cannot find package installed 'largepackage' [14:56:58] debug: looking for conflicts [14:56:58] debug: checkconflicts: db vs target 'largepackage' [14:56:59] debug: sorting by dependencies [14:56:59] debug: started sorting dependencies [14:56:59] debug: sorting dependencies finished done. checking for file conflicts... [14:56:59] debug: looking for file conflicts [14:56:59] debug: searching for filesystem conflicts: largepackage [14:56:59] debug: /opt/ is a directory, not a conflict [14:56:59] debug: /opt/largefile is a directory, not a conflict done. installing largepackage... [14:56:59] debug: adding package largepackage-1-3 [14:56:59] debug: extracting files [14:56:59] debug: decompression progress: 0.001907% (40960 / -2146827972) [14:56:59] debug: decompression progress: 0.001907% (40960 / -2146827972) [14:56:59] debug: decompression progress: 0.001907% (40960 / -2146827972) [14:56:59] debug: extracting /opt/ [14:56:59] debug: warning extracting opt/ (Already exists: File exists) [14:56:59] debug: decompression progress: 0.001907% (40960 / -2146827972) [14:56:59] debug: extracting /opt/largefile [14:59:25] debug: updating database [14:59:25] debug: adding database entry 'largepackage' [14:59:25] debug: writing largepackage-1-3 DESC information back to db [14:59:25] debug: writing largepackage-1-3 FILES information back to db [14:59:25] debug: writing largepackage-1-3 DEPENDS information back to db [14:59:25] debug: adding entry 'largepackage' in 'local' cache [14:59:25] debug: package has no dependencies, no other packages to update done. [14:59:25] debug: running "ldconfig -r /" Here is the package filelist: opt/ (directory) opt/largefile (a 2GB sized normal file) Notice what the above output says- that /opt/largefile is a directory, not a conflict. Clearly a problem here. This is pacman built off my working branch, so not including any recent patches from Andrew or Chantry with regards to the overwrite stuff. -Dan

4 9

[pacman-dev] Pointless public/private functions
by Andrew Fyfe 27 Jul '07

27 Jul '07

Throughout the libalpm and pacman code there's a lot of public functions that simply wrap a private function (maybe with some asserts). What's the point? Why not have the asserts in the private function and make the private function public reducing the number of function being called? Andrew

3 2

[pacman-dev] Parsing config file question
by Andrew Fyfe 27 Jul '07

27 Jul '07

Why does pacman do this... if(strcmp(key, "ShowSize") == 0 || strcmp(upperkey, "SHOWSIZE") == 0) Is there any reason why we can't do... if(strcmp(upperkey, "SHOWSIZE") == 0) Andrew PS Just found the ILoveCandy option :D

3 4

[pacman-dev] po file for es translation
by Juan Pablo González T. 26 Jul '07

26 Jul '07

Hi, an update to the spanish translation of pacman attached to this mail. __________________________________________________ Correo Yahoo! Espacio para todos tus mensajes, antivirus y antispam ¡gratis! Regístrate ya - http://correo.espanol.yahoo.com/

2 1

[pacman-dev] [PATCH] Fix gettext output in repo-{add,remove}
by Andrew Fyfe 26 Jul '07

26 Jul '07

Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/repo-add.sh.in | 29 ++++++++++++++--------------- scripts/repo-remove.sh.in | 21 ++++++++++----------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0992b9d..f8c5de2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -28,7 +28,6 @@ myver='@PACKAGE_VERSION@' FORCE=0 REPO_DB_FILE="" -TMP_DIR="" # print usage instructions usage() { @@ -136,14 +135,14 @@ db_write_entry() # ensure $pkgname and $pkgver variables were found if [ -z "$pkgname" -o -z "$pkgver" ]; then - echo "$(gettext " error: invalid package file")" + printf "$(gettext " error: invalid package file")\n" return 1 fi # remove any other package in the DB with same name for existing in *; do if [ "${existing%-*-*}" = "$pkgname" ]; then - echo "$(gettext ":: removing existing package '%s'")" $existing + printf "$(gettext ":: removing existing package '%s'")\n" "$existing" rm -rf $existing fi done @@ -153,7 +152,7 @@ db_write_entry() cd "$pkgname-$pkgver" # create desc entry - echo "$(gettext ":: creating 'desc' db entry")" + printf "$(gettext ":: creating 'desc' db entry")\n" echo -e "%FILENAME%\n$(basename $1)\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc @@ -171,7 +170,7 @@ db_write_entry() # compute checksums for chk in ${DB_CHECKSUMS[@]}; do name="$(checksum_name $chk)" - echo "$(gettext ":: computing %s checksums")" $name + printf "$(gettext ":: computing %s checksums")\n" "$name" if [ -n "$name" ]; then echo -e "%$name%\n$(get_checksum $chk $pkgfile)\n" >>desc fi @@ -240,7 +239,7 @@ fi if [ -r @sysconfdir@/makepkg.conf ]; then source @sysconfdir@/makepkg.conf else - echo "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")" >&2 + printf "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")\n" >&2 exit 1 # $E_CONFIG_ERROR fi @@ -251,7 +250,7 @@ fi # main routine if [ $# -gt 1 ]; then gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - echo "$(gettext "cannot create temp directory for database building")"; \ + printf "$(gettext "cannot create temp directory for database building")\n"; \ exit 1) success=0 @@ -262,18 +261,18 @@ if [ $# -gt 1 ]; then elif [ -z "$REPO_DB_FILE" ]; then REPO_DB_FILE="$(readlink -f $arg)" if ! test_repo_db_file; then - echo "$(gettext "error: repository file '%s' is not a proper pacman db")" $REPO_DB_FILE + printf "$(gettext "error: repository file '%s' is not a proper pacman db")\n" "$REPO_DB_FILE" exit 1 elif [ -f "$REPO_DB_FILE" ]; then - echo "$(gettext ":: extracting database to a temporary location")" + printf "$(gettext ":: extracting database to a temporary location")\n" bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" fi else if [ -f "$arg" ]; then if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then - echo "$(gettext "error: '%s' is not a package file, skipping")" $arg + printf "$(gettext "error: '%s' is not a package file, skipping")\n" "$arg" else - echo "$(gettext ":: adding package '%s'")" $arg + printf "$(gettext ":: adding package '%s'")\n" "$arg" this_dir="$(pwd)" if db_write_entry "$arg"; then @@ -282,14 +281,14 @@ if [ $# -gt 1 ]; then cd $this_dir fi else - echo "$(gettext "error: package '%s' not found")" $arg + printf "$(gettext "error: package '%s' not found")\n" "$arg" fi fi done # if all operations were a success, rezip database if [ "$success" = "1" ]; then - echo "$(gettext ":: creating updated database file %s")" ${REPO_DB_FILE} + printf "$(gettext ":: creating updated database file %s")\n" "$REPO_DB_FILE" cd $gstmpdir if [ -n "$(ls)" ]; then [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" @@ -297,12 +296,12 @@ if [ $# -gt 1 ]; then case "$DB_COMPRESSION" in gz) bsdtar -c * | gzip -9 >$REPO_DB_FILE ;; bz2) bsdtar -c * | bzip2 -9 >$REPO_DB_FILE ;; - *) echo "$(gettext "warning: no compression set")" + *) printf "$(gettext "warning: no compression set")\n" bsdtar -c * >$REPO_DB_FILE;; esac fi else - echo "$(gettext ":: no packages modified, nothing to do")" + printf "$(gettext ":: no packages modified, nothing to do")\n" fi fi diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index 7943b2b..49ff358 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -28,7 +28,6 @@ myver='@PACKAGE_VERSION@' FORCE=0 REPO_DB_FILE="" -TMP_DIR="" # print usage instructions usage() { @@ -66,7 +65,7 @@ db_remove_entry() # remove any other package in the DB with same name for existing in *; do if [ "${existing%-*-*}" = "$1" ]; then - echo "$(gettext ":: removing existing package '%s'")" $existing + printf "$(gettext ":: removing existing package '%s'")\n" "$existing" rm -rf $existing fi done @@ -96,7 +95,7 @@ fi if [ -r @sysconfdir@/makepkg.conf ]; then source @sysconfdir@/makepkg.conf else - echo "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")" >&2 + printf "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")\n" >&2 exit 1 # $E_CONFIG_ERROR fi @@ -107,7 +106,7 @@ fi # main routine if [ $# -gt 1 ]; then gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - echo "$(gettext "cannot create temp directory for database building")"; \ + printf "$(gettext "cannot create temp directory for database building")\n"; \ exit 1) success=0 @@ -116,20 +115,20 @@ if [ $# -gt 1 ]; then if [ -z "$REPO_DB_FILE" ]; then REPO_DB_FILE="$(readlink -f $arg)" if ! test_repo_db_file; then - echo "$(gettext "error: repository file '%s' is not a proper pacman db")" $REPO_DB_FILE + printf "$(gettext "error: repository file '%s' is not a proper pacman db")\n" "$REPO_DB_FILE" exit 1 elif [ -f "$REPO_DB_FILE" ]; then - echo "$(gettext ":: extracting database to a temporary location")" + printf "$(gettext ":: extracting database to a temporary location")\n" bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" fi else - echo "$(gettext ":: searching for package '%s'")" + printf "$(gettext ":: searching for package '%s'")\n" this_dir="$(pwd)" if db_remove_entry "$arg"; then success=1 else - echo "$(gettext "error: package matching '%s' not found")" $arg + printf "$(gettext "error: package matching '%s' not found")\n" "$arg" fi cd $this_dir fi @@ -137,7 +136,7 @@ if [ $# -gt 1 ]; then # if all operations were a success, rezip database if [ "$success" = "1" ]; then - echo "$(gettext ":: creating updated database file %s")" ${REPO_DB_FILE} + printf "$(gettext ":: creating updated database file %s")\n" "$REPO_DB_FILE" cd $gstmpdir if [ -n "$(ls)" ]; then [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" @@ -145,12 +144,12 @@ if [ $# -gt 1 ]; then case "$DB_COMPRESSION" in gz) bsdtar -c * | gzip -9 >$REPO_DB_FILE ;; bz2) bsdtar -c * | bzip2 -9 >$REPO_DB_FILE ;; - *) echo "$(gettext "warning: no compression set")" + *) printf "$(gettext "warning: no compression set")\n" bsdtar -c * >$REPO_DB_FILE;; esac fi else - echo "$(gettext ":: no packages modified, nothing to do")" + printf "$(gettext ":: no packages modified, nothing to do")\n" fi fi -- 1.5.2.4

2 1

[pacman-dev] [patch] sync_prepare clean-up I: 2in1 -Se bugfix (fwd)
by Nagy Gabor 24 Jul '07

24 Jul '07

Hi! The pactest shows 2 bugs: Pacman should add pkg3 to the transaction, because pkg2 depends on pkg3 (bug1), but at least checkdeps should show that a dependency is missing (bug2): here a wrong variable (list) is passed to checkdeps. The patch is designed for bugfix for bug1, but also fixes bug2. Bye, ngaba

2 4