- Pacman-dev - lists.archlinux.org

[pacman-dev] Package/repo priority
by Nagy Gabor 29 Mar '07

29 Mar '07

Hi! AFAIK, if a 'foo' package exists in more than one repo (both in extra and testing for example), then the repo which the package will be installed from is undefined (probably the first repo in pacman.conf). That would be nice, if we somehow could choose our source repo for 'foo'. I don't know how can this be implemented easily, but some suggestions: 'pacman -S repo/foo' or an option to change repo-priority (which is probably defined by their order in pacman.conf) or pacman could ask the user which package is going to be installed (however, this can be annoying). You may say that I shouldn't use 2 "intersecting" repos, but similar problem occurs in case of (multiple) provided packages, where "ask" seems to be the only usable solution. Anyway, using multiple repos can be useful (but not so efficient now): For example I'm using current, extra and community repos; yes, sometimes there are some buggy packages in current, it these cases that would be comfortable, if I can easily override my default current repo to 0.7.1 for example and downgrading my package or trying a newer one from testing. Bye, Nagy Gabor One more addition to the last example: Some mirrors keep older versions of packages, for example see ftp://ftp.estpak.ee/pub/archlinux/current/os/i686/, and it would be handy if there would be an other db to these repos (which would contain all older versions of packages), and here comes to picture the multiple packages problem again. For example in these cases the latest version should be the default target and user could override this.

3 5

[pacman-dev] [patch] makepkg3 -- Reduced fakeroot usage (take 2)
by Andrew Fyfe 29 Mar '07

29 Mar '07

Hi, The last set of patches were made late at night and contain several bugs. So I've redone them. I've split the patches up a bit more as well to make the changes clearer. The *-move.patch files just move large chunks into functions, the *-cleanup.patch files remove the fakeroot code. The number at the beginning denotes what order the patches should be applied in. I've tested these patches out against my base repo and all works as expected. It should fix all the fakeroot problems people are having, how ever I've never encountered the problem described on FS#6208. Andrew ------------------------------------------------------------ revno: 4 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:25:18 +0100 message: * Moved create package commands into create_package() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:34:35.489021785 +0100 +++ new/scripts/makepkg 2007-03-25 19:35:55.929605832 +0100 @@ -348,6 +348,95 @@ fi } +create_package () { + # get some package meta info + builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + if [ "$PACKAGER" != "" ]; then + packager="$PACKAGER" + else + packager="Arch Linux (http://www.archlinux.org)" + fi + size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + + # build a filelist - do this first to keep meta files out of the list + msg "Generating .FILELIST file..." + cd "$startdir/pkg" + tar cvf /dev/null * | sort >.FILELIST + + # write the .PKGINFO file + msg "Generating .PKGINFO file..." + cd "$startdir/pkg" + echo "# Generated by makepkg $myver" >.PKGINFO + echo -n "# " >>.PKGINFO + date >>.PKGINFO + echo "pkgname = $pkgname" >>.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 + if [ "$CARCH" != "" ]; then + echo "arch = $CARCH" >>.PKGINFO + fi + + for it in "${license[@]}"; do + echo "license = $it" >>.PKGINFO + done + for it in "${replaces[@]}"; do + echo "replaces = $it" >>.PKGINFO + done + for it in "${groups[@]}"; do + echo "group = $it" >>.PKGINFO + done + for it in "${depends[@]}"; do + echo "depend = $it" >>.PKGINFO + done + for it in "${conflicts[@]}"; do + echo "conflict = $it" >>.PKGINFO + done + for it in "${provides[@]}"; do + echo "provides = $it" >>.PKGINFO + done + for it in "${backup[@]}"; do + echo "backup = $it" >>.PKGINFO + done + + # TODO maybe remove this at some point + # warn if license array is not present or empty + if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." + fi + + # check for an install script + if [ "$install" != "" ]; then + msg "Copying install script..." + cp "$startdir/$install" "$startdir/pkg/.INSTALL" + fi + + # do we have a changelog? + have_changelog=0 + if [ -f "$startdir/ChangeLog" ]; then + msg "Copying package changelog" + cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" + have_changelog=1 + fi + + # tar it up + msg "Compressing package..." + cd "$startdir/pkg" + + pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" + comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" + [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" + + if ! tar czf $pkg_file $comp_files *; then + error "Failed to create package file." + exit 1 + fi +} + installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." @@ -974,92 +1063,7 @@ find -depth -type d -empty -delete; fi -# get some package meta info -builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") -if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" -else - packager="Arch Linux (http://www.archlinux.org)" -fi -size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') - -# build a filelist - do this first to keep meta files out of the list -msg "Generating .FILELIST file..." -cd "$startdir/pkg" -tar cvf /dev/null * | sort >.FILELIST - -# write the .PKGINFO file -msg "Generating .PKGINFO file..." -cd "$startdir/pkg" -echo "# Generated by makepkg $myver" >.PKGINFO -echo -n "# " >>.PKGINFO -date >>.PKGINFO -echo "pkgname = $pkgname" >>.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 -if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO -fi - -for it in "${license[@]}"; do - echo "license = $it" >>.PKGINFO -done -for it in "${replaces[@]}"; do - echo "replaces = $it" >>.PKGINFO -done -for it in "${groups[@]}"; do - echo "group = $it" >>.PKGINFO -done -for it in "${depends[@]}"; do - echo "depend = $it" >>.PKGINFO -done -for it in "${conflicts[@]}"; do - echo "conflict = $it" >>.PKGINFO -done -for it in "${provides[@]}"; do - echo "provides = $it" >>.PKGINFO -done -for it in "${backup[@]}"; do - echo "backup = $it" >>.PKGINFO -done - -# TODO maybe remove this at some point -# warn if license array is not present or empty -if [ "$license" = "" ]; then - warning "Please add a license line to your $BUILDSCRIPT!" - plain "example for GPL'ed software: license=('GPL')." -fi - -# check for an install script -if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" -fi - -# do we have a changelog? -have_changelog=0 -if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 -fi - -# tar it up -msg "Compressing package..." -cd "$startdir/pkg" - -pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" -[ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - -if ! tar czf $pkg_file $comp_files *; then - error "Failed to create package file." - exit 1 -fi +create_package cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 5 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-create_package timestamp: Sun 2007-03-25 13:35:09 +0100 message: * cleaned up create_package() === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:25:18 +0000 +++ new/scripts/makepkg 2007-03-25 12:35:09 +0000 @@ -349,26 +349,26 @@ } create_package () { + cd "$startdir/pkg" + msg "Creating package..." + # get some package meta info - builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y") if [ "$PACKAGER" != "" ]; then - packager="$PACKAGER" + local packager="$PACKAGER" else - packager="Arch Linux (http://www.archlinux.org)" + local packager="Arch Linux (http://www.archlinux.org)" fi - size=$(du -cb "$startdir/pkg" | tail -n 1 | awk '{print $1}') + local size=$(du -sb | awk '{print $1}') # build a filelist - do this first to keep meta files out of the list - msg "Generating .FILELIST file..." - cd "$startdir/pkg" - tar cvf /dev/null * | sort >.FILELIST + msg2 "Generating .FILELIST file..." + tar -cvf /dev/null * | sort >.FILELIST # write the .PKGINFO file - msg "Generating .PKGINFO file..." - cd "$startdir/pkg" + msg2 "Generating .PKGINFO file..." echo "# Generated by makepkg $myver" >.PKGINFO - echo -n "# " >>.PKGINFO - date >>.PKGINFO + echo "# $(LC_ALL= LANG= date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO @@ -380,6 +380,7 @@ echo "arch = $CARCH" >>.PKGINFO fi + local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO done @@ -409,31 +410,31 @@ plain "example for GPL'ed software: license=('GPL')." fi + local comp_files + # check for an install script if [ "$install" != "" ]; then - msg "Copying install script..." - cp "$startdir/$install" "$startdir/pkg/.INSTALL" + msg2 "Copying install script..." + cp "$startdir/$install" .INSTALL + comp_files="$comp_files .INSTALL" fi # do we have a changelog? - have_changelog=0 if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package changelog" - cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" - have_changelog=1 + msg2 "Copying package changelog" + cp "$startdir/ChangeLog" .CHANGELOG + comp_files="$comp_files .CHANGELOG" fi # tar it up - msg "Compressing package..." - cd "$startdir/pkg" - - pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" - comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" - [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" - - if ! tar czf $pkg_file $comp_files *; then + msg2 "Compressing package..." + + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}" + comp_files="$comp_files .PKGINFO .FILELIST" + + if ! tar -czf "$pkg_file" $comp_files *; then error "Failed to create package file." - exit 1 + exit 1 # TODO: error code fi } ------------------------------------------------------------ revno: 6 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:44:23 +0100 message: * moved the following into tidy_install() - Remove info/doc files - Move usr/share/man to usr/man - Compress man pages - Strip binaries and libraries - Remove libtool files - Remove empty directories diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:39:05.156389252 +0100 +++ new/scripts/makepkg 2007-03-25 19:39:28.349710962 +0100 @@ -348,6 +348,67 @@ fi } +tidy_install () { + if [ "$(check_option docs)" = "n" ]; then + # remove info/doc files + msg "Removing info/doc files..." + cd "$startdir/pkg" + #fix flyspray bug #5021 + rm -rf ${DOC_DIRS[@]} + fi + + # move /usr/share/man files to /usr/man + if [ -d $startdir/pkg/usr/share/man ]; then + cd "$startdir" + mkdir -p pkg/usr/man + cp -a pkg/usr/share/man/* pkg/usr/man/ + rm -rf pkg/usr/share/man + fi + + # compress man pages + msg "Compressing man pages..." + find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do + ext="${i##*.}" + fn="${i##*/}" + if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then + # update symlinks to this manpage + find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do + rm -f "$ln" + ln -sf "${fn}.gz" "${ln}.gz" + done + # compress the original + gzip -9 "$i" + fi + done + + cd "$startdir" + + # strip binaries + if [ "$(check_option strip)" = "y" ]; then + msg "Stripping debugging symbols from libraries..." + find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + msg "Stripping symbols from binaries..." + find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + -exec /usr/bin/strip '{}' \; 2>&1 \ + | grep -v "No such file" | grep -v "format not recognized" + fi + + # remove libtool (.la) files + if [ "$(check_option libtool)" = "n" ]; then + msg "Removing libtool .la files..." + find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + fi + + # remove empty directories + if [ "$(check_option emptydirs)" = "n" ]; then + msg "Removing empty directories..." + cd "$startdir/pkg" + find -depth -type d -empty -delete; + fi +} + create_package () { cd "$startdir/pkg" msg "Creating package..." @@ -1005,64 +1066,7 @@ fi fi -if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" - #fix flyspray bug #5021 - rm -rf ${DOC_DIRS[@]} -fi - -# move /usr/share/man files to /usr/man -if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man -fi - -# compress man pages -msg "Compressing man pages..." -find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" - if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then - # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" - done - # compress the original - gzip -9 "$i" - fi -done - -cd "$startdir" - -# strip binaries -if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" -fi - -# remove libtool (.la) files -if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; -fi - -# remove empty directories -if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" - find -depth -type d -empty -delete; -fi +tidy_install create_package ------------------------------------------------------------ revno: 7 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-tidy_install timestamp: Sun 2007-03-25 13:53:16 +0100 message: * cleaned up tidy_install() * added 'LC_ALL=C LANG=C' to stip bin/lib find commands. On non en_US locales the greps can fail. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-25 12:44:23 +0000 +++ new/scripts/makepkg 2007-03-25 12:53:16 +0000 @@ -349,62 +349,59 @@ } tidy_install () { + cd "$startdir/pkg" + msg "Tidying install..." + if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "Removing info/doc files..." - cd "$startdir/pkg" + msg2 "Removing info/doc files..." #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi - # move /usr/share/man files to /usr/man - if [ -d $startdir/pkg/usr/share/man ]; then - cd "$startdir" - mkdir -p pkg/usr/man - cp -a pkg/usr/share/man/* pkg/usr/man/ - rm -rf pkg/usr/share/man + if [ -d usr/share/man ]; then + msg2 "Moving usr/share/man files to usr/man" + mkdir -p usr/man + cp -a usr/share/man/* usr/man/ + rm -rf usr/share/man fi - # compress man pages - msg "Compressing man pages..." - find "$startdir"/pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null | while read i ; do - ext="${i##*.}" - fn="${i##*/}" + msg2 "Compressing man pages..." + local manpage ext file link + find {usr{,/local},opt/*}/man -type f 2>/dev/null | while read manpage ; do + ext="${manpage##*.}" + file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find "$startdir"/pkg/{usr{,/local},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do - rm -f "$ln" - ln -sf "${fn}.gz" "${ln}.gz" + find {usr{,/local},opt/*}/man -lname "$file" 2>/dev/null | while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" done # compress the original - gzip -9 "$i" + gzip -9 "$manpage" fi done - cd "$startdir" - - # strip binaries if [ "$(check_option strip)" = "y" ]; then - msg "Stripping debugging symbols from libraries..." - find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ + msg2 "Stripping debugging symbols from libraries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries..." - find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ + + msg2 "Stripping symbols from binaries..." + LC_ALL=C LANG=C \ + find {.,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip '{}' \; 2>&1 \ | grep -v "No such file" | grep -v "format not recognized" fi - # remove libtool (.la) files if [ "$(check_option libtool)" = "n" ]; then - msg "Removing libtool .la files..." - find pkg -type f -name "*.la" -exec rm -f -- '{}' \; + msg2 "Removing libtool .la files..." + find -type f -name "*.la" -exec rm -f -- '{}' \; fi - # remove empty directories if [ "$(check_option emptydirs)" = "n" ]; then - msg "Removing empty directories..." - cd "$startdir/pkg" + msg2 "Removing empty directories..." find -depth -type d -empty -delete; fi } diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:42:10.990979362 +0100 +++ new/scripts/makepkg 2007-03-25 19:47:52.000000000 +0100 @@ -348,6 +348,68 @@ fi } +run_build () { + # use distcc if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then + [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH + elif [ "$(check_option distcc)" = "n" ]; then + # if it is not wanted, clear the makeflags too + export MAKEFLAGS="" + fi + + # use ccache if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then + [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH + fi + + # clear user-specified makeflags if requested + if [ "$(check_option makeflags)" = "n" ]; then + export MAKEFLAGS="" + fi + + # build + msg "Starting build()..." + + # some applications (eg, blackbox) will not build with some languages + unset LC_ALL LANG + umask 0022 + + #check for "exit on syntax error" shell option + echo $SHELLOPTS | grep errexit 2>&1 >/dev/null + set_e=$? + + ret=0 + if [ "$LOGGING" = "1" ]; then + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + if [ -f "$BUILDLOG" ]; then + i=1 + while true; do + if [ -f "$BUILDLOG.$i" ]; then + i=$(($i +1)) + else + break + fi + done + mv "$BUILDLOG" "$BUILDLOG.$i" + fi + + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + [ $set_e -eq 1 ] && set +e + else + #use 'errexit' to bail on syntax error + [ $set_e -eq 1 ] && set -e + build 2>&1 || ret=$? + [ $set_e -eq 1 ] && set +e + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 + fi +} + tidy_install () { cd "$startdir/pkg" msg "Tidying install..." @@ -1002,65 +1064,7 @@ fi mkdir -p "$startdir/pkg" - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH - elif [ "$(check_option distcc)" = "n" ]; then - # if it is not wanted, clear the makeflags too - export MAKEFLAGS="" - fi - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH - fi - - # clear user-specified makeflags if requested - if [ "$(check_option makeflags)" = "n" ]; then - export MAKEFLAGS="" - fi - - # build - msg "Starting build()..." - - # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG - umask 0022 - - #check for "exit on syntax error" shell option - echo $SHELLOPTS | grep errexit 2>&1 >/dev/null - set_e=$? - - ret=0 - if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" - if [ -f "$BUILDLOG" ]; then - i=1 - while true; do - if [ -f "$BUILDLOG.$i" ]; then - i=$(($i +1)) - else - break - fi - done - mv "$BUILDLOG" "$BUILDLOG.$i" - fi - - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} - [ $set_e -eq 1 ] && set +e - else - #use 'errexit' to bail on syntax error - [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? - [ $set_e -eq 1 ] && set +e - fi - if [ $ret -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + run_build fi tidy_install ------------------------------------------------------------ revno: 9 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-run_build timestamp: Sun 2007-03-25 14:13:21 +0100 message: * cleaned up run_build. * restore LC_ALL and LANG after running build(). diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 20:13:25.241786827 +0100 +++ new/scripts/makepkg 2007-03-25 20:14:20.008907829 +0100 @@ -369,20 +369,22 @@ # build msg "Starting build()..." + cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages - unset LC_ALL LANG + local _LC_ALL="$LC_ALL" ; LC_ALL='C' + local _LANG="$LANG" ; LANG='C' umask 0022 #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? - ret=0 + local ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then - i=1 + local i=1 while true; do if [ -f "$BUILDLOG.$i" ]; then i=$(($i +1)) @@ -403,10 +405,15 @@ build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi + + # restore locales + export LC_ALL="$_LC_ALL" + export LANG="$_LANG" + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps - exit 2 + exit 2 # TODO: error code fi } ------------------------------------------------------------ revno: 10 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:31:05 +0100 message: * reduced use fakeroot to - run_build() - tidy_install() - create_package() * added check for inproper use of '-F'. * added yn_question() function. * added warning about running makepkg as root. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:55:48.273553640 +0100 +++ new/scripts/makepkg 2007-03-25 19:56:02.738377944 +0100 @@ -41,6 +41,7 @@ DEP_SRC=0 SUDO=0 FORCE=0 +INFAKEROOT=0 GENINTEG=0 INSTALL=0 NOBUILD=0 @@ -52,14 +53,6 @@ PACMAN_OPTS= -#determine if we are running with fakeroot -if [ "$1" = "-F" ]; then - INFAKEROOT=1 - shift -else - INFAKEROOT=0 -fi - ### SUBROUTINES ### plain() { @@ -102,6 +95,24 @@ fi } +yn_question () { + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + echo -en " \033[1;1m$1\033[1;0m " >&2 + else + echo -n " $1 " >&2 + fi + + local answer + read answer + answer="$(echo $answer | tr [:upper:] [:lower:])" + + if [ "$answer" = 'y' -o "$answer" = 'yes' ]; then + return 0 + else + return 1 + fi +} + strip_url() { echo "$1" | sed 's|^.*://.*/||g' } @@ -675,7 +686,7 @@ exit 1 ;; -*) - while getopts "bcCdefghiLmop:rRsS-" opt; do + while getopts "bcCdefFghiLmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; c) CLEANUP=1 ;; @@ -683,6 +694,7 @@ d) NODEPS=1 ;; e) NOEXTRACT=1 ;; f) FORCE=1 ;; + F) INFAKEROOT=1 ;; g) GENINTEG=1 ;; h) usage @@ -751,6 +763,46 @@ fi fi +if [ "$INFAKEROOT" = "0" ]; then + if [ $EUID -eq 0 ]; then + # Warn those who like to live dangerously. + warning "Running makepkg as root is a \033[1;31mBAD\033[1;37m idea!" + plain "" + plain "Running makepkg as root can result in permanent, catastropic damage to " + plain "your system." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + elif [ "$(check_buildenv fakeroot)" = "y" ]; then + if [ ! $(type -p fakeroot) ]; then + warning "Fakeroot is not installed. Building as an unprivileged user" + plain "will result in non-root ownership of the packaged files. Install" + plain "the fakeroot package to correctly build as a non-root user." + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi + else + warning "Running makepkg as an unprivileged user will result in non-root" + plain "ownership of the packaged files. Try using the fakeroot environment by" + plain "placing 'fakeroot' in the BUILDENV array in /etc/makepkg.conf" + plain "" + if ! yn_question "Are you sure you want to continue? [N/y]"; then + error "Aborting..." + exit 1 # $E_USER_ABORT + fi + fi +else + if [ "$FAKEROOTKEY" = "" ]; then + error "Do not use the '-F' option. This option is only for use by makepkg." + exit 1 # TODO: error code + fi +fi + unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract @@ -810,29 +862,20 @@ fi fi -# Enter the fakeroot environment if necessary. This will call the makepkg -# script again as the fake root user. We detect this by passing a sentinel -# option (-F) to makepkg. -if [ "$EUID" != "0" ]; then - if [ "$(check_buildenv fakeroot)" = "y" ]; then - if [ $(type -p fakeroot) ]; then - msg "Entering fakeroot environment" - fakeroot -- $0 -F $ARGLIST - exit $? - else - warning "Fakeroot is not installed. Building as an unprivileged user" - plain "will result in non-root ownership of the packaged files. Install" - plain "the fakeroot package to correctly build as a non-root user." - plain "" - sleep 1 - fi +# Run the bear minimum in fakeroot +# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error +if [ "$INFAKEROOT" = "1" ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." else - warning "Running makepkg as an unprivileged user will result in non-root" - plain "ownership of the packaged files. Try using the fakeroot environment" - plain "by placing 'fakeroot' in the BUILDENV array in makepkg.conf." - plain "" - sleep 1 - fi + run_build + tidy_install + fi + + create_package + + msg "Leaveing fakeroot environment." + exit 0 # $E_OK fi msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" @@ -1061,22 +1104,34 @@ if [ "$NOBUILD" = "1" ]; then msg "Sources are ready." exit 0 -elif [ "$REPKG" = "1" ]; then - warning "Skipping build" else # check for existing pkg directory - if [ -d "$startdir/pkg" ]; then + if [ -d "$startdir/pkg" -a "$REPKG" = "0" ]; then msg "Removing existing pkg/ directory..." rm -rf "$startdir/pkg" fi mkdir -p "$startdir/pkg" - run_build -fi + if [ $EUID -eq 0 ]; then + if [ "$REPKG" = "1" ]; then + warning "Skipping build." + else + run_build + tidy_install + fi + + create_package + else + msg "Entering fakeroot environment..." + cd "$startdir" -tidy_install + ret=0 + fakeroot -- $0 -F $ARGLIST || ret=$? + [ $ret -ne 0 ] && exit $ret -create_package + unset ret + fi +fi cd "$startdir" if [ "$CLEANUP" = "1" ]; then ------------------------------------------------------------ revno: 11 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fakeroot timestamp: Sun 2007-03-25 14:38:17 +0100 message: * removed fakeroot hacks from - handledeps() - removedeps() - installpackage() diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 19:57:18.006667240 +0100 +++ new/scripts/makepkg 2007-03-25 19:59:19.305579669 +0100 @@ -207,7 +207,7 @@ local depstrip="" local striplist="" local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then + if [ "$EUID" = "0" -o "$SUDO" = 1 ]; then haveperm=1 fi @@ -220,21 +220,11 @@ if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) msg "Installing missing dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - # kinda hacky, but we need to make pacman think that we're NOT - # in fakeroot so it will go ahead and install the dependencies. - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then error "Pacman failed to install missing dependencies." exit 1 fi - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." @@ -344,15 +334,7 @@ if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -Rs $striplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." pacman $PACMAN_OPTS -Rs $striplist @@ -579,16 +561,8 @@ installpackage() { if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then msg "Installing package with pacman -U..." - if [ "$INFAKEROOT" = "1" ]; then - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} local exitcode=$? - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi exit $exitcode elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then msg "Installing package with pacman -U..." ------------------------------------------------------------ revno: 12 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: feature-fake_install timestamp: Sun 2007-03-25 14:46:38 +0100 message: * modify run_build() to run other functions. * add fake_install() support. diff -Naur old/scripts/makepkg new/scripts/makepkg --- old/scripts/makepkg 2007-03-25 23:15:12.538842433 +0100 +++ new/scripts/makepkg 2007-03-25 23:16:46.192179436 +0100 @@ -342,6 +342,12 @@ } run_build () { + if [ "$(type -t $1)" != "function" ]; then + error "Unknown function '${1}'." + error "Aborting..." + exit 1 # TODO: error code + fi + # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH @@ -361,7 +367,7 @@ fi # build - msg "Starting build()..." + msg "Starting ${1}()..." cd "$startdir/src" # some applications (eg, blackbox) will not build with some languages @@ -375,7 +381,7 @@ local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-${1}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -390,12 +396,12 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + $1 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 || ret=$? + $1 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e fi @@ -842,7 +848,12 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + if [ "$(type -t fake_install)" != "function" ]; then + run_build build + else + run_build fake_install + fi + tidy_install fi @@ -1090,12 +1101,17 @@ if [ "$REPKG" = "1" ]; then warning "Skipping build." else - run_build + run_build build + [ "$(type -t fake_install)" = "function" ] && run_build fake_install tidy_install fi create_package else + if [ "$REPKG" = "0" -a "$(type -t fake_install)" = "function" ]; then + run_build build + fi + msg "Entering fakeroot environment..." cd "$startdir" @@ -1111,7 +1127,7 @@ if [ "$CLEANUP" = "1" ]; then msg "Cleaning up..." rm -rf src pkg - rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* + rm -f ${pkgname}-${pkgver}-${pkgrel}-${CARCH}-{build,fake_install}.log* fi removedeps

2 2

[pacman-dev] pacman 3.0 in testing
by Aaron Griffin 28 Mar '07

28 Mar '07

Well, pacman 3.0 has gone to testing. It may take some time for everything to sync and all that jazz, but for those packagers using testing (and pacman 3.0) you will need an extra step for the time being when uploading packages. pacman will create packages tagged with the architecture, (i.e. pacman-3.0.0-1-i686.pkg.tar.gz) you will need to rename this WITHOUT the architecture until we update all the dev tools to use the new format (this includes the devtools package and the archlinux.org repo scripts). Enjoy! -- Aaron Griffin

6 6

[pacman-dev] makepkg with gettext support
by Giovanni Scafora 28 Mar '07

28 Mar '07

Hi guys, I send my initial work on makepkg with gettext support. I guess that it's not still perfect, but I would appreciate a lot the contribution of all the translators and the pacman developers. All the suggestions are appreciated. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 5

[pacman-dev] CVS update of pacman-lib/lib/libalpm (sync.c)
by Dan McGee 28 Mar '07

28 Mar '07

Date: Wednesday, March 28, 2007 @ 00:32:00 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: sync.c (1.112 -> 1.113) Fix --ignore behavior on sysupgrade * --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do. Signed-off-by: Dan McGee <dan(a)archlinux.org> --------+ sync.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.112 pacman-lib/lib/libalpm/sync.c:1.113 --- pacman-lib/lib/libalpm/sync.c:1.112 Tue Mar 20 23:08:19 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Mar 28 00:32:00 2007 @@ -216,14 +216,22 @@ alpm_pkg_get_name(local), alpm_pkg_get_version(local), alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local), - alpm_pkg_get_version(local)); - if(dummy == NULL) { + /* If package is in the ignorepkg list, ask before we add it to + * the transaction */ + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { + int resp = 0; + QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); + if(!resp) { + continue; + } + } + pmpkg_t *tmp = _alpm_pkg_dup(local); + if(tmp == NULL) { goto error; } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); if(sync == NULL) { - FREEPKG(dummy); + FREEPKG(tmp); goto error; } trans->packages = alpm_list_add(trans->packages, sync);

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.conf.5)
by Dan McGee 27 Mar '07

27 Mar '07

Date: Tuesday, March 27, 2007 @ 11:51:18 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.conf.5 (1.3 -> 1.4) * Remove outdated ProxyServer option from pacman.conf.5. ---------------+ pacman.conf.5 | 3 --- 1 file changed, 3 deletions(-) Index: pacman-lib/doc/pacman.conf.5 diff -u pacman-lib/doc/pacman.conf.5:1.3 pacman-lib/doc/pacman.conf.5:1.4 --- pacman-lib/doc/pacman.conf.5:1.3 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/pacman.conf.5 Tue Mar 27 11:51:18 2007 @@ -54,9 +54,6 @@ Include another config file. This file can include repositories or general configuration options. .TP -.B ProxyServer = <\fIhost\fP|\fIip\fP>[:\fIport\fP] -If set, \fBpacman\fP will use this proxy server for all ftp/http transfers. -.TP .B XferCommand = \fI/path/to/command %u\fP If set, an external program will be used to download all remote files. All instances of \fB%u\fP will be replaced with the download URL. If present,

1 0

[pacman-dev] makepkg using Proxy
by Gustavo Chain 27 Mar '07

27 Mar '07

Hi all! Dont' you think that makepkg should use ProxySettings from pacman.conf. ? What dou you think about ? -- Gustavo Chaín Dumit Alumno de Ingeniería de Ejecución Informática Pontificia Universidad Católica de Valparaiso http://aleph.homeunix.com/~gchain

4 6

[pacman-dev] makepkg FS#6708 patch
by Scott Horowitz 27 Mar '07

27 Mar '07

As per FS#6708, here is a patch against makepkg to download the first 50kb of the db.tar.gz file. Feel free to tweak the number, I thought it was a good balance between getting an accurate number and making dialup users wait. --- /usr/bin/rankmirrors 2007-03-25 20:07:04.000000000 -0600 +++ rankmirrors 2007-03-26 22:39:23.000000000 -0600 @@ -55,7 +55,8 @@ def talkToServer(serverUrl): opener = urllib2.build_opener() - tmp = opener.open(serverUrl).read() + # retrieve first 50,000 bytes only + tmp = opener.open(serverUrl).read(50000) def getFuncToTime(serverUrl): return lambda : talkToServer(serverUrl) @@ -139,8 +140,18 @@ elif options.times: print ' * ', sys.stdout.flush() + + # add db.tar.gz to server name + try: + splitted2 = serverUrl.split('/') + dbFileName = splitted2[len(splitted2) - 3] + '.db.tar.gz' + if serverUrl[-1] != '/': + dbFileName = '/' + dbFileName + except: + dbFileName = '' + try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName)) if options.verbose: try: print "%.2f" % serverToTime[serverUrl]

1 2

[pacman-dev] Russian translation update.
by Владимир Байраковский 26 Mar '07

26 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po Now it looks like finished translation. But improvements are welcome. Thanks a lot, shild <sxp(a)bk.ru>!

2 1

[pacman-dev] CVS update of pacman-lib (NEWS src/pacman/po/ru_RU.po src/pacman/sync.c)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Monday, March 26, 2007 @ 18:47:57 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.11 -> 1.12) src/pacman/po/ru_RU.po (1.6 -> 1.7) src/pacman/sync.c (1.117 -> 1.118) * Fix NEWS typo. Oops. * Updated Russian translation. Владимир Байраковский <4rayven(a)gmail.com> and Shild <sxp(a)bk.ru> * Removed a string from gettext that didn't need it. ------------------------+ NEWS | 2 - src/pacman/po/ru_RU.po | 54 ++++++++++++++++++++++++----------------------- src/pacman/sync.c | 2 - 3 files changed, 30 insertions(+), 28 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.11 pacman-lib/NEWS:1.12 --- pacman-lib/NEWS:1.11 Thu Mar 22 11:18:26 2007 +++ pacman-lib/NEWS Mon Mar 26 18:47:56 2007 @@ -47,7 +47,7 @@ - repo-add - adds a package to a repo database file - repo-remove - removes a package from a repo database file - added pactest testing suite - - MANY fixes and small inprovements everywhere + - MANY fixes and small improvements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.6 pacman-lib/src/pacman/po/ru_RU.po:1.7 --- pacman-lib/src/pacman/po/ru_RU.po:1.6 Sat Mar 24 00:18:19 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Mon Mar 26 18:47:57 2007 @@ -1,5 +1,5 @@ # Pacman Russian Translation -# Copyright (C) YEAR Judd Vinet <jvinet(a)zeroflux.org> +# Copyright (C) 2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package. # Vladimir Bayrakovskiy <4rayven(a)gmail.com>, 2007 # @@ -7,12 +7,15 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-03-25 17:41+0600\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven(a)gmail.com>\n" +"Language-Team: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -31,7 +34,7 @@ #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "" +msgstr "не удалось добавить цель '%s' (%s)" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 @@ -115,11 +118,11 @@ #: src/pacman/log.c:194 msgid "Y" -msgstr "" +msgstr "Y" #: src/pacman/log.c:194 msgid "YES" -msgstr "" +msgstr "YES" #: src/pacman/log.h:30 msgid "error: " @@ -230,11 +233,11 @@ #: src/pacman/package.c:96 msgid "Yes" -msgstr "" +msgstr "Yes" #: src/pacman/package.c:96 msgid "No" -msgstr "" +msgstr "No" #: src/pacman/package.c:126 #, c-format @@ -303,7 +306,7 @@ #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr "" +msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format @@ -454,7 +457,7 @@ msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign показать все пакеты не найденные в базе данных(s)\n" +" -m, --foreign показать все пакеты не найденные в базе(ах) данных\n" #: src/pacman/pacman.c:132 #, c-format @@ -465,7 +468,7 @@ #, c-format msgid " -p, --file <package> query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -474,7 +477,7 @@ " -s, --search <regex> search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search <regex> искать указанную строку в локально установленных " +" -s, --search <regex> искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -506,8 +509,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list <repo> view a list of packages in a repo\n" -msgstr "" -" -l, --list <repo> показать список всех пакетов в репозитории repo\n" +msgstr " -l, --list <repo> показать все пакеты данного репозитория\n" #: src/pacman/pacman.c:146 #, c-format @@ -553,14 +555,14 @@ " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <pkg> игнорировать пакет при обновлении (может быть " +" --ignore <пакет> игнорировать пакет при обновлении (может быть " "использовано неоднократно)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config <path> set an alternate configuration file\n" msgstr "" -" --config <path> использовать альтернативный конфигурационный файл\n" +" --config <путь> использовать альтернативный конфигурационный файл\n" #: src/pacman/pacman.c:154 #, c-format @@ -572,7 +574,7 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <number> заранее подготовленные ответы на вопросы (смотрите " +" --ask <число> заранее подготовленные ответы на вопросы (смотрите " "man-страницу)\n" #: src/pacman/pacman.c:156 @@ -597,30 +599,30 @@ #, c-format msgid " -r, --root <path> set an alternate installation root\n" msgstr "" -" -r, --root <path> указать алтернативную корневую директорию для " +" -r, --root <путь> указать альтернативную корневую директорию для " "установки\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" -" -b, --dbpath <path> указать альтернативное расположение базы данных\n" +" -b, --dbpath <путь> указать альтернативное расположение базы данных\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr "" -" --cachedir <директория> указать альтернативное расположение кэша\n" +msgstr " --cachedir <dir> указать альтернативное расположение кэша\n" #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" +" This program may be freely redistributed under\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" +msgstr " the terms of the GNU General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -648,7 +650,7 @@ #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "" +msgstr "warning: current locale is invalid; using default \"C\" locale" #: src/pacman/pacman.c:456 #, c-format @@ -692,12 +694,12 @@ #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "не удается определить владельца директории" +msgstr "не удалось определить владельца каталога" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "не удалось определить настоящий путь для '%s': %s" #: src/pacman/query.c:119 #, c-format @@ -887,12 +889,12 @@ #: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" -msgstr "" +msgstr "pacman: %s\n" #: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" -msgstr "" +msgstr "'%s': %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.117 pacman-lib/src/pacman/sync.c:1.118 --- pacman-lib/src/pacman/sync.c:1.117 Mon Mar 19 00:23:45 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 26 18:47:56 2007 @@ -554,7 +554,7 @@ continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno)); + ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; }

1 0