- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.1-53-ge81dec9
by Dan McGee 06 Feb '08

06 Feb '08

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 e81dec9b8c65f7c882f5f447cdc117783259f4a4 (commit) via eca30ed66accd7c1555eb94cbdea60051efcf7f3 (commit) via b29838c8250125a22016c16180e941d059d55539 (commit) via 7d7a33791211b26d69bcf3c23174250dd14e9486 (commit) via 93a3050ed9e9735352013014da52adcdf896f95f (commit) via a7a9f37561b45d2d2900b4c419ac3b9f0c7f2d75 (commit) via 7069b96173aa256d1c2eaed2d21811639e10e566 (commit) via 69bc5ea5e28086c8eea6808be2be3c84b555863b (commit) via 96ee1bca2473ea32d647db0464653424e34b1e91 (commit) via 37bb99abfa5672e101e34579882e22c7a1016a9b (commit) via 5d03a6fd94c17442e05574b918970dfe12400cfa (commit) via 4fad7855fae4a01b265c7d28c12b995a19ebc72d (commit) via 7786bf6024b6fbf13ba474aaa24613f2079d8cef (commit) from c492ca840c54d8d45d5916a280f2119c363e0aba (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 e81dec9b8c65f7c882f5f447cdc117783259f4a4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Feb 2 23:24:49 2008 +0100 remove --force option from repo-add. The force option should only be specified in the PKGBUILD with options=(force). This information should be handled like any other meta info, and there is no need to have a special repo-add option for it. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: fix up a few more references in contrib/ scripts, etc] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eca30ed66accd7c1555eb94cbdea60051efcf7f3 Merge: 93a3050ed9e9735352013014da52adcdf896f95f b29838c8250125a22016c16180e941d059d55539 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 5 19:31:23 2008 -0600 Merge branch 'maint' Conflicts: contrib/gensync contrib/updatesync commit 93a3050ed9e9735352013014da52adcdf896f95f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 5 17:57:17 2008 -0600 Remove "Installed Size" hackeration Keeping this hack around where installed size is only shown if it is greater than total download size encourages broken repository databases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5d03a6fd94c17442e05574b918970dfe12400cfa Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 2 14:16:47 2008 -0600 Remove gettext calls from gensync/updatesync Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4fad7855fae4a01b265c7d28c12b995a19ebc72d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 2 14:09:22 2008 -0600 Remove gensync and updatesync from normal distribution Move these two scripts into contrib/, and start the process of de-automaking them by removing the @sysconfdir@ references and the gettext initialization. The removal of all gettext will soon follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: ChangeLog.proto | 16 ++++++ Makefile.am | 2 +- contrib/Makefile.am | 2 + contrib/README | 4 ++ scripts/gensync.sh.in => contrib/gensync | 63 ++++++++---------------- scripts/updatesync.sh.in => contrib/updatesync | 61 ++++++++--------------- doc/makepkg.8.txt | 14 +++++- doc/repo-add.8.txt | 12 +---- po/POTFILES.in | 2 - scripts/.gitignore | 2 - scripts/Makefile.am | 10 +--- scripts/makepkg.sh.in | 3 + scripts/repo-add.sh.in | 14 ++--- scripts/repo-remove.sh.in | 4 +- src/pacman/add.c | 5 +- src/pacman/query.c | 15 ++++-- src/pacman/remove.c | 4 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 34 +++++++++++-- src/pacman/util.h | 1 + 20 files changed, 138 insertions(+), 132 deletions(-) create mode 100644 ChangeLog.proto delete mode 100644 contrib/.gitignore rename scripts/gensync.sh.in => contrib/gensync (67%) mode change 100644 => 100755 rename scripts/updatesync.sh.in => contrib/updatesync (61%) mode change 100644 => 100755 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pmtransconv_t + cb_trans_conv
by Nagy Gabor 05 Feb '08

05 Feb '08

Hi! Some background: FS#7524 and http://bbs.archlinux.org/viewtopic.php?id=42959 So I decided to rephrase our questions and messages to give more information about what happening "inside". Then I soon ran into the question: "Is pmtransconv_t needed?". Why do we restrict ourselves to some pre-defined questions? The question string [char *] should also work, and then the front-end could put a " [Y/n]" after the question (or add yes/no buttons in a graphic dialog box). But after looking into cb_trans_conv I got the answer: the front-end must know the "meaning" of the question to apply its --no-confirm or (removed) --ask rules. I also saw in the comment, that function is tagged as ugly. My compromise: let the backend formulate the question (snprintf + pass char* question param or by using va_list) and keep this pmtransconv_t. An example: PM_TRANS_CONV_CONFLICT_PKG: "foo [pulled dependency] conflicts with bar. Do you remove bar?" Or we could use a more general PM_TRANS_CONV_REMOVE_LOCAL type... Opinions, ideas? Bye

2 3

[pacman-dev] [PATCH] Clarify remove error message.
by Chantry Xavier 05 Feb '08

05 Feb '08

Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/remove.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 56837fa..ee4e84a 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -108,8 +108,7 @@ int pacman_remove(alpm_list_t *targets) char *targ = alpm_list_getdata(i); if(alpm_trans_addtarget(targ) == -1) { printf("failed.\n"); - fprintf(stderr, _("error: failed to add target '%s' (%s)\n"), targ, - alpm_strerrorlast()); + fprintf(stderr, _("error: could not find '%s' to remove\n"), targ); remove_cleanup(); FREELIST(finaltargs); return(1); -- 1.5.4.rc4

4 7

[pacman-dev] gensync and updatesync status
by Xavier 04 Feb '08

04 Feb '08

I am confused by all the db scripts we have : gensync, updatesync, repo-add, repo-remove. So I had a look a bit at git history. It seems like originally, there were only gensync and updatesync. Then repo-add and repo-remove were created, doing mostly what gensync and updatesync did. But then, gensync and updatesync were rewritten using repo-add and repo-remove. What this done for a compatibility purpose maybe? Are these two tools still use anywhere? I heard (from Dan ;)) that core/extra used didn't even use the scripts in pacman git repo, but the ones in dbscripts git repo instead. But that community did use repo-add. Do they use repo-add directly, or do they use updatesync? What bothers me here is that there is apparently a functionality that is only found in updatesync/gensync, not repo-add : force flag support. Apparently, updatesync need both the PKGBUILD and the package. It reads the PKGBUILD, look if the force option is specified, and then calls repo-add (with --force option if force flag was found) on the package. That sounds rather ugly. Why don't we handle this the more usual way? makepkg could add a force line in .PKGINFO if it finds the force option in the PKGBUILD. And then repo-add add the force flag if it finds it in .PKGINFO. After that, gensync and updatesync could be totally removed, right?

6 14

[pacman-dev] file owners and symlinks
by Xavier 03 Feb '08

03 Feb '08

bash-3.2$ pacman -Ql jre jdk | grep "/java$" jre /opt/java/jre/bin/java jdk /opt/java/bin/java bash-3.2$ ls -l /opt/java/bin/java lrwxrwxrwx 1 root root 15 oct 4 22:59 /opt/java/bin/java -> ../jre/bin/java bash-3.2$ LANG=C pacman -Qo /opt/java/jre/bin/java /opt/java/jre/bin/java is owned by jdk 6u3-1 The -Qo operation calls realpath on both sides, and realpath(/opt/java/bin/java) = /opt/java/jre/bin/java, so it returns that /opt/java/jre/bin/java is owned by jdk, while in fact, jdk only owns a symlink that points to it. I think that realpath should only be called on the path (== dirname), not the whole thing (dirname + basename). That is, /opt/java/bin/ should be resolved, but not the java symlink itself. For implementing that, I would need a dirname function though. For basename, we have a mbasename function that was grabbed from uClibc source. Btw, what is the m for? And could we have mdirname also?

1 0

[pacman-dev] makepkg svn version discovery fails if the log message begins with r
by Jonathan 03 Feb '08

03 Feb '08

someone on irc discovered today that the ffmpeg-svn package failed to build with the odd error seen below... I am using the following version of pacman in archlinux (non-testing): Name : pacman Version : 3.1.1-1 Architecture : i686 Build Date : Sun 20 Jan 2008 07:51:41 PM PST $ makepkg ==> Determining latest svn revision... -> Version found: 11825 emove sed: -e expression #1, char 28: unterminated `s' command makepkg --holdver with old and new versions built ok. the suspect line in makepkg: newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r$[^ ]* $ .*$/\1/p') here's the svn log at the time: ------------------------------------------------------------------------ r11825 | lorenm | 2008-02-02 19:21:47 -0800 (Sat, 02 Feb 2008) | 2 lines remove some movq in ff_h264_idct8_add_mmx. 288->280 cycles on core2. ------------------------------------------------------------------------ while a full reproduction requires a controlled svn server, a test can be done with this: $ svn log -r 11825 --limit 1 svn://svn.mplayerhq.hu/ffmpeg/trunk | sed -n 's/^r$[^ ]*$ .*$/\1/p' 11825 emove the following is a patch that forces sed to test only the second line of the log. while this works, it will break if the log header is reformatted in the future. But I couldn't find any documentation on how to change the format, or any variations in the logs of the handful of svn servers I've looked at. So it seems ok to do this. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0997386..bd6a7fe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1007,7 +1007,7 @@ devel_check() { newpkgver=$(date +%Y%m%d) elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then msg "$(gettext "Determining latest svn revision...")" - newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r$[0-9]* $ .*$/\1/p') + newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n '2s/^r$[0-9]* $ .*$/\1/p') elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) Jonathan Frazier

3 2

[pacman-dev] [PATCH] repo-remove: print an error in case of an empty db
by Chantry Xavier 03 Feb '08

03 Feb '08

When removing the last packages from a database, repo-remove silently failed. Now an error is printed. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- scripts/repo-remove.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index 05bec39..a2c4095 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@' myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' -FORCE=0 REPO_DB_FILE="" msg() { @@ -169,6 +168,8 @@ if [ $success -eq 1 ]; then esac bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * + else + error "$(gettext "Cannot create an empty archive... Aborting")" fi popd 2>&1 >/dev/null -- 1.5.4.rc4

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.1-10-g7cfb343
by Dan McGee 02 Feb '08

02 Feb '08

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, maint has been updated via 7cfb343b0fed556e82b6fbc81047c5461effab84 (commit) from b1103a3eaf0c6bb2982ac90000628baa2d5c2079 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: proto.install | 57 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 28 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.1-40-gc492ca8
by Dan McGee 02 Feb '08

02 Feb '08

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 c492ca840c54d8d45d5916a280f2119c363e0aba (commit) via 7cfb343b0fed556e82b6fbc81047c5461effab84 (commit) via b1103a3eaf0c6bb2982ac90000628baa2d5c2079 (commit) via 5647f7f512380200175675bc2fa5fa2e5892d997 (commit) via c028014f96911930bf3b7dce08c0fe997cedfc69 (commit) from 1fc83f4af6d827bf2e69c7a10e3d2010c9211974 (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 c492ca840c54d8d45d5916a280f2119c363e0aba Merge: 5647f7f512380200175675bc2fa5fa2e5892d997 7cfb343b0fed556e82b6fbc81047c5461effab84 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 2 13:39:50 2008 -0600 Merge branch 'maint' commit 5647f7f512380200175675bc2fa5fa2e5892d997 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 2 09:53:18 2008 -0600 Update libtool version (1.5.24 -> 1.5.26) Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: config.guess | 36 ++++++++++++++++++---------- config.sub | 48 +++++++++++++++++++++++++++++++------ configure.ac | 1 - ltmain.sh | 58 +++++++++++++++++++++++++++++++++------------ proto.install | 57 +++++++++++++++++++++++---------------------- scripts/makepkg.sh.in | 2 +- scripts/updatesync.sh.in | 14 +++++++---- 7 files changed, 144 insertions(+), 72 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.1-9-gb1103a3
by Dan McGee 02 Feb '08

02 Feb '08

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, maint has been updated via b1103a3eaf0c6bb2982ac90000628baa2d5c2079 (commit) from c028014f96911930bf3b7dce08c0fe997cedfc69 (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 b1103a3eaf0c6bb2982ac90000628baa2d5c2079 Author: Alex Merry <huntedhacker(a)tiscali.co.uk> Date: Sat Feb 2 10:09:06 2008 -0600 updatesync: incorrect package deletion logic Fixes FS#9279. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/updatesync.sh.in | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0