- Pacman-dev - lists.archlinux.org

[pacman-dev] [translation] zh_CN
by Lyman 29 Oct '08

29 Oct '08

As attached, it is a git diff file. (Generated by "git diff po/zh_CN.po lib/libalpm/po/zh_CN.po > zh_CN", please correct me if I was wrong since I am new to git). Wish it could be useful :) Changes: * add n$ into %s to identify the sequence if there are 2 or more parameters in translated sentence * clean up fuzzy translation * some typo/format corrected Sorry for possible duplicate send since last one enclosed a uncompressed diff file which exceeded 40k limit of the mail list. -- Lyman Li http://lymanrb.blogspot.com

2 1

[pacman-dev] [PATCH] makepkg: fix updating PKGBUILD when building SCM packages
by Allan McRae 29 Oct '08

29 Oct '08

Fixes a bug and resets pkgrel to 1 when bumping pkgver Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5735891..52784b6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1094,6 +1094,7 @@ devel_check() { if [ "$newpkgver" != "" ]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" pkgver=$newpkgver + pkgrel=1 fi else @@ -1113,8 +1114,9 @@ devel_update() { # _foo=pkgver # if [ "$newpkgver" != "" ]; then - if [ "newpkgver" != "$pkgver" ]; then + if [ "$newpkgver" != "$pkgver" ]; then sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT source $BUILDSCRIPT fi fi -- 1.6.0.3

2 1

[pacman-dev] [PATCH] makepkg: fix updating PKGBUILD when building SCM packages
by Allan McRae 28 Oct '08

28 Oct '08

Fixes a bug and resets pkgrel to 1 when bumping pkgver Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5735891..e8add36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1113,8 +1113,9 @@ devel_update() { # _foo=pkgver # if [ "$newpkgver" != "" ]; then - if [ "newpkgver" != "$pkgver" ]; then + if [ "$newpkgver" != "$pkgver" ]; then sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT source $BUILDSCRIPT fi fi -- 1.6.0.3

1 1

[pacman-dev] A quiestion on translation
by Lyman 28 Oct '08

28 Oct '08

Hi, I noticed some translation flaw of pacman and wish to correct it. I followed the instruction as this link http://www.archlinux.org/pacman/translation-help.html and get the updated po file (to be exact, zh_CN.po). Here's the problem when I open this po file: I don't know how to identify parameter with sequence. For example, when I need to translate a sentence msgid ":: Replace %s with %s/%s?" into the form of msgstr ":: Use %s/%s to replace %s?" How could tell which %s is which. This does happens when translating English into Chinese and there are such bugs in zh_CN.po right now. I've searched for a while and found that different projects might use different policies. In KDE people uses msgid "%1 articles match rule %2" msgstr "匹配规则 %2 的文章有 %1 个" and in Gnome people uses msgid "%d articles match rule %d" msgstr "匹配规则 %2$d 的文章有 %1$d 个" What about pacman? Thanks. -- Lyman Li http://lymanrb.blogspot.com

3 3

[pacman-dev] [ABS PATCH] Allow syncing the ABS tree using tarballs
by Allan McRae 26 Oct '08

26 Oct '08

I figured I'd post this here for comments seem it is a fairly decent sized patch. Thanks, Allan Some people are stuck behind restrictive firewalls and can not sync the ABS tree using rsync. This patch adds support for downloading ABS snapshot tarballs from pacman mirrors. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- abs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- conf/abs.conf | 7 ++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/abs b/abs index bd1191d..a369482 100755 --- a/abs +++ b/abs @@ -80,6 +80,7 @@ usage() { echo "Options:" echo " -h, --help Display this help message then exit." echo " -V, --version Display version information then exit." + echo " -t, --tarball Sync ABS tree using tarballs from your pacman mirror." echo echo "abs will synchronize PKGBUILD scripts from the Arch Linux repositories" echo "into $ABSROOT via rsync. If no argument is given, abs will synchronize" @@ -97,7 +98,7 @@ version() { echo "There is NO WARRANTY, to the extent permitted by law." } -update() { +update_rsync() { cd "$ABSROOT" if [ "$CLPARAM" = "" ]; then @@ -138,6 +139,48 @@ update() { $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/${ARCH}/ $ABSROOT } +update_tarball() { + cd "$ABSROOT" + + if [ ! "$(type -p rsync)" ]; then + error "missing wget download utility. Install wget." + exit $_E_MISSING_PROGRAM + fi + + if [ -f "$MIRRORLIST" ]; then + mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d" ") + else + error "Could not find pacman mirrorlist file $MIRRORLIST" + exit $_E_CONFIG_ERROR + fi + + msg "Downloading tarballs..." + for repo in "${REPOS[@]}"; do + if [ "$repo" == "${repo#!}" ]; then + echo " ==> ${repo}..." + + ret=0 + for mirror in ${mirrorlist[@]}; do + tarball=$(echo $mirror | sed "s#\$repo#$repo#") + tarball="${tarball}/${repo}.abs.tar.gz" + wget -q $tarball || ret=$? + if [ $ret -eq 0 ]; then + break + fi + done + + if [ $ret -ne 0 ]; then + echo " Download failed" + continue + fi + + rm -rf $repo + tar -xzf ${repo}.abs.tar.gz + rm ${repo}.abs.tar.gz + fi + done +} + ## # Signal Traps ## @@ -148,8 +191,8 @@ trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR ## # Parse Options ## -OPT_SHORT="hV" -OPT_LONG="help,version" +OPT_SHORT="hVt" +OPT_LONG="help,version,tarball" OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then # This is a small hack to stop the script bailing with 'set -e' @@ -162,6 +205,7 @@ while true; do case "$1" in -h|--help) usage; exit $_E_OK;; -V|--version) version; exit $_E_OK;; + -t|--tarball) TARBALL=1;; --) OPT_IND=0; shift; break;; *) usage; exit $_E_INVALID_OPTION;; @@ -195,7 +239,11 @@ fi ## # Go-go Update ABS tree! ## -update +if [ "$TARBALL" ]; then + update_tarball +else + update_rsync +fi exit $_E_OK diff --git a/conf/abs.conf b/conf/abs.conf index 7d5fd79..6511a58 100644 --- a/conf/abs.conf +++ b/conf/abs.conf @@ -1,5 +1,5 @@ # -# /etc/abs/abs.conf +# /etc/abs.conf # # the top-level directory of all your PKGBUILDs @@ -17,6 +17,11 @@ SYNCSERVER="rsync.archlinux.org" ARCH="i686" # +# Pacman mirror list used for syncing via tarball +# +MIRRORLIST="/etc/pacman.d/mirrorlist" + +# # REPOS to be parsed by abs (in this order) # (prefix a repo with a ! to disable it) # -- 1.6.0.3

3 3

[pacman-dev] [PATCH] Provides a MAN_DIRS variable much like DOC/STRIP_DIRS. I need that for a package that install manpages in a non-standard place (/opt/devkitpro/devkitPPC/man/...).
by Tiago Pierezan Camargo 25 Oct '08

25 Oct '08

Signed-off-by: Tiago Pierezan Camargo <tcamargo(a)gmail.com> --- doc/makepkg.conf.5.txt | 7 +++++++ etc/makepkg.conf.in | 2 ++ scripts/makepkg.sh.in | 9 ++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ca9df02..d6dd7dd 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -136,6 +136,13 @@ Options that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. +**MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: + If "zipman" is specified in the OPTIONS array, this variable will + instruct makepkg where to look to compress manpages and docs. If you + build packages that are located in opt/, you may need to add the + directory to this array. *NOTE:* Do not add the leading slash to + the directory name. + **STRIP_DIRS=(**bin lib sbin usr/{bin,lib} ...**)**:: If "strip" is specified in the OPTIONS array, this variable will instruct makepkg where to look to for files to strip. If you build diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 7eb647b..43f03b4 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -73,6 +73,8 @@ OPTIONS=(strip !docs libtool emptydirs zipman) INTEGRITY_CHECK=(md5) #-- Doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Manpage directories to compress (if option set correctly above) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..2fa64ea 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -714,9 +714,8 @@ tidy_install() { if [ "$(check_option zipman)" = "y" ]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage mandirs ext file link hardlinks hl - mandirs=({usr{,/local}{,/share},opt/*}/{man,info}) - find ${mandirs[@]} -type f 2>/dev/null | + local manpage ext file link hardlinks hl + find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) if [ -f ${manpage} ]; then @@ -724,7 +723,7 @@ tidy_install() { file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find ${mandirs[@]} -lname "$file" 2>/dev/null | + find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" ln -sf "${file}.gz" "${link}.gz" @@ -732,7 +731,7 @@ tidy_install() { # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist - hardlinks="$(find ${mandirs[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true + hardlinks="$(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true for hl in ${hardlinks}; do rm -f "${hl}"; done -- 1.6.0.2

3 5

[pacman-dev] [PATCH] Fix memleaks in front-end caused by dynamic memory allocation
by Nagy Gabor 25 Oct '08

25 Oct '08

http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/working I know you may not like this way (free functions public), but IMHO the result is not so ugly ;-) Off-topic: A small thing. During working on this patch I realized, that "\nerrors occurred, no packages were upgraded.\n" message is printed after -U fileconflict error only. Is this intentional? (Anyway, IMHO that message is useless.) Bye ------------------------------------------------------ SZTE Egyetemi Konyvtar - http://www.bibl.u-szeged.hu This message was sent using IMP: http://horde.org/imp/

3 3

[pacman-dev] Addition of a new package in a package group and how pacman handles it
by wg2k 23 Oct '08

23 Oct '08

Hey all I will briefly describe the situation: yesterday, Gnome 2.24 hit the repos. I issued "pacman -Suy" and, lo and behold, next time I logged in I was running Gnome 2.24. So far so good. But then I noticed that certain parts of Gnome were not there at all! It turns out, it doesn't matter if I have originally installed the package group named gnome and gnome-extras, their contents have changed (new packages added) but I did not get the new packages. Instead I had to issue a pacman -Suy --needed gnome gnome-extras in order to get the full package list. Now, I was wondering if this is on purpose or not and in my humble opinion, this is very counter-intuitive. When I first issued the "full upgrade" command, I didn't merely expect the system to bring all my packages to the latest version, I expected to have a "current" system, exactly as it would be if I had done a clean install. In fact, that's the main reason for choosing Arch: the fact that it is rolling release! This means, I expected the package manager to be smart enough to say "Aha, he wanted gnome and gnome-extras back then and I see no reason for him to *not* want the new gnome and gnome-extras now, let's install them!" Granted, this could be circumvented by issuing: $pacman --needed -Suy gnome gnome-extras but why should I be on the lookout for when a new gnome is out, for instance? Isn't that the job of the package manager? Here's an idea: why not keep track of package groups the user has *explicitly* installed and then by doing a "full-full upgrade" (let's say pacman -Syuu, double u), bring the new packages in? I could also argue that this behaviour should be the default one. Thoughts?

2 3

Re: [pacman-dev] [arch-general] System upgrade problems
by Dan McGee 23 Oct '08

23 Oct '08

On Thu, Oct 23, 2008 at 11:38 AM, Louis Brazeau <lbrazeau(a)gmail.com> wrote: > On Thu, Oct 23, 2008 at 11:13 AM, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: >> Can you run with --debug and show us the output? >> > > Aaron Griffin is trying to help me with my problem! I feel blessed :) > > The output of --debug is quite long so I thought I'd better put it on > pastebin. Here's the link : > > http://pastebin.com/m3c97b0aa Hmm, here is the relevant code from lib/libalpm/sync.c. You can see this error gets thrown if filename is null, which means alpm_pkg_get_filename() returned null on that particular package. Do you have any custom repos enabled that could potentially have invalid filename fields? /** Compute the size of the files that will be downloaded to install a * package. * @param newpkg the new package to upgrade to */ static int compute_download_size(pmpkg_t *newpkg) { const char *fname; char *fpath; off_t size = 0; fname = alpm_pkg_get_filename(newpkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));

2 1

[pacman-dev] [PATCH] Correctly close the pipe used for scriptlet execution
by Dan McGee 19 Oct '08

19 Oct '08

We never had a call to pclose() in here before, leaving our file descriptor in some sort of limbo state. In addition, clean up some of the other logic such as directly calling exit(1) on a popen() failure rather than going to our cleanup block, and handling and respecting the exit status of the subprocess correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 73ae822..96ac1bc 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -551,8 +551,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, if(!pipe) { _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), strerror(errno)); - retval = 1; - goto cleanup; + exit(1); } while(!feof(pipe)) { char line[PATH_MAX]; @@ -561,7 +560,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn, alpm_logaction("%s", line); EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); } - exit(0); + retval = pclose(pipe); + exit(WEXITSTATUS(retval)); } else { /* this code runs for the parent only (wait on the child) */ pid_t retpid; -- 1.6.0.2

1 0