doc/PKGBUILD: document that functions run in -e mode

Caught this noted on the forums, but it is definitely worth a note in the
manpage as well.

Signed-off-by: Dan McGee <dan@archlinux.org>

.mailmap

@@ -0,0 +1,28 @@
+Aaron Griffin <aaron@archlinux.org> <aaronmgriffin@gmail.com>
+Allan McRae <allan@archlinux.org> <mcrae_allan@hotmail.com>
+Allan McRae <allan@archlinux.org> <mcrae_allan at hotmail.com>
+Allan McRae <allan@archlinux.org> <allan.mcrae@qimr.edu.au>
+Andres P <aepd87@gmail.com> <stderr@mail.com>
+Bryan Ischo <bryan@ischo.com> <bji-keyword-pacman.3644cb@www.ischo.com>
+Christos Nouskas <nous@archlinux.us> <nouskas@gmail.com>
+Daenyth Blank <daenyth+arch@gmail.com> <Daenyth+Arch@gmail.com>
+Daenyth Blank <Daenyth+Arch@gmail.com> <Daenyth+git@gmail.com>
+甘露(Gan Lu) <rhythm.gan@gmail.com>
+Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
+Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com>
+Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
+Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> <jotapesan@gmail.com>
+Manuel Tortosa <manutortosa@chakra-project.org> <manutortosa@gmail.com>
+Marc - A. Dahlhaus <mad@wol.de>
+Matthias Gorissen <matthias@archlinux.de> <siquame@web.de>
+Laszlo Papp <djszapi@archlinux.us> <djszapi2@gmail.com>
+Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba@petra.hos.u-szeged.hu>
+Nagy Gabor <ngaba@bibl.u-szeged.hu> <ngaba at bibl.u-szeged.hu>
+Nezmer <git@nezmer.info> <Nezmer@allurelinux.org>
+Roman Kyrylych <roman@archlinux.org> <roman.kyrylych@gmail.com>
+Sebastian Nowicki <sebnow@gmail.com> <xilonmu@gmail.com>
+Vojtěch Gondžala <vojtech.gondzala@gmail.com> <vogo@seznam.cz>
+Vojtěch Gondžala <vojtech.gondzala@gmail.com> Vojtech Gondzala <vojtech.gondzala@gmail.com>
+Xavier Chantry <shiningxc@gmail.com>
+Xavier Chantry <shiningxc@gmail.com> <chantry.xavier@gmail.com>
+Xavier Chantry <shiningxc@gmail.com> <xav@chantry.homelinux.org>

HACKING

@@ -12,10 +12,10 @@ Coding style
 1.  All code should be indented with tabs. (Ignore the use of only spaces in
     this file) By default, source files contain the following VIM modeline:
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 /* vim: set ts=2 sw=2 noet: */
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 2.  When opening new blocks such as 'while', 'if', or 'for', leave the opening
     brace on the same line as the beginning of the codeblock. The closing brace
@@ -24,8 +24,8 @@ Coding style
     braces, even if it's just a one-line block. This reduces future error when
     blocks are expanded beyond one line.
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 for(lp = list; lp; lp = lp->next) {
   newlist = _alpm_list_add(newlist, strdup(lp->data));
 }
@@ -40,14 +40,14 @@ while(it) {
   free(it);
   it = ptr;
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 3.  When declaring a new function, put the opening and closing braces on their
     own line. Also, when declaring a pointer, do not put a space between the
     asterisk and the variable name.
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
 {
   alpm_list_t *ptr, *lp;
@@ -58,7 +58,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
   }
   ...
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 4.  Comments should be ANSI-C89 compliant. That means no `// Comment` style;
     use only `/* Comment */` style.
@@ -101,37 +101,50 @@ Currently our #include usage is in messy shape, but this is no reason to
 continue down this messy path. When adding an include to a file, follow this
 general pattern, including blank lines:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 #include "config.h"
 
 #include <standardheader.h>
 #include <another.h>
 #include <...>
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 Follow this with some more headers, depending on whether the file is in libalpm
 or pacman proper. For libalpm:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 /* libalpm */
 #include "yourfile.h"
 #include "alpm_list.h"
 #include "anythingelse.h"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 For pacman:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 #include <alpm.h>
 #include <alpm_list.h>
 
 /* pacman */
 #include "yourfile.h"
 #include "anythingelse.h"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
+
+GDB and Valgrind Usage
+~~~~~~~~~~~~~~~~~~~~~~
+
+When using GDB or valgrind on pacman, you will want to run it on the actual
+binary rather than the shell script wrapper produced by libtool. The actual
+binary lives at `src/pacman/.libs/lt-pacman`, and will exist after running
+`./src/pacman/pacman` at least once.
+
+For example, to run valgrind:
+
+    ./src/pacman/pacman
+    valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu
 
 /////
 vim: set ts=2 sw=2 syntax=asciidoc et:

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc po test/pacman test/util contrib
 if WANT_DOC
 SUBDIRS += doc
 endif
@@ -15,12 +15,12 @@ pkgdatadir = ${datadir}/${PACKAGE}
 dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto
 
 # run the pactest test suite and vercmp tests
-check-local: pactest src/pacman src/util
-	$(PYTHON) $(top_srcdir)/pactest/pactest.py --debug=1 \
-		--test $(top_srcdir)/pactest/tests/*.py \
+check-local: test/pacman test/util src/pacman src/util
+	$(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \
+		--test $(top_srcdir)/test/pacman/tests/*.py \
 		-p $(top_builddir)/src/pacman/pacman
 	rm -rf $(top_builddir)/root
-	$(SH) $(top_srcdir)/pactest/vercmptest.sh \
+	$(SH) $(top_srcdir)/test/util/vercmptest.sh \
 		$(top_builddir)/src/util/vercmp
 
 # create the pacman DB and cache directories upon install

NEWS

@@ -1,5 +1,64 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.4.2         - fix progress bar display with empty packages
+              - make pactest testsuite Python 2.7 compatible
+              - documentation: remove unnecessary "|| return 1"
+              - contrib/bacman: update package compression selection
+              - contrib/PKGBUILD.vim: add a few more license options
+              - translations: es, kk, sv, pt, ru updated
+3.4.1         - fix interaction of --needed and multiple repo groups (FS#20221)
+              - bash completion: small fixes to prevent alias problems
+              - rankmirrors: fix bogus/empty variable assignment (FS#19911)
+              - repo-add: ensure bare DB symlinks are relative (FS#20498)
+              - repo-add: fallback to copy if symlink not permitted (FS#19907)
+              - makepkg:
+                - use absolute path to 'du' to exclude wrapper progs (FS#19932)
+                - ensure $startdir check doesn't stall indefinitely (FS#19975)
+                - fix repackaging with multiple passed packages (FS#20272)
+              - translations:
+                - zh_CN: fix crash when using during install (FS#20188)
+                - sk: new Slovak translation
+                - pt: new European Portuguese translation
+                - other small updates to various translations
+3.4.0         - new "Architecture" option that will restrict pacman to
+                installing only packages from the given architecture. Can be
+                set to "auto" in which case the output of "uname -m" is used
+              - use "$arch" when specifying a mirror url to automatically
+                select the correct architecture
+              - Installing packages with -U can handle installing
+                dependencies, conflict resolution and replacing packages
+                (FS#3492, FS#5798)
+              - can upgrade the system and install a new package using 
+                "pacman -Syu <pkg>" (FS#15581)
+              - new -D/--database operation for modifying package install
+                reasons (FS#12950)
+              - new --print and --print-format options to output information
+                in suitable format for wrapper scripts (FS#14208)
+              - only extract new entries when updating a repo database
+              - show "Required by" in -Sii output (FS#16244)
+              - -U and -R options always ask for confirmation
+              - allow -Qo to perform a functional 'which' (FS#8798)
+              - cache cleaning cleans all directories, not just first
+              - cleanupdelta: new utility to help remove unused deltas from
+                a repo database 
+              - bash completion: rewrite for size and performance (FS#16630)
+              - repo-add: handle removing the final package from a repo
+              - rankmirrors: rewrite using bash
+              - vercmp: does not link to libalpm to prevent upgrade issues
+              - makepkg:
+                - automatically aborts on any errors during packaging
+                - changelogs are now included via the "changelog" variable
+                - override pkgver, pkgrel and arch in split packages (FS#15955)
+                - repackaging without a package() function is deprecated
+                - stricter syntax checking for backup and optdepends entries
+                - file stripping options are configurable
+                - New --pkg flag to allow building specific package(s) from
+                  split PKGBUILDs (FS#15956)
+                - build() function is now optional (FS#15147)
+                - warn about reference to build root in a package (FS#14751)
+                - configure source package destination with SRCPKGDEST
+                - major internal refactoring of handling tests ("[" to "[[")
+              - contrib/pactree: print reverse dependency tree
 3.3.3         - correctly check the return code from opendir()
               - fix possible infinite loop in alpm_list_remove()
               - makepkg:

PKGBUILD-split.proto

@@ -3,9 +3,9 @@
 # see 'man PKGBUILD'. NOTE: Please fill out the license field for your package!
 # If it is unknown, then please put 'unknown'.
 
-# Contributor: Your Name <youremail@domain.com>
+# Maintainer: Your Name <youremail@domain.com>
 pkgname=('pkg1' 'pkg2')
-pkgbase=""
+pkgbase=BASE
 pkgver=VERSION
 pkgrel=1
 pkgdesc=""
@@ -21,6 +21,7 @@ replaces=()
 backup=()
 options=()
 install=
+changelog=
 source=($pkgbase-$pkgver.tar.gz)
 noextract=()
 md5sums=() #generate with 'makepkg -g'
@@ -28,12 +29,15 @@ md5sums=() #generate with 'makepkg -g'
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package_pkg1() {
   # options and directives that can be overridden
+  pkgver=
+  pkgrel=
   pkgdesc=""
+  arch=()
   license=()
   groups=()
   depends=()
@@ -44,6 +48,7 @@ package_pkg1() {
   backup=()
   options=()
   install=
+  changelog=
 
   cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir/" install-pkg1

PKGBUILD.proto

@@ -3,7 +3,7 @@
 # NOTE: Please fill out the license field for your package! If it is unknown,
 # then please put 'unknown'.
 
-# Contributor: Your Name <youremail@domain.com>
+# Maintainer: Your Name <youremail@domain.com>
 pkgname=NAME
 pkgver=VERSION
 pkgrel=1
@@ -21,6 +21,7 @@ replaces=()
 backup=()
 options=()
 install=
+changelog=
 source=($pkgname-$pkgver.tar.gz)
 noextract=()
 md5sums=() #generate with 'makepkg -g'
@@ -29,7 +30,12 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir/" install
 }
 

README

@@ -57,7 +57,6 @@ library is initialized.
 * dbpath: The toplevel database directory (Default: /var/lib/pacman)
 * logfile: The base path to pacman's log file (Default: /var/log/pacman.log)
 * usesyslog: Log to syslog instead of `logfile` for file-base logging.
-* nopassiveftp: Do not use passive FTP commands for ftp connections.
 
 The following options also have `alpm_option_{add,remove}_*` functions, as the
 values are list structures.
@@ -296,3 +295,36 @@ API CHANGES BETWEEN 3.2 AND 3.3
 - error codes:
     PM_ERR_SERVER_NONE, PM_ERR_TRANS_NOT_LOCKED, PM_ERR_PKG_IGNORED and
     PM_ERR_LIBFETCH
+
+
+API CHANGES BETWEEN 3.3 AND 3.4
+===============================
+
+[REMOVED]
+- pmtranstype_t struct (transaction type), alpm_trans_get_type()
+- alpm_option_get_nopassiveftp(), alpm_option_set_nopassiveftp()
+
+[CHANGED]
+- interface for target loading:
+  - alpm_trans_addtarget() and alpm_trans_sysupgrade() were removed
+  - alpm_sync_target() and alpm_sync_dbtarget() can be used to add a sync target
+  - alpm_sync_sysupgrade() can be used to add outdated packages (for sysupgrade)
+  - alpm_add_target() can be used to add an add/upgrade target
+  - alpm_remove_target() can be used to add a remove target
+- interface for target listing:
+  - alpm_trans_get_pkgs() was removed
+  - alpm_pkg_get_removes() was removed
+  - alpm_trans_get_add() can be used to list add/upgrade/sync targets
+  - alpm_trans_get_remove() can be used to list to-be-removed packages
+- the type parameter of alpm_trans_init() was removed
+- the type of alpm_db_fetch callback function: mtimeold and mtimenew parameters
+  were replaced by force parameter
+- unsigned short -> int changes for Boolean variables
+
+[ADDED]
+- alpm_db_set_pkgreason()
+- alpm_option_get_arch(), alpm_option_set_arch()
+- alpm_option_get_usedelta()
+- alpm_pkg_unused_deltas()
+- alpm_conflict_get_reason()
+- error code: PM_ERR_PKG_INVALID_ARCH

TRANSLATORS

@@ -10,6 +10,8 @@ If your language is not listed here and you wish it was, let the pacman mailing
 list know you are interested in making a translation. We will be happy to add
 your language to the mix.
 
+Catalan (ca):
+	Manuel Tortosa <manutortosa@chakra-project.org>
 Czech (cs):
 	Vojtěch Gondžala <vojtech.gondzala@gmail.com>
 German (de):
@@ -30,7 +32,7 @@ Italian (it):
 	Giovanni Scafora <giovanni@archlinux.org>
 Kazakh (kk):
 	Baurzhan Muftakhidinov <baurthefirst@gmail.com>
-Norwegian (nb_NO):
+Norwegian (nb):
 	Hans-Kristian Arntzen <maister@archlinux.us>
 Polish (pl):
 	Mateusz Herych <heniekk@gmail.com>
@@ -47,7 +49,7 @@ Russian (ru):
 	Vitaly Dolgov <ferhiord@gmail.com>
 	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
-Swedish (sv_SE):
+Swedish (sv):
 	Christian Larsson <congacx@gmail.com>
 Turkish (tr):
 	Samed Beyribey <ras0ir@eventualis.org>

autoclean.sh

@@ -18,11 +18,11 @@ rm -f scripts/{Makefile.in,Makefile}
 rm -f etc/{Makefile.in,Makefile}
 rm -f etc/pacman.d/{Makefile.in,Makefile}
 rm -f etc/abs/{Makefile.in,Makefile}
-rm -f pactest{,/tests}/{Makefile.in,Makefile}
+rm -f test/{pacman,util}{,/tests}/{Makefile.in,Makefile}
 rm -f contrib/{Makefile.in,Makefile}
 rm -f doc/{Makefile.in,Makefile}
 
-rm -f pactest/*.pyc
+rm -f test/pacman/*.pyc
 rm -f doc/html/*.html
 rm -f doc/man3/*.3
 

configure.ac

@@ -41,13 +41,13 @@ AC_PREREQ(2.60)
 #   Bugfix releases:
 #     pacman_version_micro += 1
 
-m4_define([lib_current], [4])
-m4_define([lib_revision], [3])
+m4_define([lib_current], [5])
+m4_define([lib_revision], [2])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
-m4_define([pacman_version_minor], [3])
-m4_define([pacman_version_micro], [3])
+m4_define([pacman_version_minor], [4])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -126,7 +126,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
-AC_CHECK_PROGS([PYTHON], [python2.6 python2.5 python], [false])
+AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false])
 
 # find installed gettext
 AM_GNU_GETTEXT([external])
@@ -143,7 +143,7 @@ if test "x$internaldownload" = "xyes" ; then
 	AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library])
 	# Check for a download library if it was actually requested
 	AC_CHECK_LIB([fetch], [fetchParseURL], ,
-		AC_MSG_ERROR([libfetch is needed to compile with internal download support]) )
+		AC_MSG_ERROR([libfetch is needed to compile with internal download support]), [-lcrypto -ldl] )
 	# Check if libfetch supports conditional GET
 	# (version >=2.21, struct url has member last_modified)
 	AC_CHECK_MEMBER(struct url.last_modified, ,
@@ -155,7 +155,7 @@ fi
 AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes")
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h])
+AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -186,6 +186,9 @@ GCC_GNU89_INLINE_CC
 # Host-dependant definitions
 SIZECMD="stat -L -c %s"
 SEDINPLACE="sed -i"
+STRIP_BINARIES="--strip-all"
+STRIP_SHARED="--strip-unneeded"
+STRIP_STATIC="--strip-debug"
 case "${host_os}" in
 	*bsd*)
 		SIZECMD="stat -L -f %z"
@@ -199,13 +202,20 @@ case "${host_os}" in
 		host_os_darwin=yes
 		SIZECMD="/usr/bin/stat -L -f %z"
 		SEDINPLACE="/usr/bin/sed -i ''"
+		STRIP_BINARIES=""
+		STRIP_SHARED="-S"
+		STRIP_STATIC="-S"
 		;;
 esac
 
 AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
 AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
+AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
 AC_SUBST(SIZECMD)
 AC_SUBST(SEDINPLACE)
+AC_SUBST(STRIP_BINARIES)
+AC_SUBST(STRIP_SHARED)
+AC_SUBST(STRIP_STATIC)
 
 # Check for architecture, used in default makepkg.conf
 # (Note single space left after CARCHFLAGS)
@@ -252,9 +262,15 @@ AC_SUBST(CARCHFLAGS)
 AC_SUBST(CHOST)
 
 # Check for documentation support and status
+AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
 AC_MSG_CHECKING([for building documentation])
 if test "x$wantdoc" = "xyes" ; then
-	AC_MSG_RESULT([yes])
+	if test $ASCIIDOC ; then
+		AC_MSG_RESULT([yes, enabled by configure])
+	else
+		asciidoc="(warning : asciidoc not installed)"
+		AC_MSG_RESULT([yes $asciidoc])
+	fi
 	wantdoc=yes
 else
 	AC_MSG_RESULT([no, disabled by configure])
@@ -296,10 +312,10 @@ else
 fi
 
 # Enable or disable use of git version in pacman version string
-AC_CHECK_PROGS([GIT], [git])
-AC_CHECK_FILE([.git/], hasgitdir=yes)
 AC_MSG_CHECKING(whether to use git version if available)
 if test "x$wantgitver" = "xyes" ; then
+	AC_CHECK_PROGS([GIT], [git])
+	AC_CHECK_FILE([.git/], hasgitdir=yes)
 	if test $GIT -a "x$hasgitdir" = "xyes"; then
 		AC_MSG_RESULT([yes])
 		usegitver=yes
@@ -339,8 +355,9 @@ scripts/Makefile
 doc/Makefile
 etc/Makefile
 po/Makefile.in
-pactest/Makefile
-pactest/tests/Makefile
+test/pacman/Makefile
+test/pacman/tests/Makefile
+test/util/Makefile
 contrib/Makefile
 Makefile
 ])
@@ -380,7 +397,7 @@ ${PACKAGE_NAME}:
     build script name      : ${BUILDSCRIPT}
 
   Compilation options:
-    Run make in doc/ dir   : ${wantdoc}
+    Run make in doc/ dir   : ${wantdoc} ${asciidoc}
     Use download library   : ${internaldownload}
     Doxygen support        : ${usedoxygen}
     debug support          : ${debug}

contrib/Makefile.am

@@ -2,13 +2,11 @@ EXTRA_DIST = \
 	PKGBUILD.vim \
 	bacman \
 	bash_completion \
-	gensync \
 	pacdiff \
 	paclist \
 	pacscripts \
 	pacsearch \
 	pactree \
-	updatesync \
 	vimprojects \
 	wget-xdelta.sh \
 	zsh_completion \

contrib/PKGBUILD.vim

@@ -25,6 +25,13 @@ syn match pbValidPkgname /\([[:alnum:]]\|+\|-\|_\){,32}/ contained contains=pbIl
 syn match pbIllegalPkgname /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained
 syn match pbPkgnameGroup /^pkgname=.*/ contains=pbIllegalPkgname,pb_k_pkgname,shDoubleQuote,shSingleQuote
 
+" pkgbase
+" FIXME if '=' is in pkgbase/pkgname/pkgver, it highlights whole string, not just '='
+syn keyword pb_k_pkgbase pkgbase contained
+syn match pbValidPkgbase /\([[:alnum:]]\|+\|-\|_\){,32}/ contained contains=pbIllegalPkgbase
+syn match pbIllegalPkgbase /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained
+syn match pbPkgbaseGroup /^pkgbase=.*/ contains=pbIllegalPkgbase,pb_k_pkgbase,shDoubleQuote,shSingleQuote
+
 " pkgver
 syn keyword pb_k_pkgver pkgver contained
 syn match pbValidPkgver /\([[:alnum:]]\|\.\|+\|_\)/ contained contains=pbIllegalPkgver
@@ -54,10 +61,13 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl
 
 " license
 syn keyword pb_k_license license contained
-syn keyword pbLicense  APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained
+" echo $(pacman -Ql licenses | grep '/usr/share/licenses/common/' | cut -d'/' -f6 | sort -u)
+syn keyword pbLicense  APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RALINK RUBY ZPL contained
+" special cases from http://wiki.archlinux.org/index.php/Arch_Packaging_Standards
+syn keyword pbLicenseSpecial  BSD MIT ZLIB Python contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
-syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense
+syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicenseSpecial,pbLicense,pbIllegalLicense
 
 " backup
 syn keyword pb_k_backup backup contained
@@ -115,6 +125,12 @@ syn match pbValidInstall /\([[:alnum:]]\|\$\|+\|-\|_\)*\.install/ contained
 syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall
 syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote
 
+" changelog
+syn keyword pb_k_changelog changelog contained
+syn match pbValidChangelog /\([[:alnum:]]\|\$\|+\|-\|_\)*/ contained
+syn match pbIllegalChangelog /[^=]/ contained contains=pbValidChangelog
+syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChangelog,pbIllegalChangelog,shDeref,shDoubleQuote,shSingleQuote
+
 " source:
 " XXX remove source from shStatement, fix strange bug
 syn clear shStatement
@@ -127,13 +143,12 @@ syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained
 hi def link pbDerefEmulation PreProc
 
 " md5sums
-
 syn keyword pb_k_md5sums md5sums contained
 syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums
-syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained
+syn match pbValidMd5sums /\x\{32\}/ contained
 syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend
 syn match pbMd5Quotes /'.*'\|".*"/ contained contains=pbMd5Hash,pbIllegalMd5sums
-syn match pbMd5Hash /[[:alnum:]]\+/ contained contains=pbValidMd5sums
+syn match pbMd5Hash /\x\+/ contained contains=pbValidMd5sums
 hi def link pbMd5Quotes Keyword
 hi def link pbMd5Hash Error
 hi def link pbValidMd5sums  Number
@@ -141,10 +156,10 @@ hi def link pbValidMd5sums  Number
 " sha1sums
 syn keyword pb_k_sha1sums sha1sums contained
 syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums
-syn match pbValidSha1sums /[[:alnum:]]\{40\}/ contained
+syn match pbValidSha1sums /\x\{40\}/ contained
 syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend
 syn match pbSha1Quotes /'.*'\|".*"/ contained contains=pbSha1Hash,pbIllegalSha1sums
-syn match pbSha1Hash /[[:alnum:]]\+/ contained contains=pbValidSha1sums
+syn match pbSha1Hash /\x\+/ contained contains=pbValidSha1sums
 hi def link pbSha1Quotes Keyword
 hi def link pbSha1Hash Error
 hi def link pbValidSha1sums  Number
@@ -181,6 +196,9 @@ hi def link pbTodo Todo
 hi def link pbIllegalPkgname Error
 hi def link pb_k_pkgname pbKeywords
 
+hi def link pbIllegalPkgbase Error
+hi def link pb_k_pkgbase pbKeywords
+
 hi def link pbIllegalPkgver Error
 hi def link pb_k_pkgver pbKeywords
 
@@ -212,6 +230,9 @@ hi def link pb_k_provides pbKeywords
 hi def link pbIllegalInstall Error
 hi def link pb_k_install pbKeywords
 
+hi def link pbIllegalChangelog Error
+hi def link pb_k_changelog pbKeywords
+
 hi def link pb_k_source pbKeywords
 hi def link pbIllegalSource Error
 

contrib/README

@@ -34,7 +34,3 @@ vimprojects - a project file for the vim project plugin.
 wget-xdelta.sh - A download script for pacman which allows binary deltas
 generated with makepkg to be used instead of downloading full binary packages.
 This should cut download sizes for some package upgrades significantly.
-
-gensync, updatesync - The former repository management scripts that have since
-been superseded by repo-add and repo-remove. They are here for posterity's
-sake, and to show how repo-add and repo-remove can be wrapped in other scripts.

contrib/bacman

@@ -21,7 +21,7 @@
 #
 
 readonly progname="bacman"
-readonly progver="0.2.0"
+readonly progver="0.2.1"
 
 #
 # User Friendliness
@@ -87,7 +87,6 @@ fi
 
 pkg_arch=${CARCH:-'unknown'}
 pkg_dest="${PKGDEST:-$PWD}"
-pkg_ext=${PKGEXT:-'.pkg.tar.gz'}
 pkg_pkger=${PACKAGER:-'Unknown Packager'}
 
 pkg_name="$1"
@@ -137,7 +136,7 @@ while read i; do
                 bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf -
 
                 # Workaround to bsdtar not reporting a missing file as an error
-                if [ ! -e "$work_dir/$i" ] && [ -L "$work_dir/$i"]; then
+                if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then
                     echo ""
                     echo "ERROR: unable to add /$i to the package"
                     echo "       If your user does not have permssion to read this file then"
@@ -164,13 +163,6 @@ fi
 
 pkg_size=$(du -sk | awk '{print $1 * 1024}')
 
-if [ -f "$pkg_dir/install" ] ; then
-    cp "$pkg_dir/install" "$work_dir/.INSTALL"
-fi
-if  [ -f $pkg_dir/changelog ] ; then
-    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
-fi
-
 #
 # .PKGINFO stuff
 #
@@ -254,6 +246,17 @@ while read i; do
     esac
 done
 
+comp_files=".PKGINFO"
+
+if [ -f "$pkg_dir/install" ] ; then
+    cp "$pkg_dir/install" "$work_dir/.INSTALL"
+    comp_files+=" .INSTALL"
+fi
+if  [ -f $pkg_dir/changelog ] ; then
+    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
+    comp_files+=" .CHANGELOG"
+fi
+
 #
 # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL
 #
@@ -265,8 +268,31 @@ chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
 #
 echo "Generating the package..."
 
+case "$PKGEXT" in
+	*tar.gz)  EXT=${PKGEXT%.gz} ;;
+	*tar.bz2) EXT=${PKGEXT%.bz2} ;;
+	*tar.xz)  EXT=${PKGEXT%.xz} ;;
+	*tar)     EXT=${PKGEXT} ;;
+	*) echo "WARNING: '%s' is not a valid archive extension." \
+	"$PKGEXT" ; EXT=$PKGEXT ;;
+esac
+
+pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
 ret=0
-bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$?
+
+# when fileglobbing, we want * in an empty directory to expand to
+# the null string rather than itself
+shopt -s nullglob
+# TODO: Maybe this can be set globally for robustness
+shopt -s -o pipefail
+bsdtar -cf - $comp_files * |
+case "$PKGEXT" in
+    *tar.gz)  gzip -c -f -n ;;
+    *tar.bz2) bzip2 -c -f ;;
+    *tar.xz)  xz -c -z - ;;
+    *tar)     cat ;;
+esac > ${pkg_file} || ret=$?
+
 if [ $ret -ne 0 ]; then
     echo "ERROR: unable to write package to $pkg_dest"
     echo "       Maybe the disk is full or you do not have write access"

contrib/bash_completion

@@ -1,365 +1,115 @@
-# vim: set ft=sh ts=2 sw=2 et:
-# file: /etc/bash_completion.d/pacman
+# This file is in the public domain.
 
-# Bash completion for pacman
-# Original: Manolis Tzanidakis <mtzanidakis@freemail.gr>
-#
-# Distributed under the terms of the GNU General Public License, v2 or later.
-#
-
-## initial functions
-
-rem_selected ()
-{
-  # (Adapted from bash_completion by Ian Macdonald <ian@caliban.org>)
-  # This removes any options from the list of completions that have
-  # already been specified on the command line.
-  COMPREPLY=($(echo "${COMP_WORDS[@]}" | \
-    (while read -d ' ' i; do
-      [ "${i}" == "" ] && continue
-      # flatten array with spaces on either side,
-      # otherwise we cannot grep on word boundaries of
-      # first and last word
-      COMPREPLY=" ${COMPREPLY[@]} "
-      # remove word from list of completions
-      COMPREPLY=(${COMPREPLY/ ${i%% *} / })
+_arch_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in ${!COMPREPLY[@]}; do
+      if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
     done
-    echo ${COMPREPLY[@]})))
-  return 0
+  done
 }
 
-_available_repos ()
-{
-  COMPREPLY=( $( compgen -W "$(grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) )
+_arch_ptr2comp() {
+  local list= x y
+  for x; do
+    for y in '0 --' '1 -'; do
+      eval 'set -- ${'$x'[${y% *}]}'
+      list+=\ ${@/#/${y#* }}
+    done
+  done
+  _arch_compgen $list
 }
 
-_installed_pkgs ()
-{
-  local installed_pkgs
-  installed_pkgs=$( ls /var/lib/pacman/local/ )
-  COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do echo ${i%-*-*}; done )" -- $cur ) )
+_arch_incomp() {
+  local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]]
 }
 
-_available_pkgs ()
-{
-  #find balks easilly on a find /foo/*/* type dir, especially one like
-  #   /var/lib/pacman/*/*
-  # This little change-up removes the find *and* only uses enabled repos
-  local available_pkgs
-  local enabled_repos
-  enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
-  available_pkgs=$( for r in $enabled_repos; do echo /var/lib/pacman/sync/$r/*; done )
-  COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) )
-}
-
-_installed_groups ()
-{
-  local installed_groups
-  installed_groups=$( find /var/lib/pacman/local -name desc -exec sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | sort -u )
-  COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-_available_groups ()
-{
-  #find balks easilly on a find /foo/*/* type dir, especially one like
-  #   /var/lib/pacman/*/*
-  # This little change-up removes the find *and* only uses enabled repos
-  local available_groups
-  local enabled_repos
-  enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )
-  available_groups=$( for r in $enabled_repos; do sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | sort -u; done )
-  COMPREPLY=( $( compgen -W "$( for i in $available_groups; do echo ${i%-*-*}; done )" -- $cur ) )
-}
-
-## makepkg completion
-
-_makepkg ()
-{
-  local cur prev
+_makepkg() {
+  local cur opts prev
   COMPREPLY=()
-  cur=${COMP_WORDS[COMP_CWORD]}
+  cur=$(_get_cword)
   prev=${COMP_WORDS[COMP_CWORD-1]}
-
-  case "$prev" in
-    -p)
-      _filedir
-      return 0
-    ;;
-    --help|--cleancache)
-      COMPREPLY=''
-      return 0
-    ;;
-  esac
-
-  if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '\
-      -A --ignorearch \
-      -b --builddeps \
-      -c --clean \
-      -C --cleancache \
-      -d --nodeps \
-      -e --noextract \
-      -f --force \
-      -g --geninteg \
-      -h --help \
-      -i --install \
-      -L --log \
-      -m --nocolor \
-      -o --nobuild \
-      -p \
-      -r --rmdeps \
-      -s --syncdeps \
-      --asroot \
-      --source \
-      --noconfirm \
-      --noprogressbar' -- $cur ) )
+  if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then
+    opts=('allsource asroot clean cleancache config force geninteg help holdver
+           ignorearch install log nobuild nocolor noconfirm nodeps noextract
+           noprogressbar pkg repackage rmdeps skipinteg source syncdeps'
+          'A C L R c d e f g h i m o p r s')
+    _arch_ptr2comp opts
   fi
-
-  rem_selected
+  true
 }
-complete -o default -F _makepkg makepkg
 
-## pacman completion
-
-_instring ()
-{
-  str="${1}"
-  shift 1
-  for c in "${@}"; do
-    if [ $(expr index "${str}" "${c}") -gt 0 ]; then
-      return 0
+_pacman_pkg() {
+  _arch_compgen "$(
+    if [[ $2 ]]; then
+      \pacman -$1 | \cut -d' ' -f1 | \sort -u
+    else
+      \pacman -$1
     fi
-  done
-  return 1
+  )"
 }
 
-_pacman ()
-{
-  local a arg toparse op mod cur
+_pacman() {
+  local common core cur database prev query remove sync upgrade o
   COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
+  database=('asdeps asexplicit')
+  query=('changelog check deps explicit file foreign groups info list owns
+          search unrequired upgrades' 'c e g i k l m o p s t u')
+  remove=('cascade dbonly nodeps nosave print recursive unneeded' 'c k n p s u')
+  sync=('asdeps asexplicit clean downloadonly force groups ignore ignoregroup
+         info list needed nodeps print refresh search sysupgrade'
+        'c f g i l p s u w y')
+  upgrade=('asdeps asexplicit force nodeps print' 'f p')
+  common=('arch cachedir config dbpath debug help logfile noconfirm
+           noprogressbar noscriptlet quiet root verbose' 'b d h q r v')
+  core=('database help query remove sync upgrade version' 'D Q R S U V h')
 
-  # This argument parsing is done so we can check for flag existance later
-  #  right now it's a tad crappy, but does the job
-  for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
-    a=${COMP_WORDS[i]}
-    arg="${a:0:2}"
-    toparse="${a:2}"
-
-    case "${arg}" in
-      -@(U|R|S|Q|h|V))
-        op="${arg/-}"
-        mod="${mod}${a:2}"
-        ;;
-      --)
-        arg="${a:2}"
-        case "${arg}" in
-          remove) op="R" ;;
-          upgrade) op="U" ;;
-          query) op="Q" ;;
-          sync) op="S" ;;
-          help) op="h" ;;
-          version) op="V" ;;
-          verbose) mod="${mod}v" ;;
-          root) mod="${mod}r" ;;
-          dbpath) mod="${mod}b" ;;
-          nodeps) mod="${mod}d" ;;
-          force) mod="${mod}f" ;;
-          groups) mod="${mod}g" ;;
-          info) mod="${mod}i" ;;
-          list) mod="${mod}l" ;;
-          print-uris) mod="${mod}p" ;;
-          search) mod="${mod}s" ;;
-          sysupgrade) mod="${mod}u" ;;
-          upgrades) mod="${mod}u" ;;
-          downloadonly) mod="${mod}w" ;;
-          refresh) mod="${mod}y" ;;
-          changelog) mod="${mod}c" ;;
-          deps) mod="${mod}d" ;;
-          explicit) mod="${mod}e" ;;
-          unrequired) mod="${mod}t" ;;
-          foreign) mod="${mod}m" ;;
-          owns) mod="${mod}o" ;;
-          file) mod="${mod}p" ;;
-          search) mod="${mod}s" ;;
-          upgrades) mod="${mod}u" ;;
-          cascade) mod="${mod}c" ;;
-          check) mod="${mod}k" ;;
-          dbonly) mod="${mod}k" ;;
-          nosave) mod="${mod}n" ;;
-          recursive) mod="${mod}s" ;;
-          unneeded) mod="${mod}u" ;;
-        esac ;;
-      *) toparse="${a}" ;;
-    esac
-
-    arglen=$(( ${#toparse}-1 ))
-    for c in $(seq 0 "${arglen}"); do
-      arg=${toparse:$c:1}
-      [ "${arg}" != "-" ] && mod="${mod}${arg}"
-    done
+  for o in 'D database' 'Q query' 'R remove' 'S sync' 'U upgrade'; do
+    _arch_incomp "$o" && break
   done
 
-  cur=${COMP_WORDS[COMP_CWORD]}
-
-  if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '\
-      -h --help \
-      -Q --query \
-      -R --remove \
-      -S --sync \
-      -U --upgrade \
-      -V --version \
-      ' -- $cur ) )
-    rem_selected
-    return 0
-  fi
-
-  if [[ "$cur" == -* ]]; then
-    case "${op}" in
-      U)
-        COMPREPLY=( $( compgen -W '\
-          --asdeps \
-          --asexplicit \
-          -d --nodeps \
-          -f --force \
-          -h --help \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-      R)
-        COMPREPLY=( $( compgen -W '\
-          -c --cascade \
-          -d --nodeps \
-          -h --help \
-          -k --dbonly \
-          -n --nosave \
-          -s --recursive \
-          -u --unneeded \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-      S)
-        COMPREPLY=( $( compgen -W '\
-          --asdeps \
-          --asexplicit \
-          -c --clean \
-          -d --nodeps \
-          -f --force \
-          -g --groups \
-          -h --help \
-          -i --info \
-          -l --list \
-          -p --print-uris \
-          -s --search \
-          -u --sysupgrade \
-          -w --downloadonly \
-          -y --refresh \
-          --needed \
-          --ignore \
-          --ignoregroup \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
+  if [[ $? != 0 ]]; then
+    _arch_ptr2comp core
+  elif [[ ! $prev =~ ^-\w*[Vbhr] &&
+    ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]]
+  then
+    [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common ||
+      case ${o% *} in
+      D|R)
+          _pacman_pkg Qq;;
       Q)
-        COMPREPLY=( $( compgen -W '\
-          -c --changelog \
-          -d --deps \
-          -e --explicit \
-          -g --groups \
-          -h --help \
-          -i --info \
-          -k --check \
-          -l --list \
-          -m --foreign \
-          -o --owns \
-          -p --file \
-          -s --search \
-          -t --unrequired \
-          -u --upgrades \
-          --config \
-          --logfile \
-          --noconfirm \
-          --noprogressbar \
-          --noscriptlet \
-          -v --verbose \
-          -r --root \
-          -b --dbpath \
-          --cachedir \
-          ' -- $cur ) )
-        return 0
-        ;;
-    esac
-    rem_selected
-  else
-    case "${op}" in
-      U)
-        COMPREPLY=( $( compgen -d -- "$cur" ) \
-                    $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-        return 0
-        ;;
-      h|V)
-        COMPREPLY=''
-        return 0
-        ;;
-      Q)
-        if _instring $mod g; then
-          _installed_groups
-        elif _instring $mod o; then
-          COMPREPLY=( $( compgen -d -- "$cur" ) \
-                      $( compgen -f -- "$cur" ) )
-        elif _instring $mod p; then
-          COMPREPLY=( $( compgen -d -- "$cur" ) \
-                      $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-        elif _instring $mod u; then
-          COMPREPLY=''
-          return 0
-        else
-          _installed_pkgs
-        fi
-        return 0
-        ;;
-      R)
-        _installed_pkgs
-        return 0
-        ;;
+        { _arch_incomp 'g groups' && _pacman_pkg Qg sort; }    ||
+        { _arch_incomp 'p file'   && _pacman_file; }           ||
+          _arch_incomp 'o owns'   || _arch_incomp 'u upgrades' ||
+          _pacman_pkg Qq;;
       S)
-        if _instring $mod l; then
-          _available_repos
-        else
-          _available_pkgs
-        fi
-        return 0
-        ;;
-    esac
+        { _arch_incomp 'g groups' && _pacman_pkg Sg; }      ||
+        { _arch_incomp 'l list'   && _pacman_pkg Sl sort; } ||
+          _pacman_pkg Slq;;
+      U)
+          _pacman_file;;
+      esac
   fi
-
-  rem_selected
+  true
 }
-complete -o filenames -F _pacman pacman
+
+if [[ $(type -t compopt) = "builtin" ]]; then
+  _pacman_file() {
+    compopt -o filenames; _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o default pacman
+else
+  _pacman_file() {
+    _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o filenames -o default pacman
+fi
+
+complete -F _makepkg -o default makepkg
+
+# ex:et ts=2 sw=2 ft=sh

contrib/gensync

@@ -1,134 +0,0 @@
-#!/bin/bash
-#
-#   gensync
-#
-#   Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-myver='3.1.1'
-
-# functions
-
-usage() {
-	printf "gensync (pacman) %s\n\n" "$myver"
-	printf "Usage: %s <root> <destfile> [package_directory]\n\n" "$0"
-	printf "\
-gensync will generate a sync database by reading all PKGBUILD files\n\
-from <root>. gensync builds the database in a temporary directory\n\
-and then compresses it to <destfile>.\n\n"
-	printf "\
-gensync will calculate md5sums of packages in the same directory as\n\
-<destfile>, unless an alternate [package_directory] is specified.\n\n"
-	printf "\
-note: The <destfile> name is important. It must be of the form\n\
-      {treename}.db.tar.gz where {treename} is the name of the custom\n\
-      package repository you configured in /etc/pacman.conf. The\n\
-      generated database must reside in the same directory as your\n\
-      custom packages (also configured in /etc/pacman.conf)\n\n"
-	echo "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-}
-
-version() {
-	printf "gensync (pacman) %s\n" "$myver"
-	printf "\
-Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\n\n\
-This is free software; see the source for copying conditions.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"
-}
-
-error () {
-	local mesg=$1; shift
-	printf "==> ERROR: ${mesg}\n" "$@" >&2
-}
-
-die () {
-	error $*
-	exit 1
-}
-
-# PROGRAM START
-
-if [ "$1" = "-h" -o "$1" = "--help" ]; then
-	usage
-	exit 0
-fi
-
-if [ "$1" = "-V" -o "$1" = "--version" ]; then
-	version
-	exit 0
-fi
-
-if [ $# -lt 2 ]; then
-	usage
-	exit 1
-fi
-
-# source system and user makepkg.conf
-if [ -r /etc/makepkg.conf ]; then
-	source /etc/makepkg.conf
-else
-	die "/etc/makepkg.conf not found. Cannot continue."
-fi
-
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-
-d=$(dirname $1)
-rootdir="$(cd $d && pwd)/$(basename $1)"
-d="$(dirname $2)"
-destdir="$(cd $d && pwd)"
-destfile="$destdir/$(basename $2)"
-pkgdir=""
-if [ "$3" != "" ]; then
-	pkgdir="$3"
-fi
-
-[ ! -d "$rootdir" ] && die "invalid root dir: $rootdir"
-
-echo "gensync: building database entries, generating md5sums..." >&2
-cd "$destdir"
-
-pkgs=""
-
-for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
-	unset pkgname pkgver pkgrel options
-
-	source $file || die "failed to parse $file"
-	if [ "$arch" = 'any' ]; then
-		CARCH='any'
-	fi
-	if [ "$pkgdir" != "" ]; then
-		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
-	else
-		pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
-	fi
-
-	if [ ! -f "$pkgfile" ]; then
-		error "could not find %s-%s-%s-%s%s - skipping" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
-	else
-		pkgs="$pkgs $pkgfile"
-	fi
-done
-
-echo "creating repo DB..."
-
-# we'll trim the output just a tad, as gensync may be used on large repos
-repo-add $destfile $pkgs \
-		| grep -e "package" -e "database"
-
-# vim: set ts=2 sw=2 noet:

contrib/pacdiff

@@ -18,19 +18,23 @@
 #
 
 diffprog=${DIFFPROG:-vimdiff}
+diffsearchpath=${DIFFSEARCHPATH:-/etc}
 locate=0
 
 usage() {
 	echo "pacdiff : a simple pacnew/pacorig/pacsave updater"
 	echo "Usage : pacdiff [-l]"
-	echo "The -l/--locate flag makes pacdiff use locate rather than find"
+	echo "  -l/--locate makes pacdiff use locate rather than find"
+	echo "  DIFFPROG variable allows to override the default vimdiff"
+	echo "  DIFFSEARCHPATH allows to override the default /etc path"
+	echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff"
 }
 
 cmd() {
 	if [ $locate -eq 1 ]; then
 		locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave
 	else
-		find /etc/ \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0
+		find $diffsearchpath \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0
 	fi
 }
 

contrib/pacsearch

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # pacsearch - Adds color and install information to a 'pacman -Ss' search
 #
-# Copyright (C) 2008 Dan McGee <dpmcgee@gmail.com>
+# Copyright (C) 2008, 2010 Dan McGee <dpmcgee@gmail.com>
 #
 # Based off original shell script version:
 # Copyright (C) 2006-2007 Dan McGee <dpmcgee@gmail.com>
@@ -39,7 +39,7 @@ if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") {
 
 if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") {
 	print "$progname version $version\n";
-	print "Copyright (C) 2006-2008 Dan McGee\n";
+	print "Copyright (C) 2006-2010 Dan McGee\n";
 	exit 0;
 }
 
@@ -53,17 +53,18 @@ my $CLR6 = "\e[0;33m";
 my $CLR7 = "\e[1;36m";
 my $INST = "\e[1;31m";
 my $BASE = "\e[0m";
-my $INSTMARK = $INST."***";
 
-# color a "repo/pkgname pkgver" line based on the respository name
+# color a "repo/pkgname pkgver" line based on the repository name
 sub to_color {
 	my $line = shift;
+	# get the installed text colored first
+	$line =~ s/(\[.*\]$)/$INST$1$BASE/;
+	# and now the repo and dealings
 	$line =~ s/(^core\/.*)/$CLR1$1$BASE/;
 	$line =~ s/(^extra\/.*)/$CLR2$1$BASE/;
 	$line =~ s/(^community\/.*)/$CLR3$1$BASE/;
 	$line =~ s/(^testing\/.*)/$CLR4$1$BASE/;
-	$line =~ s/(^unstable\/.*)/$CLR5$1$BASE/;
-	$line =~ s/(^custom\/.*)/$CLR6$1$BASE/;
+	$line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/;
 	$line =~ s/(^local\/.*)/$CLR7$1$BASE/;
 	# any other unknown repository
 	$line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/;
@@ -83,10 +84,10 @@ if ($#syncpkgs >= 0) {
 # counter var for packages, used here and in the query loop too
 my $cnt = 0;
 foreach $_ (@syncpkgs) {
-	# we grab 3 fields here: repo, name/ver, and desc
-	my @pkgfields = /^(.*?)\/(.*?)\n(.*)$/s;
-	# add a fourth field that will indicate install status
-	push (@pkgfields, "");
+	# we grab 4 fields here: repo, name/ver, installed, and desc
+	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	# since installed is optional, we should fill it in if necessary
+	$pkgfields[2] = "" if not defined $pkgfields[2];
 	# add a fifth field that indicates original order
 	push (@pkgfields, $cnt++);
 	# add each sync pkg by name/ver to a hash table for quick lookup
@@ -102,16 +103,13 @@ if ($#querypkgs >= 0) {
 }
 
 foreach $_ (@querypkgs) {
-	# we grab 3 fields here: repo, name/ver, and desc
-	my @pkgfields = /^(.*?)\/(.*?)\n(.*)$/s;
+	# we grab 4 fields here: repo, name/ver, installed, and desc
+	my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s;
+	# since installed is optional, we should fill it in if necessary
+	$pkgfields[2] = "" if not defined $pkgfields[2];
 	# check if the package was listed in the sync out
-	# if it is we want to mark it with a *** marker
-	if (exists $allpkgs{$pkgfields[1]}) {
-		# mark it in our fourth field as installed
-		@{ $allpkgs{$pkgfields[1]} }[3] = $INSTMARK;
-	} else {
-		# add a fourth field that will indicate install status
-		push (@pkgfields, $INSTMARK);
+	if (not exists $allpkgs{$pkgfields[1]}) {
+		$pkgfields[2] = "[installed]";
 		# add a fifth field that indicates original order (after sync)
 		push (@pkgfields, $cnt++);
 		# add our local-only package to the hash
@@ -122,11 +120,11 @@ foreach $_ (@querypkgs) {
 # sort by original order (the fifth field) and print
 foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) {
 	my @v = @{$allpkgs{$_}};
-	my $line = "$v[0]/$v[1]";
+	my $line = "$v[0]/$v[1] $v[2]";
 	$line = to_color($line);
-	# print install marker + colorized "repo/pkgname pkgver" string
-	print "$v[3]$line\n";
-	print "$v[2]\n";
+	# print colorized "repo/pkgname pkgver" string with possible installed text
+	print "$line\n";
+	print "$v[3]\n";
 }
 
 #vim: set noet:

contrib/pactree

@@ -41,7 +41,7 @@ arrow1_color="chocolate4"     #color of the normal arrow
 arrow2_color="grey"           #color of the "provided by" headless arrow
 
 readonly prog_name="pactree"
-readonly prog_ver="0.2"
+readonly prog_ver="0.3"
 
 _usage(){
 	echo "This program generates the dependency tree of an installed package"
@@ -52,13 +52,14 @@ _usage(){
 	echo "  -d, --depth INT            Limit the shown dependencies depth"
 	echo "  -g, --graph                Use graphviz to make an image of the tree"
 	echo "  -l, --linear               Enable linear output"
+	echo "  -r, --reversed             Show reversed dependancies"
 	echo "  -s, --silent               Shh, let me hear those errors!"
 	echo "  -u, --unique               Print the dependency list with no duplicates"
 	echo
 	echo "  -h, --help                 Print this help message"
 	echo "  -v, --version              Print the program name and version"
 	echo
-	echo "Example: $prog_name -c -d 2 readline"
+	echo "Example: $prog_name -c -d2 readline"
 }
 
 _version(){
@@ -140,7 +141,16 @@ _tree(){
 
 		if [[ ! " ${dep_list[@]} " =~ " $pkg_name " ]] && [ $spaces -ne $max_depth ]; then
 			dep_list=( "${dep_list[@]}" "$pkg_name" )
-			for dep_pkg in $(_grabfield "$pkg_dir/depends" %DEPENDS%); do
+			if [ $reversed_dep -eq 0 ]; then
+				deps_pkg="$(_grabfield "$pkg_dir/depends" %DEPENDS%)"
+			else
+				reqs_pkg_dir="$(_finddep "$pkg_name" %DEPENDS% depends)"
+				unset deps_pkg
+				for req_pkg_dir in $reqs_pkg_dir; do
+					deps_pkg=$(echo "$deps_pkg" "$(_grabfield "$req_pkg_dir/desc" %NAME%)")
+				done
+			fi
+			for dep_pkg in $deps_pkg; do
 				spaces=$2		#Bash scoping ;_;
 				if [ $graphviz -eq 1 ]; then
 					echo "\"$1\" -> \"${dep_pkg%%[<>=]*}\" [color=$arrow1_color];"
@@ -208,6 +218,12 @@ for (( n=0 ; n < $len_options ; n++ )); do
 		continue
 	fi
 
+	if [ "${options[$n]}" = "-r" -o "${options[$n]}" = "--reversed" ]; then
+		unset options[$n]
+		reversed_dep=1
+		continue
+	fi
+
 	if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then
 		if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then
 			max_depth="${options[$n]#-d}"
@@ -229,6 +245,7 @@ linear=${linear:-0}
 silent=${silent:-0}
 nodup=${nodup:-0}
 graphviz=${graphviz:-0}
+reversed_dep=${reversed_dep:-0}
 
 if [ $colored -ne 1 ]; then
 	unset branch1_color
@@ -292,8 +309,12 @@ if [ $graphviz -eq 1 ]; then
 	root_pkgs="${options[@]}"
 	# Uncomment for the "generated by pactree" node in graphviz
 	#advert="xyz [height=0.07, fontsize=8.0, label=\"GENERATED WITH PACTREE\",shape=box,color="black",style=filled,fontcolor="white"];\n"
-
-	echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.deps.$gformat"
+	if [ $reversed_dep -eq 0 ]; then
+		file_extension="deps.$gformat"
+	else
+		file_extension="reqs.$gformat"
+	fi
+	echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.$file_extension"
 else _main
 fi
 

contrib/updatesync

@@ -1,137 +0,0 @@
-#!/bin/bash
-#
-#   updatesync
-#
-#   Copyright (c) 2004 by Jason Chu <jason@archlinux.org>
-#   Derived from gensync (c) 2002-2006 Judd Vinet <jvinet@zeroflux.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-myver='3.1.1'
-
-# functions
-
-usage() {
-	printf "updatesync (pacman) %s\n\n" "$myver"
-	printf "Usage: %s <action> <destfile> <option> [package_directory]\n\n" "$0"
-	printf "\
-updatesync will update a sync database by reading a PKGBUILD and\n\
-modifying the destfile. updatesync updates the database in a temporary\n\
-directory and then compresses it to <destfile>.\n\n"
-	printf "There are two types of actions:\n\n"
-	printf "upd - Will update a package's entry or create it if it doesn't exist.\n      It takes the package's PKGBUILD as an option.\n"
-	printf "del - Will remove a package's entry from the db. It takes the package's\n      name as an option.\n"
-	echo
-	printf "\
-updatesync will calculate md5sums of packages in the same directory as\n\
-<destfile>, unless an alternate [package_directory] is specified.\n\n"
-	echo "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-}
-
-version() {
-	printf "updatesync (pacman) %s\n" "$myver"
-	printf "\
-Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\n\n\
-This is free software; see the source for copying conditions.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"
-}
-
-error () {
-	local mesg=$1; shift
-	printf "==> ERROR: ${mesg}\n" "$@" >&2
-}
-
-die () {
-	error $*
-	exit 1
-}
-
-# PROGRAM START
-
-if [ "$1" = "-h" -o "$1" = "--help" ]; then
-	usage
-	exit 0
-fi
-
-if [ "$1" = "-V" -o "$1" = "--version" ]; then
-	version
-	exit 0
-fi
-
-if [ $# -lt 3 ]; then
-	usage
-	exit 1
-fi
-
-# source system and user makepkg.conf
-if [ -r /etc/makepkg.conf ]; then
-	source /etc/makepkg.conf
-else
-	die "/etc/makepkg.conf not found. Cannot continue."
-fi
-
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-if [ "$1" != "upd" -a "$1" != "del" ]; then
-	usage
-	exit 1
-fi
-
-action=$1
-pkgdb=$2
-option=$3
-pkgdir="$(pwd)"
-if [ "$4" != "" ]; then
-	pkgdir="$4"
-fi
-
-if [ "$action" = "upd" ]; then # INSERT / UPDATE
-	if [ ! -f "$option" ]; then
-		die "$option not found"
-	fi
-
-	unset pkgname pkgver pkgrel options
-
-	source $option || die "failed to parse $option"
-	if [ "$arch" = 'any' ]; then
-		CARCH='any'
-	fi
-	pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
-
-	if [ ! -f "$pkgfile" ]; then
-		die "could not find %s-%s-%s-%s%s - aborting" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
-	fi
-
-	repo-add "$pkgdb" "$pkgfile"
-else # DELETE
-	fname="$(basename $option)"
-	if [ "$fname" = "PKGBUILD" ]; then
-		if [ ! -f "$option" ]; then
-			die "%s not found" $option
-		fi
-
-		unset pkgname pkgver pkgrel options
-		source $option
-	else
-		pkgname=$option
-	fi
-
-	repo-remove "$pkgdb" "$pkgname"
-fi
-
-exit 0
-# vim: set ts=2 sw=2 noet:

contrib/zsh_completion

@@ -26,13 +26,14 @@ _pacman_opts_common=(
 	'--noconfirm[Do not ask for confirmation]'
 	'--noprogressbar[Do not show a progress bar when downloading files]'
 	'--noscriptlet[Do not execute the install scriptlet if one exists]'
+	'--print[Only print the targets instead of performing the operation]'
 )
 
 # options for passing to _arguments: options for --upgrade commands
 _pacman_opts_pkgfile=(
 	'-d[Skip dependency checks]'
 	'-f[Overwrite conflicting files]'
-	'*:package file:_files -g "*.pkg.tar.gz(.)"'
+	'*:package file:_files -g "*.pkg.tar.*(.)"'
 )
 
 # options for passing to _arguments: subactions for --query command
@@ -120,7 +121,7 @@ _pacman_action_query() {
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.gz"'
+				'*:package file:_files -g "*.pkg.tar.*"'
 				;;
 		query_group)
 			_arguments -s : \
@@ -295,11 +296,11 @@ _pacman() {
 				"$_pacman_opts_query_modifiers[@]" \
 				'*:package file:_files'
 				;;
-		-Q*p*) # file *.pkg.tar.gz
+		-Q*p*) # file *.pkg.tar.*
 			_arguments -s : \
 				"$_pacman_opts_common[@]" \
 				"$_pacman_opts_query_modifiers[@]" \
-				'*:package file:_files -g "*.pkg.tar.gz"'
+				'*:package file:_files -g "*.pkg.tar.*"'
 				;;
 		-Q*)  _pacman_action_query    ;;
 		-R*)  _pacman_action_remove   ;;

doc/.gitignore

@@ -10,3 +10,4 @@ repo-remove.8
 *.html
 *.xml
 man3
+website.tar.gz

doc/Makefile.am

@@ -80,33 +80,46 @@ endif
 
 html: $(HTML_DOCS)
 
+website: html
+	bsdtar czf website.tar.gz $(HTML_DOCS) \
+		-C /etc/asciidoc/stylesheets/ \
+		xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+		-C /etc/asciidoc/javascripts/ \
+		asciidoc-xhtml11.js \
+		-C /etc/asciidoc/ \
+		images
+
+pkgdatadir = ${datadir}/${PACKAGE}
+
 ASCIIDOC_OPTS = \
 	-f asciidoc.conf \
 	-a pacman_version="$(REAL_PACKAGE_VERSION)" \
 	-a pacman_date="`date +%Y-%m-%d`" \
+	-a pkgdatadir=$(pkgdatadir) \
 	-a sysconfdir=$(sysconfdir)
+
 A2X_OPTS = \
 	--no-xmllint \
 	-d manpage \
 	-f manpage \
-	--xsltproc-opts='-param man.endnotes.list.enabled 0' \
-	--xsltproc-opts='-param man.endnotes.are.numbered 0'
+	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
 
 # These rules are due to the includes and files of the asciidoc text
 $(ASCIIDOC_MANS): asciidoc.conf footer.txt
 	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
 
 %.html: %.txt
-	asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt
+	asciidoc $(ASCIIDOC_OPTS) $*.txt
 	dos2unix $@
 
 HACKING.html: ../HACKING
-	asciidoc $(ASCIIDOC_OPTS) -a linkcss -o $@ ../HACKING
+	asciidoc $(ASCIIDOC_OPTS) -o $@ ../HACKING
 	dos2unix $@
 
 # Customizations for certain HTML docs
 $(HTML_MANPAGES): asciidoc.conf footer.txt
 $(HTML_OTHER): asciidoc.conf
+%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons
 %.8.html: ASCIIDOC_OPTS += -d manpage
 %.5.html: ASCIIDOC_OPTS += -d manpage
 %.3.html: ASCIIDOC_OPTS += -d manpage

doc/PKGBUILD-example.txt

@@ -15,6 +15,6 @@ md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
+  make
   make prefix=$pkgdir/usr install
 }

doc/PKGBUILD.5.txt

@@ -20,12 +20,10 @@ This manual page is meant to describe general rules about PKGBUILDs. Once a
 PKGBUILD is written, the actual package is built using makepkg and installed
 with pacman.
 
-NOTE: If you are using Arch Linux and have a local copy of the Arch Build
-System (ABS) tree on your computer, or are using another distribution that
-provides a similar tree of build files, you can copy the provided
-PKGBUILD.proto file to a new package build directory and make customizations to
-suit your needs. An up to date prototype file can also be found in the source
-distribution of this package.
+NOTE: An example PKGBUILD, useful for reference, is located in '{pkgdatadir}'.
+Also located there are other example files such as a ChangeLog and an install
+script. You can copy the provided PKGBUILD.proto file to a new package build
+directory and make customizations to suit your needs.
 
 
 Options and Directives
@@ -40,18 +38,21 @@ This will prevent any possible name clashes with internal makepkg variables.
 For example, to store the base kernel version in a variable, use something
 similar to `$_basekernver`.
 
-*pkgname*::
+*pkgname (array)*::
 	The name of the package. This has be a unix-friendly name as it will be
-	used in the package filename.
+	used in the package filename. Members of the array are not allowed to start
+	with hyphens.
 
 *pkgver*::
 	The version of the software as released from the author (e.g. '2.7.1').
+	The variable is not allowed to contain hyphens.
 
 *pkgrel*::
 	This is the release number specific to the Arch Linux release. This
 	allows package maintainers to make updates to the package's configure
 	flags, for example. A pkgrel of 1 is typically used for each upstream
-	software release and is incremented for intermediate PKGBUILD updates.
+	software release and is incremented for intermediate PKGBUILD updates. The
+	variable is not allowed to contain hyphens.
 
 *pkgdesc*::
 	This should be a brief description of the package and its functionality.
@@ -79,6 +80,12 @@ similar to `$_basekernver`.
 	be copied into the package by makepkg. It does not need to be included
 	in the source array (e.g. `install=pkgname.install`).
 
+*changelog*::
+	Specifies a changelog file that is to be included in the package.
+	This file should reside in the same directory as the PKGBUILD, and will
+	be copied into the package by makepkg. It does not need to be included
+	in the source array (e.g. `changelog=$pkgname.changelog`).
+
 *source (array)*::
 	An array of source files required to build the package. Source files
 	must either reside in the same directory as the PKGBUILD file, or be a
@@ -145,7 +152,7 @@ name. The syntax is: `source=('filename::url')`.
 	base functionality, but may be necessary to make full use of the contents
 	of this package. optdepends are currently for informational purposes only
 	and are not utilized by pacman during dependency resolution. The format
-	should be similar to the following:
+	for specifying optdepends is:
 
 	optdepends=('fakeroot: for makepkg usage as normal user')
 
@@ -227,10 +234,12 @@ name. The syntax is: `source=('filename::url')`.
 
 build() Function
 ----------------
-In addition to the above directives, the build() bash function comprises the
-remainder of the PKGBUILD. This is directly sourced and executed by makepkg, so
-anything that bash or the system has available is available for use here. Be
-sure any exotic commands used are covered by `makedepends`.
+In addition to the above directives, the optional build() bash function usually
+comprises the remainder of the PKGBUILD. This is directly sourced and executed
+by makepkg, so anything that bash or the system has available is available for
+use here. The function is run in `bash -e` mode, meaning any command that exits
+with a non-zero status will cause the function to exit. Be sure any exotic
+commands used are covered by `makedepends`.
 
 All of the above variables such as `pkgname` and `pkgver` are available for use
 in the build function. In addition, makepkg defines three variables for your
@@ -254,31 +263,35 @@ the build function.
 
 package() Function
 ------------------
-An optional package() function can be specified in addition to the build() function.
-This function is run immediately after the build() function. When specified in
-combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot
-usage will be limited to running the packaging stage. The build() function will be
-run as the user calling makepkg.
+An optional package() function can be specified in addition to the build()
+function. This function is run immediately after the build() function. The
+function is run in `bash -e` mode, meaning any command that exits with a
+non-zero status will cause the function to exit. When specified in combination
+with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage
+will be limited to running the packaging stage. An existing build() function
+will be run as the user calling makepkg.
 
 Package Splitting
 -----------------
-makepkg supports building multiple packages from a single PKGBUILD. This is achieved
-by assigning an array of package names to the `pkgname` directive. Each split package
-uses a corresponding packaging function with name `package_foo()`, where `foo` is the
-name of the split package.
+makepkg supports building multiple packages from a single PKGBUILD. This is
+achieved by assigning an array of package names to the `pkgname` directive.
+Each split package uses a corresponding packaging function with name
+`package_foo()`, where `foo` is the name of the split package.
 
-All options and directives for the split packages default to the global values given
-within the PKGBUILD. However, some of these can be overridden within each split
-package's packaging function. The following variables can be overridden: `pkgdesc`,
-`license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`,
-`backup`, `options` and `install`.
+All options and directives for the split packages default to the global values
+given within the PKGBUILD. However, some of these can be overridden within each
+split package's packaging function. The following variables can be overridden:
+`pkgver`, `pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
+`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`,
+`install` and `changelog`.
 
 An optional global directive is available when building a split package:
 
 *pkgbase*::
 	The name used to refer to the group of packages in the output of makepkg
 	and in the naming of source-only tarballs.  If not specified, the first
-	element in the `pkgname` array is used.
+	element in the `pkgname` array is used.  The variable is not allowed to
+	begin with a hyphen.
 
 Install/Upgrade/Remove Scripting
 --------------------------------
@@ -318,9 +331,8 @@ same directory as the PKGBUILD script. Then use the install directive:
 	install=pkgname.install
 
 The install script does not need to be specified in the source array. A
-template install file is available with the source distribution of this
-program, or one may be provided by your distribution. For example, Arch Linux
-provides prototype install files in the ABS tree.
+template install file is available in '{pkgdatadir}' as 'proto.install' for
+reference with all of the available functions defined.
 
 
 Development Directives

doc/index.txt

@@ -62,6 +62,7 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2010-06-16   v3.4.0
 2009-11-10   v3.3.3
 2009-10-05   v3.3.2
 2009-09-22   v3.3.1
@@ -189,7 +190,7 @@ Pacman/libalpm frontends:
 
 Copyright
 ---------
-pacman is Copyright (C) 2006-2009 Pacman Development Team
+pacman is Copyright (C) 2006-2010 Pacman Development Team
 <pacman-dev@archlinux.org> and Copyright (C) 2002-2006 Judd Vinet
 <jvinet@zeroflux.org> and is licensed through the GNU General Public License,
 version 2 or later.

doc/makepkg.8.txt

@@ -81,14 +81,14 @@ Options
 
 *-g, \--geninteg*::
 	For each source file in the source array of PKGBUILD, download the file
-	if required and generate integrity checks. The integrity checks
-	generated are determined by the value of the INTEGRITY_CHECK array in
-	linkman:makepkg.conf[5]. This output can be redirected into your
-	PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`".
+	if required and generate integrity checks. The integrity checks generated
+	are determined by the checks present in the PKGBUILD, falling back to the
+	value of the INTEGRITY_CHECK array in makepkg.conf(5) if these are absent
+	This output can be redirected into your PKGBUILD for source validation
+	using "`makepkg -g >> PKGBUILD`".
 
 *--skipinteg*::
-	Do not fail when the PKGBUILD does not contain any integrity checks, just
-	print a warning instead.
+	Do not perform any integrity checks, just print a warning instead.
 
 *-h, \--help*::
 	Output syntax and command line options.
@@ -149,6 +149,10 @@ Options
 	remote builder, or a tarball upload. Because integrity checks are verified,
 	all source files of the package need to be present or downloadable.
 
+*\--pkg <`list`>*::
+	Only build listed packages from a split package. The use of quotes is
+	necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"`
+
 *\--noconfirm*::
 	(Passed to pacman) Prevent pacman from waiting for user input before
 	proceeding with operations.
@@ -166,6 +170,23 @@ separate utility 'versionpkg'. See linkman:PKGBUILD[5] for details on how to
 set up a development PKGBUILD.
 
 
+Environment Variables
+---------------------
+*PACMAN*::
+	The command that will be used to check for missing dependencies and to
+	install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U
+	operations must be supported by this command. If the variable is not
+	set or empty, makepkg will fall back to `pacman'.
+
+**PKGDEST=**"/path/to/folder"::
+	Folder where the resulting packages will be stored. Overrides the
+	corresponding value defined in linkman:makepkg.conf[5].
+
+**SRCDEST=**"/path/to/folder"::
+	Folder where the downloaded sources will be stored. Overrides the
+	corresponding value defined in linkman:makepkg.conf[5].
+
+
 Configuration
 -------------
 See linkman:makepkg.conf[5] for more details on configuring makepkg using the

doc/makepkg.conf.5.txt

@@ -135,6 +135,18 @@ Options
 	affects both generation and checking. The current valid options are:
 	`md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
 
+**STRIP_BINARIES=**"--strip-all"::
+	Options to be used when stripping binaries. See linkman:strip[1]
+	for details.
+
+**STRIP_SHARED=**"--strip-unneeded"::
+	Options to be used when stripping shared libraries. See linkman:strip[1]
+	for details.
+
+**STRIP_STATIC=**"--strip-debug"::
+	Options to be used when stripping static libraries. See  linkman:strip[1]
+	for details.
+
 **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 manual (man and info)
@@ -171,6 +183,11 @@ Options
 	in the current directory. Many people like to keep all source files in
 	a central location for easy cleanup, so this path can be set here.
 
+**SRCPKGDEST=**"/path/to/folder"::
+	If this value is not set, source package files will be stored in
+	PKGDEST. Many people like to keep all source package files in
+	a central location for easy cleanup, so this path can be set here.
+
 **PACKAGER=**"John Doe <john@example.com>"::
 	This value is used when querying a package to see who was the builder.
 	It is recommended you change this to your name and email address.

doc/pacman.8.txt

@@ -28,6 +28,12 @@ front ends to be written (for instance, a GUI front end).
 
 Operations
 ----------
+*-D, \--database*::
+	Modify the package database. This options allows you to modify certain
+	attributes of the installed packages in pacman's database. At the
+	moment, you can only change the install reason using '\--asdeps' and
+	'\--asexplicit' options.
+
 *-Q, \--query*::
 	Query the package database. This operation allows you to view installed
 	packages and their files, as well as meta-information about individual
@@ -82,9 +88,11 @@ to determine which packages need upgrading. This behavior operates as follows:
 	"bash>=3.2"`.
 
 *-U, \--upgrade*::
-	Upgrade or add package(s) to the system. Either a URL or file path can be
-	specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config
-	Files>> for an explanation on how pacman takes care of config files.
+	Upgrade or add package(s) to the system and install the required
+	dependencies from sync repos. Either a URL or file path can be
+	specified. This is a ``remove-then-add'' process. See <<UO,Upgrade
+	Options>> below; also see <<HCF,Handling Config Files>> for an explanation
+	on how pacman takes care of config files.
 
 *-V, \--version*::
 	Display version and exit.
@@ -166,6 +174,19 @@ Options
 	If an install scriptlet exists, do not execute it. Do not use this
 	unless you know what you are doing.
 
+*\--arch* <'arch'>::
+	Specify an alternate architecture.
+
+*-p, \--print*::
+	Only print the targets instead of performing the actual operation (sync,
+	remove or upgrade).  Use '\--print-format' to specify how targets are
+	displayed.  The default format string is "%l", which displays url with '-S',
+	filename with '-U' and pkgname-pkgver with '-R'.
+
+*\--print-format* <'format'>::
+	Specify a printf-like format to control the output of the '\--print'
+	operation.  The possible are attributes are : %n for pkgname, %v for pkgver, %l
+	for location, %r for repo and %s for size.
 
 Query Options[[QO]]
 -------------------
@@ -253,7 +274,7 @@ Remove Options[[RO]]
 	or more target packages. This operation is recursive, and must be used
 	with care since it can remove many potentially needed packages.
 
-*-k, \--keep*::
+*-k, \--dbonly*::
 	Removes the database entry only. Leaves all files in place.
 
 *-n, \--nosave*::
@@ -296,18 +317,14 @@ linkman:pacman.conf[5].
 	view all groups and their members.
 
 *-i, \--info*::
-	Display dependency and other information for a given package. This will
-	search through all repositories for a matching package.
+	Display information on a given sync database package. Passing two '\--info'
+	or '-i' flags will also display those packages in all repositories that
+	depend on this package.
 
 *-l, \--list*::
 	List all packages in the specified repositories. Multiple repositories
 	can be specified on the command line.
 
-*-p, \--print-uris*::
-	Print out URIs for each package that will be installed, including any
-	dependencies yet to be installed. These can be piped to a file and
-	downloaded at a later time, using a program like wget.
-
 *-q, \--quiet*::
 	Show less information for certain sync operations. (This is useful when
 	pacman's output is processed in a script.) Search will only show package
@@ -330,7 +347,9 @@ linkman:pacman.conf[5].
 	necessary. Pass this option twice to enable package downgrade; in this
 	case pacman will select sync packages whose version does not match with
 	the local version. This can be useful when the user switches from a testing
-	repo to a stable one.
+	repo to a stable one. Additional targets can also be specified manually, so
+	that '-Su foo' will do a system upgrade and install/upgrade the foo package in
+	the same operation.
 
 *-w, \--downloadonly*::
 	Retrieve all packages from the server, but do not install/upgrade
@@ -357,6 +376,14 @@ linkman:pacman.conf[5].
 	separating them with a comma.
 
 
+Upgrade Options[[UO]]
+--------------------
+*-k, \--dbonly*::
+	Adds the database entries for the specified packages but do not install any
+	of the files. On an upgrade operation, the existing package and all files
+	will be removed and the database entry for the new package will be added.
+
+
 Handling Config Files[[HCF]]
 ----------------------------
 Pacman uses the same logic as rpm to determine action against files that are

doc/pacman.conf.5.txt

@@ -98,7 +98,16 @@ Options
 
 *Include =* path::
 	Include another config file. This file can include repositories or
-	general configuration  options.
+	general configuration options. Wildcards in the specified paths will get
+	expanded based on linkman:glob[7] rules.
+
+*Architecture =* auto | i686 | x86_64 | ...::
+	If set, pacman will only allow installation of packages of the given
+	architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will
+	use the system architecture, provided by in ``uname -m''.  If unset, no
+	architecture checks are made. *NOTE*: packages with the special
+	architecture 'any' can always be installed, as they are meant to be
+	architecture independent.
 
 *XferCommand =* /path/to/command %u::
 	If set, an external program will be used to download all remote files.
@@ -111,9 +120,6 @@ Options
 	http/ftp support, or need the more advanced proxy support that comes with
 	utilities like wget.
 
-*NoPassiveFtp*::
-	Disables passive ftp connections when downloading packages. (aka Active Mode)
-
 *NoUpgrade =* file ...::
 	All files listed with a `NoUpgrade` directive will never be touched during
 	a package install/upgrade, and the new files will be installed with a
@@ -179,10 +185,12 @@ Include = /etc/pacman.d/mirrorlist
 
 During parsing, pacman will define the `$repo` variable to the name of the
 current section. This is often utilized in files specified using the 'Include'
-directive so all repositories can use the same mirrorfile.
+directive so all repositories can use the same mirrorfile. pacman also defines
+the `$arch` variable to the value of `Architecture`, so the same mirrorfile can
+even be used for different architectures.
 
 --------
-Server = ftp://ftp.archlinux.org/$repo/os/arch
+Server = ftp://ftp.archlinux.org/$repo/os/$arch
 --------
 
 The order of repositories in the configuration files matters; repositories

etc/Makefile.am

@@ -13,6 +13,9 @@ edit = sed \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
 	-e 's|@PKGEXT[@]|$(PKGEXT)|g' \
 	-e 's|@SRCEXT[@]|$(SRCEXT)|g' \
+	-e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \
+	-e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \
+	-e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \
 	-e 's|@CARCH[@]|$(CARCH)|g' \
 	-e 's|@CHOST[@]|$(CHOST)|g' \
 	-e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \

etc/makepkg.conf.in

@@ -26,7 +26,7 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
 CARCH="@CARCH@"
 CHOST="@CHOST@"
 
-#-- Exclusive: will only run on @CARCHFLAGS@
+#-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
@@ -72,6 +72,12 @@ OPTIONS=(strip docs libtool emptydirs zipman purge)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="@STRIP_BINARIES@"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="@STRIP_SHARED@"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="@STRIP_STATIC@"
 #-- Manual (man and info) directories to compress (if zipman is specified)
 MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 #-- Doc directories to remove (if !docs is specified)
@@ -91,6 +97,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #PKGDEST=/home/packages
 #-- Source cache: specify a fixed directory where source files will be cached
 #SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
 

etc/pacman.conf.in

@@ -17,8 +17,9 @@ HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl %u > %o
+#XferCommand = /usr/bin/curl -C - %u > %o
 #CleanMethod = KeepInstalled
+Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
@@ -28,7 +29,6 @@ SyncFirst   = pacman
 #NoExtract   =
 
 # Misc options (all disabled by default)
-#NoPassiveFtp
 #UseSyslog
 #ShowSize
 #UseDelta
@@ -42,6 +42,7 @@ SyncFirst   = pacman
 #   - repositories listed first will take precedence when packages
 #     have identical names, regardless of version number
 #   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
 #
 # Repository entries are of the format:
 #       [repo-name]
@@ -57,7 +58,7 @@ SyncFirst   = pacman
 # servers immediately after the header and they will be used before the
 # default mirrors.
 #[core]
-#Server = ftp://ftp.example.com/foobar/$repo/os/i686/
+#Server = ftp://ftp.example.com/foobar/$repo/os/$arch/
 # The file referenced here should contain a list of 'Server = ' lines.
 #Include = @sysconfdir@/pacman.d/mirrorlist
 

lib/libalpm/Makefile.am

@@ -43,7 +43,8 @@ libalpm_la_SOURCES = \
 	remove.h remove.c \
 	sync.h sync.c \
 	trans.h trans.c \
-	util.h util.c
+	util.h util.c \
+	version.c
 
 libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
 libalpm_la_LIBADD = $(LTLIBINTL)

lib/libalpm/add.c

@@ -1,7 +1,7 @@
 /*
  *  add.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -50,21 +50,30 @@
 #include "remove.h"
 #include "handle.h"
 
-int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
+/** Add a file target to the transaction.
+ * @param target the name of the file target to add
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_add_target(char *target)
 {
 	pmpkg_t *pkg = NULL;
 	const char *pkgname, *pkgver;
 	alpm_list_t *i;
+	pmtrans_t *trans;
 
 	ALPM_LOG_FUNC;
 
+	/* Sanity checks */
+	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	trans = handle->trans;
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(name != NULL && strlen(name) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 
-	_alpm_log(PM_LOG_DEBUG, "loading target '%s'\n", name);
+	_alpm_log(PM_LOG_DEBUG, "loading target '%s'\n", target);
 
-	if(alpm_pkg_load(name, 1, &pkg) != 0) {
+	if(alpm_pkg_load(target, 1, &pkg) != 0) {
 		goto error;
 	}
 	pkgname = alpm_pkg_get_name(pkg);
@@ -72,17 +81,19 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
 
 	/* check if an older version of said package is already in transaction
 	 * packages.  if so, replace it in the list */
-	for(i = trans->packages; i; i = i->next) {
+	for(i = trans->add; i; i = i->next) {
 		pmpkg_t *transpkg = i->data;
 		if(strcmp(transpkg->name, pkgname) == 0) {
 			if(alpm_pkg_vercmp(transpkg->version, pkgver) < 0) {
-				_alpm_log(PM_LOG_WARNING, _("replacing older version %s-%s by %s in target list\n"),
-				          transpkg->name, transpkg->version, pkgver);
+				_alpm_log(PM_LOG_WARNING,
+						_("replacing older version %s-%s by %s in target list\n"),
+						transpkg->name, transpkg->version, pkgver);
 				_alpm_pkg_free(i->data);
 				i->data = pkg;
 			} else {
-				_alpm_log(PM_LOG_WARNING, _("skipping %s-%s because newer version %s is in target list\n"),
-				          pkgname, pkgver, transpkg->version);
+				_alpm_log(PM_LOG_WARNING,
+						_("skipping %s-%s because newer version %s is in target list\n"),
+						pkgname, pkgver, transpkg->version);
 				_alpm_pkg_free(pkg);
 			}
 			return(0);
@@ -90,7 +101,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
 	}
 
 	/* add the package to the transaction */
-	trans->packages = alpm_list_add(trans->packages, pkg);
+	trans->add = alpm_list_add(trans->add, pkg);
 
 	return(0);
 
@@ -99,176 +110,6 @@ error:
 	return(-1);
 }
 
-int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
-{
-	alpm_list_t *lp = NULL;
-
-	ALPM_LOG_FUNC;
-
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-
-	/* Check dependencies
-	 */
-	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
-		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
-
-		/* look for unsatisfied dependencies */
-		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
-		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, NULL, trans->packages);
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
-				alpm_list_free(lp);
-			}
-			RET_ERR(PM_ERR_UNSATISFIED_DEPS, -1);
-		}
-
-		/* no unsatisfied deps, so look for conflicts */
-		_alpm_log(PM_LOG_DEBUG, "looking for conflicts\n");
-		alpm_list_t *inner = _alpm_innerconflicts(trans->packages);
-		alpm_list_t *outer = _alpm_outerconflicts(db, trans->packages);
-		lp = alpm_list_join(inner, outer);
-
-		/* TODO : factorize the conflict resolving code from sync.c to use it here (FS#3492) */
-
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_conflict_free);
-				alpm_list_free(lp);
-			}
-			if(inner) {
-				_alpm_log(PM_LOG_ERROR, _("conflicting packages were found in target list\n"));
-				_alpm_log(PM_LOG_ERROR, _("you cannot install two conflicting packages at the same time\n"));
-			}
-			if(outer) {
-				_alpm_log(PM_LOG_ERROR, _("replacing packages with -U is not supported yet\n"));
-				_alpm_log(PM_LOG_ERROR, _("you can replace packages manually using -Rd and -U\n"));
-			}
-			RET_ERR(PM_ERR_CONFLICTING_DEPS, -1);
-		}
-
-		/* re-order w.r.t. dependencies */
-		_alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n");
-		lp = _alpm_sortbydeps(trans->packages, 0);
-		/* free the old alltargs */
-		alpm_list_free(trans->packages);
-		trans->packages = lp;
-
-		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_DONE, NULL, NULL);
-	}
-
-	/* Check for file conflicts */
-	if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
-
-		_alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n");
-		lp = _alpm_db_find_fileconflicts(db, trans, trans->packages, NULL);
-		if(lp != NULL) {
-			if(data) {
-				*data = lp;
-			} else {
-				alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_fileconflict_free);
-				alpm_list_free(lp);
-			}
-			RET_ERR(PM_ERR_FILE_CONFLICTS, -1);
-		}
-
-		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL);
-	}
-
-	return(0);
-}
-
-static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pmdb_t *db) {
-	/* this is kinda odd.  If the old package exists, at this point we make a
-	 * NEW transaction, unrelated to handle->trans, and instantiate a "remove"
-	 * with the type PM_TRANS_TYPE_REMOVEUPGRADE. TODO: kill this weird
-	 * behavior. */
-	pmtrans_t *tr = _alpm_trans_new();
-
-	ALPM_LOG_FUNC;
-
-	_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
-			oldpkg->name, oldpkg->version);
-
-	if(!tr) {
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	if(_alpm_trans_init(tr, PM_TRANS_TYPE_REMOVEUPGRADE, trans->flags,
-				NULL, NULL, NULL) == -1) {
-		_alpm_trans_free(tr);
-		tr = NULL;
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	if(_alpm_remove_loadtarget(tr, db, newpkg->name) == -1) {
-		_alpm_trans_free(tr);
-		tr = NULL;
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	/* copy the remove skiplist over */
-	tr->skip_remove = alpm_list_strdup(trans->skip_remove);
-	const alpm_list_t *b;
-
-	/* Add files in the NEW backup array to the NoUpgrade array
-	 * so this removal operation doesn't kill them */
-	alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade);
-	/* old package backup list */
-	alpm_list_t *filelist = alpm_pkg_get_files(newpkg);
-	for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
-		char *backup = _alpm_backup_file(b->data);
-		/* safety check (fix the upgrade026 pactest) */
-		if(!alpm_list_find_str(filelist, backup)) {
-			FREE(backup);
-			continue;
-		}
-		_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
-				backup);
-		handle->noupgrade = alpm_list_add(handle->noupgrade,
-				backup);
-	}
-
-	/* TODO: we could also add files in the OLD backup array, but this would
-	 * change the backup handling behavior, and break several pactests, and we
-	 * can't do this just before 3.1 release.
-	 * The unlink_file function in remove.c would also need to be reviewed. */
-#if 0
-	/* new package backup list */
-	for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) {
-		char *backup = _alpm_backup_file(b->data);
-		/* make sure we don't add duplicate entries */
-		if(!alpm_list_find_ptr(handle->noupgrade, backup)) {
-			_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
-					backup);
-			handle->noupgrade = alpm_list_add(handle->noupgrade,
-					backup);
-		}
-	}
-#endif
-
-	int ret = _alpm_remove_commit(tr, db);
-
-	_alpm_trans_free(tr);
-	tr = NULL;
-
-	/* restore our "NoUpgrade" list to previous state */
-	FREELIST(handle->noupgrade);
-	handle->noupgrade = old_noupgrade;
-
-	if(ret == -1) {
-		RET_ERR(PM_ERR_TRANS_ABORT, -1);
-	}
-
-	return(0);
-}
-
 static int extract_single_file(struct archive *archive,
 		struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg,
 		pmtrans_t *trans, pmdb_t *db)
@@ -291,13 +132,13 @@ static int extract_single_file(struct archive *archive,
 
 	if(strcmp(entryname, ".INSTALL") == 0) {
 		/* the install script goes inside the db */
-		snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path,
-				newpkg->name, newpkg->version);
+		snprintf(filename, PATH_MAX, "%s%s-%s/install",
+				_alpm_db_path(db), newpkg->name, newpkg->version);
 		archive_entry_set_perm(entry, 0644);
 	} else if(strcmp(entryname, ".CHANGELOG") == 0) {
 		/* the changelog goes inside the db */
-		snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path,
-				newpkg->name, newpkg->version);
+		snprintf(filename, PATH_MAX, "%s%s-%s/changelog",
+				_alpm_db_path(db), newpkg->name, newpkg->version);
 		archive_entry_set_perm(entry, 0644);
 	} else if(*entryname == '.') {
 		/* for now, ignore all files starting with '.' that haven't
@@ -358,7 +199,7 @@ static int extract_single_file(struct archive *archive,
 				/* case 12: existing dir, ignore it */
 				if(lsbuf.st_mode != entrymode) {
 					/* if filesystem perms are different than pkg perms, warn user */
-					int mask = 07777;
+					mode_t mask = 07777;
 					_alpm_log(PM_LOG_WARNING, _("directory permissions differ on %s\n"
 								"filesystem: %o  package: %o\n"), entryname, lsbuf.st_mode & mask,
 							entrymode & mask);
@@ -642,8 +483,11 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 
 	ALPM_LOG_FUNC;
 
-	snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
-			alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+
+	snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
+			_alpm_db_path(db), alpm_pkg_get_name(newpkg),
+			alpm_pkg_get_version(newpkg));
 
 	/* see if this is an upgrade. if so, remove the old package first */
 	pmpkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name);
@@ -691,8 +535,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 
 	if(oldpkg) {
 		/* set up fake remove transaction */
-		int ret = upgrade_remove(oldpkg, newpkg, trans, db);
-		if(ret != 0) {
+		if(_alpm_upgraderemove_package(oldpkg, newpkg, trans) == -1) {
+			pm_errno = PM_ERR_TRANS_ABORT;
+			ret = -1;
 			goto cleanup;
 		}
 	}
@@ -858,7 +703,7 @@ cleanup:
 	return(ret);
 }
 
-int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
+int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
 {
 	int pkg_count, pkg_current;
 	alpm_list_t *targ;
@@ -868,15 +713,15 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	if(trans->packages == NULL) {
+	if(trans->add == NULL) {
 		return(0);
 	}
 
-	pkg_count = alpm_list_count(trans->packages);
+	pkg_count = alpm_list_count(trans->add);
 	pkg_current = 1;
 
 	/* loop through our package list adding/upgrading one at a time */
-	for(targ = trans->packages; targ; targ = targ->next) {
+	for(targ = trans->add; targ; targ = targ->next) {
 		if(handle->trans->state == STATE_INTERRUPTED) {
 			return(0);
 		}

lib/libalpm/add.h

@@ -1,7 +1,7 @@
 /*
  *  add.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,7 @@
 #include "alpm_list.h"
 #include "trans.h"
 
-int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
-int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data);
-int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db);
+int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db);
 
 #endif /* _ALPM_ADD_H */
 

lib/libalpm/alpm.c

@@ -1,7 +1,7 @@
 /*
  *  alpm.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -71,6 +71,7 @@ int SYMEXPORT alpm_release(void)
 	}
 
 	_alpm_handle_free(handle);
+	handle = NULL;
 
 	return(0);
 }

lib/libalpm/alpm.h

@@ -1,7 +1,7 @@
 /*
  * alpm.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -67,10 +67,10 @@ const char *alpm_version(void);
 
 /* Levels */
 typedef enum _pmloglevel_t {
-	PM_LOG_ERROR    = 0x01,
-	PM_LOG_WARNING  = 0x02,
-	PM_LOG_DEBUG    = 0x04,
-	PM_LOG_FUNCTION = 0x08
+	PM_LOG_ERROR    = 1,
+	PM_LOG_WARNING  = (1 << 1),
+	PM_LOG_DEBUG    = (1 << 2),
+	PM_LOG_FUNCTION = (1 << 3)
 } pmloglevel_t;
 
 typedef void (*alpm_cb_log)(pmloglevel_t, char *, va_list);
@@ -86,14 +86,12 @@ typedef void (*alpm_cb_totaldl)(off_t total);
 /** A callback for downloading files
  * @param url the URL of the file to be downloaded
  * @param localpath the directory to which the file should be downloaded
- * @param mtimeold the modification time of the file previously downloaded
- * @param mtimenew the modification time of the newly downloaded file.
- * This should be set by the callback.
- * @return 0 on success, 1 if the modification times are identical, -1 on
+ * @param force whether to force an update, even if the file is the same
+ * @return 0 on success, 1 if the file exists and is identical, -1 on
  * error.
  */
 typedef int (*alpm_cb_fetch)(const char *url, const char *localpath,
-		time_t mtimeold, time_t *mtimenew);
+		int force);
 
 /*
  * Options
@@ -128,8 +126,8 @@ int alpm_option_set_logfile(const char *logfile);
 const char *alpm_option_get_lockfile();
 /* no set_lockfile, path is determined from dbpath */
 
-unsigned short alpm_option_get_usesyslog();
-void alpm_option_set_usesyslog(unsigned short usesyslog);
+int alpm_option_get_usesyslog();
+void alpm_option_set_usesyslog(int usesyslog);
 
 alpm_list_t *alpm_option_get_noupgrades();
 void alpm_option_add_noupgrade(const char *pkg);
@@ -151,13 +149,24 @@ void alpm_option_add_ignoregrp(const char *grp);
 void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps);
 int alpm_option_remove_ignoregrp(const char *grp);
 
-unsigned short alpm_option_get_nopassiveftp();
-void alpm_option_set_nopassiveftp(unsigned short nopasv);
-void alpm_option_set_usedelta(unsigned short usedelta);
+const char *alpm_option_get_arch();
+void alpm_option_set_arch(const char *arch);
+
+int alpm_option_get_usedelta();
+void alpm_option_set_usedelta(int usedelta);
 
 pmdb_t *alpm_option_get_localdb();
 alpm_list_t *alpm_option_get_syncdbs();
 
+/*
+ * Install reasons -- ie, why the package was installed
+ */
+
+typedef enum _pmpkgreason_t {
+	PM_PKG_REASON_EXPLICIT = 0,  /* explicitly requested by the user */
+	PM_PKG_REASON_DEPEND = 1  /* installed as a dependency for another package */
+} pmpkgreason_t;
+
 /*
  * Databases
  */
@@ -181,6 +190,7 @@ alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db);
 pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name);
 alpm_list_t *alpm_db_get_grpcache(pmdb_t *db);
 alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
+int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason);
 
 /*
  * Packages
@@ -188,13 +198,7 @@ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
 
 /* Info parameters */
 
-/* reasons -- ie, why the package was installed */
-typedef enum _pmpkgreason_t {
-	PM_PKG_REASON_EXPLICIT = 0,  /* explicitly requested by the user */
-	PM_PKG_REASON_DEPEND = 1  /* installed as a dependency for another package */
-} pmpkgreason_t;
-
-int alpm_pkg_load(const char *filename, unsigned short full, pmpkg_t **pkg);
+int alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg);
 int alpm_pkg_free(pmpkg_t *pkg);
 int alpm_pkg_checkmd5sum(pmpkg_t *pkg);
 char *alpm_fetch_pkgurl(const char *url);
@@ -224,17 +228,17 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg);
-alpm_list_t *alpm_pkg_get_removes(pmpkg_t *pkg);
 pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg);
 void *alpm_pkg_changelog_open(pmpkg_t *pkg);
 size_t alpm_pkg_changelog_read(void *ptr, size_t size,
 		const pmpkg_t *pkg, const void *fp);
 /*int alpm_pkg_changelog_feof(const pmpkg_t *pkg, void *fp);*/
 int alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp);
-unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg);
-unsigned short alpm_pkg_has_force(pmpkg_t *pkg);
+int alpm_pkg_has_scriptlet(pmpkg_t *pkg);
+int alpm_pkg_has_force(pmpkg_t *pkg);
 
 off_t alpm_pkg_download_size(pmpkg_t *newpkg);
+alpm_list_t *alpm_pkg_unused_deltas(pmpkg_t *pkg);
 
 /*
  * Deltas
@@ -262,34 +266,27 @@ pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync);
  * Transactions
  */
 
-/* Types */
-typedef enum _pmtranstype_t {
-	PM_TRANS_TYPE_UPGRADE = 1,
-	PM_TRANS_TYPE_REMOVE,
-	PM_TRANS_TYPE_REMOVEUPGRADE,
-	PM_TRANS_TYPE_SYNC
-} pmtranstype_t;
 
 /* Flags */
 typedef enum _pmtransflag_t {
-	PM_TRANS_FLAG_NODEPS = 0x01,
-	PM_TRANS_FLAG_FORCE = 0x02,
-	PM_TRANS_FLAG_NOSAVE = 0x04,
-	/* 0x08 flag can go here */
-	PM_TRANS_FLAG_CASCADE = 0x10,
-	PM_TRANS_FLAG_RECURSE = 0x20,
-	PM_TRANS_FLAG_DBONLY = 0x40,
-	/* 0x80 flag can go here */
-	PM_TRANS_FLAG_ALLDEPS = 0x100,
-	PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
-	PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
-	PM_TRANS_FLAG_NOCONFLICTS = 0x800,
-	/* 0x1000 flag can go here */
-	PM_TRANS_FLAG_NEEDED = 0x2000,
-	PM_TRANS_FLAG_ALLEXPLICIT = 0x4000,
-	PM_TRANS_FLAG_UNNEEDED = 0x8000,
-	PM_TRANS_FLAG_RECURSEALL = 0x10000,
-	PM_TRANS_FLAG_NOLOCK = 0x20000
+	PM_TRANS_FLAG_NODEPS = 1,
+	PM_TRANS_FLAG_FORCE = (1 << 1),
+	PM_TRANS_FLAG_NOSAVE = (1 << 2),
+	/* (1 << 3) flag can go here */
+	PM_TRANS_FLAG_CASCADE = (1 << 4),
+	PM_TRANS_FLAG_RECURSE = (1 << 5),
+	PM_TRANS_FLAG_DBONLY = (1 << 6),
+	/* (1 << 7) flag can go here */
+	PM_TRANS_FLAG_ALLDEPS = (1 << 8),
+	PM_TRANS_FLAG_DOWNLOADONLY = (1 << 9),
+	PM_TRANS_FLAG_NOSCRIPTLET = (1 << 10),
+	PM_TRANS_FLAG_NOCONFLICTS = (1 << 11),
+	/* (1 << 12) flag can go here */
+	PM_TRANS_FLAG_NEEDED = (1 << 13),
+	PM_TRANS_FLAG_ALLEXPLICIT = (1 << 14),
+	PM_TRANS_FLAG_UNNEEDED = (1 << 15),
+	PM_TRANS_FLAG_RECURSEALL = (1 << 16),
+	PM_TRANS_FLAG_NOLOCK = (1 << 17)
 } pmtransflag_t;
 
 /**
@@ -376,12 +373,12 @@ typedef enum _pmtransevt_t {
 
 /* Transaction Conversations (ie, questions) */
 typedef enum _pmtransconv_t {
-	PM_TRANS_CONV_INSTALL_IGNOREPKG = 0x01,
-	PM_TRANS_CONV_REPLACE_PKG = 0x02,
-	PM_TRANS_CONV_CONFLICT_PKG = 0x04,
-	PM_TRANS_CONV_CORRUPTED_PKG = 0x08,
-	PM_TRANS_CONV_LOCAL_NEWER = 0x10,
-	PM_TRANS_CONV_REMOVE_PKGS = 0x20,
+	PM_TRANS_CONV_INSTALL_IGNOREPKG = 1,
+	PM_TRANS_CONV_REPLACE_PKG = (1 << 1),
+	PM_TRANS_CONV_CONFLICT_PKG = (1 << 2),
+	PM_TRANS_CONV_CORRUPTED_PKG = (1 << 3),
+	PM_TRANS_CONV_LOCAL_NEWER = (1 << 4),
+	PM_TRANS_CONV_REMOVE_PKGS = (1 << 5),
 } pmtransconv_t;
 
 /* Transaction Progress */
@@ -402,19 +399,23 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *,
 /* Transaction Progress callback */
 typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int);
 
-pmtranstype_t alpm_trans_get_type();
-unsigned int alpm_trans_get_flags();
-alpm_list_t * alpm_trans_get_pkgs();
-int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
+int alpm_trans_get_flags();
+alpm_list_t * alpm_trans_get_add();
+alpm_list_t * alpm_trans_get_remove();
+int alpm_trans_init(pmtransflag_t flags,
                     alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv,
                     alpm_trans_cb_progress cb_progress);
-int alpm_trans_sysupgrade(int enable_downgrade);
-int alpm_trans_addtarget(char *target);
 int alpm_trans_prepare(alpm_list_t **data);
 int alpm_trans_commit(alpm_list_t **data);
 int alpm_trans_interrupt(void);
 int alpm_trans_release(void);
 
+int alpm_sync_sysupgrade(int enable_downgrade);
+int alpm_sync_target(char *target);
+int alpm_sync_dbtarget(char *db, char *target);
+int alpm_add_target(char *target);
+int alpm_remove_target(char *target);
+
 /*
  * Dependencies and conflicts
  */
@@ -441,6 +442,7 @@ alpm_list_t *alpm_checkconflicts(alpm_list_t *pkglist);
 
 const char *alpm_conflict_get_package1(pmconflict_t *conflict);
 const char *alpm_conflict_get_package2(pmconflict_t *conflict);
+const char *alpm_conflict_get_reason(pmconflict_t *conflict);
 
 pmdepmod_t alpm_dep_get_mod(const pmdepend_t *dep);
 const char *alpm_dep_get_name(const pmdepend_t *dep);
@@ -509,6 +511,7 @@ enum _pmerrno_t {
 	PM_ERR_PKG_OPEN,
 	PM_ERR_PKG_CANT_REMOVE,
 	PM_ERR_PKG_INVALID_NAME,
+	PM_ERR_PKG_INVALID_ARCH,
 	PM_ERR_PKG_REPO_NOT_FOUND,
 	/* Deltas */
 	PM_ERR_DLT_INVALID,

lib/libalpm/alpm_list.c

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -616,7 +616,7 @@ static int ptr_cmp(const void *p, const void *q)
 /**
  * @brief Find an item in a list.
  *
- * Search for the item whos data matches that of the `needle`.
+ * Search for the item whose data matches that of the `needle`.
  *
  * @param needle   the data to search for (== comparison)
  * @param haystack the list
@@ -644,11 +644,65 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
 }
 
 /**
- * @brief Find the items in list `lhs` that are not present in list `rhs`.
+ * @brief Find the differences between list `left` and list `right`
  *
- * Entries are not duplicated. Operation is O(m*n). The first list is stepped
- * through one node at a time, and for each node in the first list, each node
- * in the second list is compared to it.
+ * The two lists must be sorted. Items only in list `left` are added to the
+ * `onlyleft` list. Items only in list `right` are added to the `onlyright`
+ * list.
+ *
+ * @param left      the first list
+ * @param right     the second list
+ * @param fn        the comparison function
+ * @param onlyleft  pointer to the first result list
+ * @param onlyright pointer to the second result list
+ *
+ */
+void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left,
+		const alpm_list_t *right, alpm_list_fn_cmp fn,
+		alpm_list_t **onlyleft, alpm_list_t **onlyright)
+{
+	const alpm_list_t *l = left;
+	const alpm_list_t *r = right;
+
+	if(!onlyleft && !onlyright) {
+		return;
+	}
+
+	while (l != NULL && r != NULL) {
+		int cmp = fn(l->data, r->data);
+		if(cmp < 0) {
+			if(onlyleft) {
+				*onlyleft = alpm_list_add(*onlyleft, l->data);
+			}
+			l = l->next;
+		}
+		else if(cmp > 0) {
+			if(onlyright) {
+				*onlyright = alpm_list_add(*onlyright, r->data);
+			}
+			r = r->next;
+		} else {
+			l = l->next;
+			r = r->next;
+		}
+	}
+	while (l != NULL) {
+		if(onlyleft) {
+			*onlyleft = alpm_list_add(*onlyleft, l->data);
+		}
+		l = l->next;
+	}
+	while (r != NULL) {
+		if(onlyright) {
+			*onlyright = alpm_list_add(*onlyright, r->data);
+		}
+		r = r->next;
+	}
+}
+
+
+/**
+ * @brief Find the items in list `lhs` that are not present in list `rhs`.
  *
  * @param lhs the first list
  * @param rhs the second list
@@ -659,21 +713,18 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack,
 alpm_list_t SYMEXPORT *alpm_list_diff(const alpm_list_t *lhs,
 		const alpm_list_t *rhs, alpm_list_fn_cmp fn)
 {
-	const alpm_list_t *i, *j;
+	alpm_list_t *left, *right;
 	alpm_list_t *ret = NULL;
-	for(i = lhs; i; i = i->next) {
-		int found = 0;
-		for(j = rhs; j; j = j->next) {
-			if(fn(i->data, j->data) == 0) {
-				found = 1;
-				break;
-			}
-		}
-		if(!found) {
-			ret = alpm_list_add(ret, i->data);
-		}
-	}
 
+	left = alpm_list_copy(lhs);
+	left = alpm_list_msort(left, alpm_list_count(left), fn);
+	right = alpm_list_copy(rhs);
+	right = alpm_list_msort(right, alpm_list_count(right), fn);
+
+	alpm_list_diff_sorted(left, right, fn, &ret, NULL);
+
+	alpm_list_free(left);
+	alpm_list_free(right);
 	return(ret);
 }
 

lib/libalpm/alpm_list.h

@@ -1,7 +1,7 @@
 /*
  *  alpm_list.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -78,6 +78,8 @@ void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_
 void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle);
 char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle);
 alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn);
+void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right,
+		alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright);
 
 #ifdef __cplusplus
 }

lib/libalpm/backup.c

@@ -1,7 +1,7 @@
 /*
  *  backup.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2005 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -33,7 +33,7 @@
 #include "util.h"
 
 /* split a backup string "file\thash" into two strings : file and hash */
-int _alpm_backup_split(const char *string, char **file, char **hash)
+static int backup_split(const char *string, char **file, char **hash)
 {
 	char *str = strdup(string);
 	char *ptr;
@@ -65,14 +65,14 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
 char *_alpm_backup_file(const char *string)
 {
 	char *file = NULL;
-	_alpm_backup_split(string, &file, NULL);
+	backup_split(string, &file, NULL);
 	return(file);
 }
 
 char *_alpm_backup_hash(const char *string)
 {
 	char *hash = NULL;
-	_alpm_backup_split(string, NULL, &hash);
+	backup_split(string, NULL, &hash);
 	return(hash);
 }
 
@@ -95,7 +95,7 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup)
 		char *hash = NULL;
 
 		/* no hash found */
-		if(!_alpm_backup_split((char *)lp->data, &filename, &hash)) {
+		if(!backup_split((char *)lp->data, &filename, &hash)) {
 			FREE(filename);
 			continue;
 		}

lib/libalpm/backup.h

@@ -1,7 +1,7 @@
 /*
  *  backup.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/be_files.c

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <stdint.h> /* uintmax_t, intmax_t */
+#include <stdint.h> /* intmax_t */
 #include <sys/stat.h>
 #include <dirent.h>
 #include <ctype.h>
@@ -33,6 +33,10 @@
 #include <limits.h> /* PATH_MAX */
 #include <locale.h> /* setlocale */
 
+/* libarchive */
+#include <archive.h>
+#include <archive_entry.h>
+
 /* libalpm */
 #include "db.h"
 #include "alpm_list.h"
@@ -47,76 +51,10 @@
 #include "dload.h"
 
 
-/*
- * Return the last update time as number of seconds from the epoch.
- * Returns 0 if the value is unknown or can't be read.
- */
-static time_t getlastupdate(const pmdb_t *db)
-{
-	FILE *fp;
-	char *file;
-	time_t ret = 0;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(ret);
-	}
-
-	/* db->path + '.lastupdate' + NULL */
-	MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret));
-	sprintf(file, "%s.lastupdate", db->path);
-
-	/* get the last update time, if it's there */
-	if((fp = fopen(file, "r")) == NULL) {
-		free(file);
-		return(ret);
-	} else {
-		char line[64];
-		if(fgets(line, sizeof(line), fp)) {
-			ret = atol(line);
-		}
-	}
-	fclose(fp);
-	free(file);
-	return(ret);
-}
-
-/*
- * writes the dbpath/.lastupdate file with the value in time
- */
-static int setlastupdate(const pmdb_t *db, time_t time)
-{
-	FILE *fp;
-	char *file;
-	int ret = 0;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || time == 0) {
-		return(-1);
-	}
-
-	/* db->path + '.lastupdate' + NULL */
-	MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret));
-	sprintf(file, "%s.lastupdate", db->path);
-
-	if((fp = fopen(file, "w")) == NULL) {
-		free(file);
-		return(-1);
-	}
-	if(fprintf(fp, "%ju", (uintmax_t)time) <= 0) {
-		ret = -1;
-	}
-	fclose(fp);
-	free(file);
-	return(ret);
-}
-
 static int checkdbdir(pmdb_t *db)
 {
 	struct stat buf;
-	char *path = db->path;
+	const char *path = _alpm_db_path(db);
 
 	if(stat(path, &buf) != 0) {
 		_alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
@@ -133,6 +71,103 @@ static int checkdbdir(pmdb_t *db)
 	return(0);
 }
 
+/* create list of directories in db */
+static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist)
+{
+	struct archive *_archive;
+	struct archive_entry *entry;
+
+	if((_archive = archive_read_new()) == NULL)
+		RET_ERR(PM_ERR_LIBARCHIVE, -1);
+
+	archive_read_support_compression_all(_archive);
+	archive_read_support_format_all(_archive);
+
+	if(archive_read_open_filename(_archive, archive,
+				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+		_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive,
+				archive_error_string(_archive));
+		RET_ERR(PM_ERR_PKG_OPEN, -1);
+	}
+
+	while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) {
+		const struct stat *st;
+		const char *entryname; /* the name of the file in the archive */
+
+		st = archive_entry_stat(entry);
+		entryname = archive_entry_pathname(entry);
+
+		if(S_ISDIR(st->st_mode)) {
+			char *name = strdup(entryname);
+			*dirlist = alpm_list_add(*dirlist, name);
+		}
+	}
+	archive_read_finish(_archive);
+
+	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
+	return(0);
+}
+
+/* create list of directories in db */
+static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist)
+{
+	DIR *dbdir;
+	struct dirent *ent = NULL;
+	struct stat sbuf;
+	char path[PATH_MAX];
+
+	dbdir = opendir(syncdbpath);
+	if (dbdir != NULL) {
+		while((ent = readdir(dbdir)) != NULL) {
+			char *name = ent->d_name;
+			size_t len;
+			char *entry;
+
+			if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+				continue;
+			}
+
+			/* stat the entry, make sure it's a directory */
+			snprintf(path, PATH_MAX, "%s%s", syncdbpath, name);
+			if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) {
+				continue;
+			}
+
+			len = strlen(name);
+			MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1));
+			strcpy(entry, name);
+			entry[len] = '/';
+			entry[len+1] = '\0';
+			*dirlist = alpm_list_add(*dirlist, entry);
+		}
+		closedir(dbdir);
+	}
+
+	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
+	return(0);
+}
+
+/* remove old directories from dbdir */
+static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist)
+{
+	alpm_list_t *i;
+	for (i = dirlist; i; i = i->next) {
+		const char *name = i->data;
+		char *dbdir;
+		size_t len = strlen(syncdbpath) + strlen(name) + 2;
+		MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1));
+		snprintf(dbdir, len, "%s%s", syncdbpath, name);
+		_alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir);
+		if(_alpm_rmrf(dbdir) != 0) {
+			_alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir);
+			free(dbdir);
+			RET_ERR(PM_ERR_DB_REMOVE, -1);
+		}
+		free(dbdir);
+	}
+	return(0);
+}
+
 /** Update a package database
  *
  * An update of the package database \a db will be attempted. Unless
@@ -148,7 +183,7 @@ static int checkdbdir(pmdb_t *db)
  * pmdb_t *db;
  * int result;
  * db = alpm_list_getdata(alpm_option_get_syncdbs());
- * if(alpm_trans_init(PM_TRANS_TYPE_SYNC, 0, NULL, NULL, NULL) == 0) {
+ * if(alpm_trans_init(0, NULL, NULL, NULL) == 0) {
  *     result = alpm_db_update(0, db);
  *     alpm_trans_release();
  *
@@ -174,10 +209,10 @@ static int checkdbdir(pmdb_t *db)
 int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 {
 	char *dbfile, *dbfilepath;
-	time_t newmtime = 0, lastupdate = 0;
-	const char *dbpath;
+	const char *dbpath, *syncdbpath;
+	alpm_list_t *newdirlist = NULL, *olddirlist = NULL;
+	alpm_list_t *onlynew = NULL, *onlyold = NULL;
 	size_t len;
-
 	int ret;
 
 	ALPM_LOG_FUNC;
@@ -191,72 +226,82 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 	 */
 	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 	ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
-	ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
 
 	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
 		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
 	}
 
-	if(!force) {
-		/* get the lastupdate time */
-		lastupdate = getlastupdate(db);
-		if(lastupdate == 0) {
-			_alpm_log(PM_LOG_DEBUG, "failed to get lastupdate time for %s\n",
-					db->treename);
-		}
-	}
-
 	len = strlen(db->treename) + strlen(DBEXT) + 1;
 	MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1));
 	sprintf(dbfile, "%s" DBEXT, db->treename);
 
 	dbpath = alpm_option_get_dbpath();
 
-	ret = _alpm_download_single_file(dbfile, db->servers, dbpath,
-			lastupdate, &newmtime);
+	ret = _alpm_download_single_file(dbfile, db->servers, dbpath, force);
 	free(dbfile);
 
 	if(ret == 1) {
-		/* mtimes match, do nothing */
+		/* files match, do nothing */
 		pm_errno = 0;
 		return(1);
 	} else if(ret == -1) {
 		/* pm_errno was set by the download code */
 		_alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast());
 		return(-1);
-	} else {
-		/* remove the old dir */
-		if(_alpm_rmrf(db->path) != 0) {
+	}
+
+	syncdbpath = _alpm_db_path(db);
+
+	/* form the path to the db location */
+	len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1;
+	MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1));
+	sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename);
+
+	if(force) {
+		/* if forcing update, remove the old dir and extract the db */
+		if(_alpm_rmrf(syncdbpath) != 0) {
 			_alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename);
 			RET_ERR(PM_ERR_DB_REMOVE, -1);
+		} else {
+			_alpm_log(PM_LOG_DEBUG, "database dir %s removed\n", _alpm_db_path(db));
 		}
-
-		/* Cache needs to be rebuilt */
-		_alpm_db_free_pkgcache(db);
-
-		/* form the path to the db location */
-		len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1;
-		MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1));
-		sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename);
-
-		/* uncompress the sync database */
-		checkdbdir(db);
-		ret = _alpm_unpack(dbfilepath, db->path, NULL);
+	} else {
+		/* if not forcing, only remove and extract what is necessary */
+		ret = dirlist_from_tar(dbfilepath, &newdirlist);
 		if(ret) {
-			free(dbfilepath);
-			RET_ERR(PM_ERR_SYSTEM, -1);
+			goto cleanup;
+		}
+		ret = dirlist_from_fs(syncdbpath, &olddirlist);
+		if(ret) {
+			goto cleanup;
 		}
-		unlink(dbfilepath);
-		free(dbfilepath);
 
-		/* if we have a new mtime, set the DB last update value */
-		if(newmtime) {
-			_alpm_log(PM_LOG_DEBUG, "sync: new mtime for %s: %ju\n",
-					db->treename, (uintmax_t)newmtime);
-			setlastupdate(db, newmtime);
+		alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew);
+
+		ret = remove_olddir(syncdbpath, onlyold);
+		if(ret) {
+			goto cleanup;
 		}
 	}
 
+	/* Cache needs to be rebuilt */
+	_alpm_db_free_pkgcache(db);
+
+	checkdbdir(db);
+	ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0);
+
+cleanup:
+	FREELIST(newdirlist);
+	FREELIST(olddirlist);
+	alpm_list_free(onlynew);
+	alpm_list_free(onlyold);
+
+	free(dbfilepath);
+
+	if(ret) {
+		RET_ERR(PM_ERR_SYSTEM, -1);
+	}
+
 	return(0);
 }
 
@@ -306,13 +351,15 @@ int _alpm_db_populate(pmdb_t *db)
 	struct dirent *ent = NULL;
 	struct stat sbuf;
 	char path[PATH_MAX];
+	const char *dbpath;
 	DIR *dbdir;
 
 	ALPM_LOG_FUNC;
 
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	dbdir = opendir(db->path);
+	dbpath = _alpm_db_path(db);
+	dbdir = opendir(dbpath);
 	if(dbdir == NULL) {
 		return(0);
 	}
@@ -324,7 +371,7 @@ int _alpm_db_populate(pmdb_t *db)
 			continue;
 		}
 		/* stat the entry, make sure it's a directory */
-		snprintf(path, PATH_MAX, "%s%s", db->path, name);
+		snprintf(path, PATH_MAX, "%s%s", dbpath, name);
 		if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) {
 			continue;
 		}
@@ -342,6 +389,13 @@ int _alpm_db_populate(pmdb_t *db)
 			continue;
 		}
 
+		/* duplicated database entries are not allowed */
+		if(_alpm_pkg_find(db->pkgcache, pkg->name)) {
+			_alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
 		/* explicitly read with only 'BASE' data, accessors will handle the rest */
 		if(_alpm_db_read(db, pkg, INFRQ_BASE) == -1) {
 			_alpm_log(PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name);
@@ -367,10 +421,12 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info)
 {
 	size_t len;
 	char *pkgpath;
+	const char *dbpath;
 
-	len = strlen(db->path) + strlen(info->name) + strlen(info->version) + 3;
+	dbpath = _alpm_db_path(db);
+	len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3;
 	MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL));
-	sprintf(pkgpath, "%s%s-%s/", db->path, info->name, info->version);
+	sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version);
 	return(pkgpath);
 }
 
@@ -379,6 +435,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	FILE *fp = NULL;
 	char path[PATH_MAX];
 	char line[513];
+	int	sline = sizeof(line)-1;
 	char *pkgpath = NULL;
 
 	ALPM_LOG_FUNC;
@@ -410,7 +467,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			info->name, inforeq);
 
 	/* clear out 'line', to be certain - and to make valgrind happy */
-	memset(line, 0, 513);
+	memset(line, 0, sline+1);
 
 	pkgpath = get_pkgpath(db, info);
 
@@ -434,7 +491,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			_alpm_strtrim(line);
 			if(strcmp(line, "%NAME%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				if(strcmp(_alpm_strtrim(line), info->name) != 0) {
@@ -442,7 +499,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 								"mismatch on package %s\n"), db->treename, info->name);
 				}
 			} else if(strcmp(line, "%VERSION%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				if(strcmp(_alpm_strtrim(line), info->version) != 0) {
@@ -450,44 +507,44 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 								"mismatch on package %s\n"), db->treename, info->name);
 				}
 			} else if(strcmp(line, "%FILENAME%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->filename, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%DESC%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->desc, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%GROUPS%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->groups = alpm_list_add(info->groups, linedup);
 				}
 			} else if(strcmp(line, "%URL%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->url, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%LICENSE%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->licenses = alpm_list_add(info->licenses, linedup);
 				}
 			} else if(strcmp(line, "%ARCH%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->arch, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%BUILDDATE%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				_alpm_strtrim(line);
 
-				char first = tolower(line[0]);
+				char first = tolower((unsigned char)line[0]);
 				if(first > 'a' && first < 'z') {
 					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
 					setlocale(LC_TIME, "C");
@@ -498,12 +555,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 					info->builddate = atol(line);
 				}
 			} else if(strcmp(line, "%INSTALLDATE%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				_alpm_strtrim(line);
 
-				char first = tolower(line[0]);
+				char first = tolower((unsigned char)line[0]);
 				if(first > 'a' && first < 'z') {
 					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
 					setlocale(LC_TIME, "C");
@@ -514,12 +571,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 					info->installdate = atol(line);
 				}
 			} else if(strcmp(line, "%PACKAGER%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->packager, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%REASON%") == 0) {
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
@@ -529,7 +586,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 				 *       is currently only used in sync databases, and SIZE is
 				 *       only used in local databases.
 				 */
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				info->size = atol(_alpm_strtrim(line));
@@ -540,19 +597,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			} else if(strcmp(line, "%ISIZE%") == 0) {
 				/* ISIZE (installed size) tag only appears in sync repositories,
 				 * not the local one. */
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				info->isize = atol(_alpm_strtrim(line));
 			} else if(strcmp(line, "%MD5SUM%") == 0) {
 				/* MD5SUM tag only appears in sync repositories,
 				 * not the local one. */
-				if(fgets(line, 512, fp) == NULL) {
+				if(fgets(line, sline, fp) == NULL) {
 					goto error;
 				}
 				STRDUP(info->md5sum, _alpm_strtrim(line), goto error);
 			} else if(strcmp(line, "%REPLACES%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->replaces = alpm_list_add(info->replaces, linedup);
@@ -575,13 +632,13 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 		while(fgets(line, 256, fp)) {
 			_alpm_strtrim(line);
 			if(strcmp(line, "%FILES%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->files = alpm_list_add(info->files, linedup);
 				}
 			} else if(strcmp(line, "%BACKUP%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->backup = alpm_list_add(info->backup, linedup);
@@ -603,24 +660,24 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			fgets(line, 255, fp);
 			_alpm_strtrim(line);
 			if(strcmp(line, "%DEPENDS%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line));
 					info->depends = alpm_list_add(info->depends, dep);
 				}
 			} else if(strcmp(line, "%OPTDEPENDS%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->optdepends = alpm_list_add(info->optdepends, linedup);
 				}
 			} else if(strcmp(line, "%CONFLICTS%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->conflicts = alpm_list_add(info->conflicts, linedup);
 				}
 			} else if(strcmp(line, "%PROVIDES%") == 0) {
-				while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+				while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 					char *linedup;
 					STRDUP(linedup, _alpm_strtrim(line), goto error);
 					info->provides = alpm_list_add(info->provides, linedup);
@@ -639,7 +696,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 				fgets(line, 255, fp);
 				_alpm_strtrim(line);
 				if(strcmp(line, "%DELTAS%") == 0) {
-					while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
+					while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) {
 						pmdelta_t *delta = _alpm_delta_parse(line);
 						if(delta) {
 							info->deltas = alpm_list_add(info->deltas, delta);
@@ -753,10 +810,11 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			fprintf(fp, "\n");
 		}
-		if(info->force) {
-			fprintf(fp, "%%FORCE%%\n\n");
-		}
 		if(local) {
+			if(info->force) {
+				fprintf(fp, "%%EPOCH%%\n"
+						"1\n\n");
+			}
 			if(info->url) {
 				fprintf(fp, "%%URL%%\n"
 								"%s\n\n", info->url);
@@ -774,11 +832,11 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			if(info->builddate) {
 				fprintf(fp, "%%BUILDDATE%%\n"
-								"%ju\n\n", (uintmax_t)info->builddate);
+								"%ld\n\n", info->builddate);
 			}
 			if(info->installdate) {
 				fprintf(fp, "%%INSTALLDATE%%\n"
-								"%ju\n\n", (uintmax_t)info->installdate);
+								"%ld\n\n", info->installdate);
 			}
 			if(info->packager) {
 				fprintf(fp, "%%PACKAGER%%\n"

lib/libalpm/be_package.c

@@ -1,7 +1,7 @@
 /*
  *  be_package.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -75,6 +75,8 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
 				STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1));
 			} else if(!strcmp(key, "pkgdesc")) {
 				STRDUP(newpkg->desc, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "force")) {
+				newpkg->force = 1;
 			} else if(!strcmp(key, "group")) {
 				newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr));
 			} else if(!strcmp(key, "url")) {
@@ -82,7 +84,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
 			} else if(!strcmp(key, "license")) {
 				newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr));
 			} else if(!strcmp(key, "builddate")) {
-				char first = tolower(ptr[0]);
+				char first = tolower((unsigned char)ptr[0]);
 				if(first > 'a' && first < 'z') {
 					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
 					setlocale(LC_TIME, "C");
@@ -132,7 +134,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
  *             through the full archive
  * @return An information filled pmpkg_t struct
  */
-static pmpkg_t *pkg_load(const char *pkgfile, unsigned short full)
+static pmpkg_t *pkg_load(const char *pkgfile, int full)
 {
 	int ret = ARCHIVE_OK;
 	int config = 0;
@@ -269,8 +271,7 @@ error:
  * @param pkg address of the package pointer
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
-int SYMEXPORT alpm_pkg_load(const char *filename, unsigned short full,
-		pmpkg_t **pkg)
+int SYMEXPORT alpm_pkg_load(const char *filename, int full, pmpkg_t **pkg)
 {
 	ALPM_LOG_FUNC;
 

lib/libalpm/cache.c

@@ -1,7 +1,7 @@
 /*
  *  cache.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/cache.h

@@ -1,7 +1,7 @@
 /*
  *  cache.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/conflict.c

@@ -1,7 +1,7 @@
 /*
  *  conflict.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
@@ -41,7 +41,7 @@
 #include "cache.h"
 #include "deps.h"
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2)
+pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason)
 {
 	pmconflict_t *conflict;
 
@@ -51,6 +51,7 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2)
 
 	STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL));
 	STRDUP(conflict->package2, package2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->reason, reason, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(conflict);
 }
@@ -59,6 +60,7 @@ void _alpm_conflict_free(pmconflict_t *conflict)
 {
 	FREE(conflict->package2);
 	FREE(conflict->package1);
+	FREE(conflict->reason);
 	FREE(conflict);
 }
 
@@ -69,6 +71,7 @@ pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict)
 
 	STRDUP(newconflict->package1, conflict->package1, RET_ERR(PM_ERR_MEMORY, NULL));
 	STRDUP(newconflict->package2, conflict->package2, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newconflict->reason, conflict->reason, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(newconflict);
 }
@@ -122,9 +125,9 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
  * @param pkg2 package causing conflict
  */
 static void add_conflict(alpm_list_t **baddeps, const char *pkg1,
-		const char *pkg2)
+		const char *pkg2, const char *reason)
 {
-	pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2);
+	pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2, reason);
 	if(conflict && !_alpm_conflict_isin(conflict, *baddeps)) {
 		*baddeps = alpm_list_add(*baddeps, conflict);
 	} else {
@@ -168,9 +171,9 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2,
 
 				if(does_conflict(pkg1, conflict, pkg2)) {
 					if(order >= 0) {
-						add_conflict(baddeps, pkg1name, pkg2name);
+						add_conflict(baddeps, pkg1name, pkg2name, conflict);
 					} else {
-						add_conflict(baddeps, pkg2name, pkg1name);
+						add_conflict(baddeps, pkg2name, pkg1name, conflict);
 					}
 				}
 			}
@@ -405,7 +408,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL || upgrade == NULL) {
+	if(db == NULL || upgrade == NULL || trans == NULL) {
 		return(NULL);
 	}
 
@@ -513,7 +516,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
 					/* skip removal of file, but not add. this will prevent a second
 					 * package from removing the file when it was already installed
 					 * by its new owner (whether the file is in backup array or not */
-					trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path));
+					trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr));
 					_alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr);
 					resolved_conflict = 1;
 				}
@@ -578,6 +581,17 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
 	return conflict->package2;
 }
 
+const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(NULL));
+	ASSERT(conflict != NULL, return(NULL));
+
+	return conflict->reason;
+}
+
 const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict)
 {
 	ALPM_LOG_FUNC;

lib/libalpm/conflict.h

@@ -1,7 +1,7 @@
 /*
  *  conflict.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 struct __pmconflict_t {
 	char *package1;
 	char *package2;
+	char *reason;
 };
 
 struct __pmfileconflict_t {
@@ -36,7 +37,7 @@ struct __pmfileconflict_t {
 	char *ctarget;
 };
 
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2);
+pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason);
 pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
 void _alpm_conflict_free(pmconflict_t *conflict);
 int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack);

lib/libalpm/db.c

@@ -1,7 +1,7 @@
 /*
  *  db.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -321,20 +321,55 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 	return(_alpm_db_search(db, needles));
 }
 
+/* Set install reason for a package in db
+ * @param db pointer to the package database
+ * @param name the name of the package
+ * @param reason the new install reason
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+
+	pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name);
+	if(pkg == NULL) {
+		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name);
+	/* read DESC */
+	if(_alpm_db_read(db, pkg, INFRQ_DESC)) {
+		return(-1);
+	}
+	if(pkg->reason == reason) {
+		/* we are done */
+		return(0);
+	}
+	/* set reason (in pkgcache) */
+	pkg->reason = reason;
+	/* write DESC */
+	if(_alpm_db_write(db, pkg, INFRQ_DESC)) {
+		return(-1);
+	}
+
+	return(0);
+}
+
 /** @} */
 
-pmdb_t *_alpm_db_new(const char *dbpath, const char *treename)
+static pmdb_t *_alpm_db_new(const char *treename, int is_local)
 {
 	pmdb_t *db;
-	const size_t pathsize = strlen(dbpath) + strlen(treename) + 2;
 
 	ALPM_LOG_FUNC;
 
 	CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL));
-	CALLOC(db->path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
-
-	sprintf(db->path, "%s%s/", dbpath, treename);
 	STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL));
+	db->is_local = is_local;
 
 	return(db);
 }
@@ -347,13 +382,44 @@ void _alpm_db_free(pmdb_t *db)
 	_alpm_db_free_pkgcache(db);
 	/* cleanup server list */
 	FREELIST(db->servers);
-	FREE(db->path);
+	FREE(db->_path);
 	FREE(db->treename);
 	FREE(db);
 
 	return;
 }
 
+const char *_alpm_db_path(pmdb_t *db)
+{
+	if(!db) {
+		return(NULL);
+	}
+	if(!db->_path) {
+		const char *dbpath;
+		size_t pathsize;
+
+		dbpath = alpm_option_get_dbpath();
+		if(!dbpath) {
+			_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
+			RET_ERR(PM_ERR_DB_OPEN, NULL);
+		}
+
+		if(db->is_local) {
+			pathsize = strlen(dbpath) + strlen(db->treename) + 2;
+			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			sprintf(db->_path, "%s%s/", dbpath, db->treename);
+		} else {
+			pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2;
+			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			/* all sync DBs now reside in the sync/ subdir of the dbpath */
+			sprintf(db->_path, "%ssync/%s/", dbpath, db->treename);
+		}
+		_alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n",
+				db->treename, db->_path);
+	}
+	return(db->_path);
+}
+
 int _alpm_db_cmp(const void *d1, const void *d2)
 {
 	pmdb_t *db1 = (pmdb_t *)d1;
@@ -440,7 +506,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 pmdb_t *_alpm_db_register_local(void)
 {
 	pmdb_t *db;
-	const char *dbpath;
 
 	ALPM_LOG_FUNC;
 
@@ -451,13 +516,7 @@ pmdb_t *_alpm_db_register_local(void)
 
 	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
 
-	dbpath = alpm_option_get_dbpath();
-	if(!dbpath) {
-		_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-
-	db = _alpm_db_new(dbpath, "local");
+	db = _alpm_db_new("local", 1);
 	if(db == NULL) {
 		RET_ERR(PM_ERR_DB_CREATE, NULL);
 	}
@@ -469,8 +528,6 @@ pmdb_t *_alpm_db_register_local(void)
 pmdb_t *_alpm_db_register_sync(const char *treename)
 {
 	pmdb_t *db;
-	const char *dbpath;
-	char path[PATH_MAX];
 	alpm_list_t *i;
 
 	ALPM_LOG_FUNC;
@@ -485,15 +542,7 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
 
 	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
 
-	dbpath = alpm_option_get_dbpath();
-	if(!dbpath) {
-		_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
-	}
-	/* all sync DBs now reside in the sync/ subdir of the dbpath */
-	snprintf(path, PATH_MAX, "%ssync/", dbpath);
-
-	db = _alpm_db_new(path, treename);
+	db = _alpm_db_new(treename, 0);
 	if(db == NULL) {
 		RET_ERR(PM_ERR_DB_CREATE, NULL);
 	}

lib/libalpm/db.h

@@ -1,7 +1,7 @@
 /*
  *  db.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -28,30 +28,33 @@
 
 /* Database entries */
 typedef enum _pmdbinfrq_t {
-	INFRQ_BASE = 0x01,
-	INFRQ_DESC = 0x02,
-	INFRQ_DEPENDS = 0x04,
-	INFRQ_FILES = 0x08,
-	INFRQ_SCRIPTLET = 0x10,
-	INFRQ_DELTAS = 0x20,
-	/* ALL should be sum of all above */
+	INFRQ_BASE = 1,
+	INFRQ_DESC = (1 << 1),
+	INFRQ_DEPENDS = (1 << 2),
+	INFRQ_FILES = (1 << 3),
+	INFRQ_SCRIPTLET = (1 << 4),
+	INFRQ_DELTAS = (1 << 5),
+	INFRQ_DSIZE = (1 << 6),
+	/* ALL should be info stored in the package or database */
 	INFRQ_ALL = 0x3F
 } pmdbinfrq_t;
 
 /* Database */
 struct __pmdb_t {
-	char *path;
 	char *treename;
-	unsigned short pkgcache_loaded;
+	/* do not access directly, use _alpm_db_path(db) for lazy access */
+	char *_path;
+	int pkgcache_loaded;
+	int grpcache_loaded;
+	int is_local;
 	alpm_list_t *pkgcache;
-	unsigned short grpcache_loaded;
 	alpm_list_t *grpcache;
 	alpm_list_t *servers;
 };
 
 /* db.c, database general calls */
-pmdb_t *_alpm_db_new(const char *dbpath, const char *treename);
 void _alpm_db_free(pmdb_t *db);
+const char *_alpm_db_path(pmdb_t *db);
 int _alpm_db_cmp(const void *d1, const void *d2);
 alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles);
 pmdb_t *_alpm_db_register_local(void);

lib/libalpm/delta.c

@@ -1,7 +1,7 @@
 /*
  *  delta.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2007-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -71,34 +71,16 @@ off_t SYMEXPORT alpm_delta_get_size(pmdelta_t *delta)
 
 /** @} */
 
-static alpm_list_t *delta_graph_init(alpm_list_t *deltas)
+static alpm_list_t *graph_init(alpm_list_t *deltas, int reverse)
 {
 	alpm_list_t *i, *j;
 	alpm_list_t *vertices = NULL;
 	/* create the vertices */
 	for(i = deltas; i; i = i->next) {
-		char *fpath, *md5sum;
 		pmgraph_t *v = _alpm_graph_new();
 		pmdelta_t *vdelta = i->data;
 		vdelta->download_size = vdelta->delta_size;
 		v->weight = LONG_MAX;
-
-		/* determine whether the delta file already exists */
-		fpath = _alpm_filecache_find(vdelta->delta);
-		md5sum = alpm_compute_md5sum(fpath);
-		if(fpath && md5sum && strcmp(md5sum, vdelta->delta_md5) == 0) {
-			vdelta->download_size = 0;
-		}
-		FREE(fpath);
-		FREE(md5sum);
-
-		/* determine whether a base 'from' file exists */
-		fpath = _alpm_filecache_find(vdelta->from);
-		if(fpath) {
-			v->weight = vdelta->download_size;
-		}
-		FREE(fpath);
-
 		v->data = vdelta;
 		vertices = alpm_list_add(vertices, v);
 	}
@@ -119,7 +101,8 @@ static alpm_list_t *delta_graph_init(alpm_list_t *deltas)
 			 *     3_to_4
 			 * If J 'from' is equal to I 'to', then J is a child of I.
 			 * */
-			if(strcmp(d_j->from, d_i->to) == 0) {
+			if((!reverse && strcmp(d_j->from, d_i->to) == 0) ||
+					(reverse && strcmp(d_j->to, d_i->from) == 0)) {
 				v_i->children = alpm_list_add(v_i->children, v_j);
 			}
 		}
@@ -128,8 +111,36 @@ static alpm_list_t *delta_graph_init(alpm_list_t *deltas)
 	return(vertices);
 }
 
-static off_t delta_vert(alpm_list_t *vertices,
-		const char *to, alpm_list_t **path) {
+static void graph_init_size(alpm_list_t *vertices)
+{
+	alpm_list_t *i;
+
+	for(i = vertices; i; i = i->next) {
+		char *fpath, *md5sum;
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
+
+		/* determine whether the delta file already exists */
+		fpath = _alpm_filecache_find(vdelta->delta);
+		md5sum = alpm_compute_md5sum(fpath);
+		if(fpath && md5sum && strcmp(md5sum, vdelta->delta_md5) == 0) {
+			vdelta->download_size = 0;
+		}
+		FREE(fpath);
+		FREE(md5sum);
+
+		/* determine whether a base 'from' file exists */
+		fpath = _alpm_filecache_find(vdelta->from);
+		if(fpath) {
+			v->weight = vdelta->download_size;
+		}
+		FREE(fpath);
+	}
+}
+
+
+static void dijkstra(alpm_list_t *vertices)
+{
 	alpm_list_t *i;
 	pmgraph_t *v;
 	while(1) {
@@ -165,9 +176,14 @@ static off_t delta_vert(alpm_list_t *vertices,
 
 		}
 	}
+}
 
-	v = NULL;
+static off_t shortest_path(alpm_list_t *vertices, const char *to, alpm_list_t **path)
+{
+	alpm_list_t *i;
+	pmgraph_t *v = NULL;
 	off_t bestsize = 0;
+	alpm_list_t *rpath = NULL;
 
 	for(i = vertices; i; i = i->next) {
 		pmgraph_t *v_i = i->data;
@@ -181,7 +197,6 @@ static off_t delta_vert(alpm_list_t *vertices,
 		}
 	}
 
-	alpm_list_t *rpath = NULL;
 	while(v != NULL) {
 		pmdelta_t *vdelta = v->data;
 		rpath = alpm_list_add(rpath, vdelta);
@@ -219,9 +234,10 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
 
 	_alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to);
 
-	vertices = delta_graph_init(deltas);
-
-	bestsize = delta_vert(vertices, to, &bestpath);
+	vertices = graph_init(deltas, 0);
+	graph_init_size(vertices);
+	dijkstra(vertices);
+	bestsize = shortest_path(vertices, to, &bestpath);
 
 	_alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete : '%jd'\n", (intmax_t)bestsize);
 
@@ -232,6 +248,45 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
 	return(bestsize);
 }
 
+static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota)
+{
+	alpm_list_t *unused = NULL;
+	alpm_list_t *vertices;
+	alpm_list_t *i;
+	vertices = graph_init(deltas, 1);
+
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
+		if(strcmp(vdelta->to, to) == 0)
+		{
+			v->weight = vdelta->download_size;
+		}
+	}
+	dijkstra(vertices);
+	for(i = vertices; i; i = i->next) {
+		pmgraph_t *v = i->data;
+		pmdelta_t *vdelta = v->data;
+		if(v->weight > quota) {
+			unused = alpm_list_add(unused, vdelta->delta);
+		}
+	}
+	alpm_list_free_inner(vertices, _alpm_graph_free);
+	alpm_list_free(vertices);
+	return(unused);
+}
+
+alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(pmpkg_t *pkg)
+{
+	off_t pkgsize = alpm_pkg_get_size(pkg);
+	alpm_list_t *unused = find_unused(
+			alpm_pkg_get_deltas(pkg),
+			alpm_pkg_get_filename(pkg),
+			pkgsize * MAX_DELTA_RATIO);
+	return(unused);
+}
+
+
 /** Parses the string representation of a pmdelta_t object.
  * This function assumes that the string is in the correct format.
  * This format is as follows:
@@ -282,7 +337,7 @@ pmdelta_t *_alpm_delta_parse(char *line)
 	tmp2 = tmp;
 	STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL));
 
-	_alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size);
+	_alpm_log(PM_LOG_DEBUG, "delta : %s %s '%jd'\n", delta->from, delta->to, (intmax_t)delta->delta_size);
 
 	return(delta);
 }

lib/libalpm/delta.h

@@ -1,7 +1,7 @@
 /*
  *  delta.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2007-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/deps.c

@@ -1,7 +1,7 @@
 /*
  *  deps.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -578,7 +578,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
 /* Computes resolvable dependencies for a given package and adds that package
  * and those resolvable dependencies to a list.
  *
- * @param local is the local database
+ * @param localpkgs is the list of local packages
  * @param dbs_sync are the sync databases
  * @param pkg is the package to resolve
  * @param packages is a pointer to a list of packages which will be
@@ -594,7 +594,7 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs,
  *         unresolvable dependency, in which case the [*packages] list will be
  *         unmodified by this function
  */
-int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg,
+int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg,
                       alpm_list_t *preferred, alpm_list_t **packages,
                       alpm_list_t *remove, alpm_list_t **data)
 {
@@ -605,10 +605,6 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg,
 
 	ALPM_LOG_FUNC;
 
-	if(local == NULL || dbs_sync == NULL) {
-		return(-1);
-	}
-
 	if(_alpm_pkg_find(*packages, pkg->name) != NULL) {
 		return(0);
 	}
@@ -624,7 +620,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg,
 	for(i = alpm_list_last(*packages); i; i = i->next) {
 		pmpkg_t *tpkg = i->data;
 		targ = alpm_list_add(NULL, tpkg);
-		deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ);
+		deps = alpm_checkdeps(localpkgs, 0, remove, targ);
 		alpm_list_free(targ);
 		for(j = deps; j; j = j->next) {
 			pmdepmissing_t *miss = j->data;

lib/libalpm/deps.h

@@ -1,7 +1,7 @@
 /*
  *  deps.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -49,7 +49,7 @@ void _alpm_depmiss_free(pmdepmissing_t *miss);
 alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse);
 void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit);
 pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt);
-int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg,
+int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pkg,
 		alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove,
 		alpm_list_t **data);
 int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2);

lib/libalpm/dload.c

@@ -1,7 +1,7 @@
 /*
  *  download.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,9 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <signal.h>
 #include <limits.h>
 /* the following two are needed on BSD for libfetch */
@@ -59,7 +62,7 @@ static char *get_filename(const char *url) {
 static char *get_destfile(const char *path, const char *filename) {
 	char *destfile;
 	/* len = localpath len + filename len + null */
-	int len = strlen(path) + strlen(filename) + 1;
+	size_t len = strlen(path) + strlen(filename) + 1;
 	CALLOC(destfile, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL));
 	snprintf(destfile, len, "%s%s", path, filename);
 
@@ -69,37 +72,13 @@ static char *get_destfile(const char *path, const char *filename) {
 static char *get_tempfile(const char *path, const char *filename) {
 	char *tempfile;
 	/* len = localpath len + filename len + '.part' len + null */
-	int len = strlen(path) + strlen(filename) + 6;
+	size_t len = strlen(path) + strlen(filename) + 6;
 	CALLOC(tempfile, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, NULL));
 	snprintf(tempfile, len, "%s%s.part", path, filename);
 
 	return(tempfile);
 }
 
-/* Build a 'struct url' from an url. */
-static struct url *url_for_string(const char *url)
-{
-	struct url *ret = NULL;
-	ret = fetchParseURL(url);
-	if(!ret) {
-		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
-		RET_ERR(PM_ERR_SERVER_BAD_URL, NULL);
-	}
-
-	/* if no URL scheme specified, assume HTTP */
-	if(strlen(ret->scheme) == 0) {
-		_alpm_log(PM_LOG_WARNING, _("url scheme not specified, assuming HTTP\n"));
-		strcpy(ret->scheme, SCHEME_HTTP);
-	}
-	/* add a user & password for anonymous FTP */
-	if(strcmp(ret->scheme,SCHEME_FTP) == 0 && strlen(ret->user) == 0) {
-		strcpy(ret->user, "anonymous");
-		strcpy(ret->pwd, "libalpm@guest");
-	}
-
-	return(ret);
-}
-
 static const char *gethost(struct url *fileurl)
 {
 	const char *host = _("disk");
@@ -109,75 +88,126 @@ static const char *gethost(struct url *fileurl)
 	return(host);
 }
 
+int dload_interrupted;
+static RETSIGTYPE inthandler(int signum)
+{
+	dload_interrupted = 1;
+}
+
+#define check_stop() if(dload_interrupted) { ret = -1; goto cleanup; }
+enum sighandlers { OLD = 0, NEW = 1 };
+
 static int download_internal(const char *url, const char *localpath,
-		time_t mtimeold, time_t *mtimenew) {
-	fetchIO *dlf = NULL;
+		int force) {
 	FILE *localf = NULL;
-	struct url_stat ust;
 	struct stat st;
-	int chk_resume = 0, ret = 0;
-	size_t dl_thisfile = 0;
+	int ret = 0;
+	off_t dl_thisfile = 0;
 	ssize_t nread = 0;
 	char *tempfile, *destfile, *filename;
-	struct sigaction new_action, old_action;
-	struct url *fileurl = url_for_string(url);
-	char buffer[PM_DLBUF_LEN];
+	struct sigaction sig_pipe[2], sig_int[2];
 
-	if(!fileurl) {
-		return(-1);
-	}
+	off_t local_size = 0;
+	time_t local_time = 0;
+
+	struct url *fileurl;
+	struct url_stat ust;
+	fetchIO *dlf = NULL;
+
+	char buffer[PM_DLBUF_LEN];
 
 	filename = get_filename(url);
 	if(!filename) {
-		return(-1);
+		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
+		RET_ERR(PM_ERR_SERVER_BAD_URL, -1);
 	}
+
+	fileurl = fetchParseURL(url);
+	if(!fileurl) {
+		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
+		RET_ERR(PM_ERR_LIBFETCH, -1);
+	}
+
 	destfile = get_destfile(localpath, filename);
 	tempfile = get_tempfile(localpath, filename);
 
-	if(mtimeold) {
-		fileurl->last_modified = mtimeold;
+	if(stat(tempfile, &st) == 0 && st.st_size > 0) {
+		_alpm_log(PM_LOG_DEBUG, "tempfile found, attempting continuation\n");
+		local_time = fileurl->last_modified = st.st_mtime;
+		local_size = fileurl->offset = (off_t)st.st_size;
+		dl_thisfile = st.st_size;
+		localf = fopen(tempfile, "ab");
+	} else if(!force && stat(destfile, &st) == 0 && st.st_size > 0) {
+		_alpm_log(PM_LOG_DEBUG, "destfile found, using mtime only\n");
+		local_time = fileurl->last_modified = st.st_mtime;
+		local_size = /* no fu->off here */ (off_t)st.st_size;
+	} else {
+		_alpm_log(PM_LOG_DEBUG, "no file found matching criteria, starting from scratch\n");
 	}
 
 	/* pass the raw filename for passing to the callback function */
 	_alpm_log(PM_LOG_DEBUG, "using '%s' for download progress\n", filename);
 
-	if(stat(tempfile, &st) == 0 && st.st_size > 0) {
-		_alpm_log(PM_LOG_DEBUG, "existing file found, using it\n");
-		fileurl->offset = (off_t)st.st_size;
-		dl_thisfile = st.st_size;
-		localf = fopen(tempfile, "ab");
-		chk_resume = 1;
-	} else {
-		fileurl->offset = (off_t)0;
-		dl_thisfile = 0;
-	}
-
 	/* print proxy info for debug purposes */
 	_alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY"));
 	_alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy"));
 	_alpm_log(PM_LOG_DEBUG, "FTP_PROXY:  %s\n", getenv("FTP_PROXY"));
 	_alpm_log(PM_LOG_DEBUG, "ftp_proxy:  %s\n", getenv("ftp_proxy"));
 
-	/* libfetch does not reset the error code */
-	fetchLastErrCode = 0;
-
 	/* 10s timeout */
 	fetchTimeout = 10;
 
 	/* ignore any SIGPIPE signals- these may occur if our FTP socket dies or
 	 * something along those lines. Store the old signal handler first. */
-	new_action.sa_handler = SIG_IGN;
-	sigemptyset(&new_action.sa_mask);
-	sigaction(SIGPIPE, NULL, &old_action);
-	sigaction(SIGPIPE, &new_action, NULL);
+	sig_pipe[NEW].sa_handler = SIG_IGN;
+	sigemptyset(&sig_pipe[NEW].sa_mask);
+	sig_pipe[NEW].sa_flags = 0;
+	sigaction(SIGPIPE, NULL, &sig_pipe[OLD]);
+	sigaction(SIGPIPE, &sig_pipe[NEW], NULL);
 
-	dlf = fetchXGet(fileurl, &ust, (handle->nopassiveftp ? "i" : "pi"));
+	dload_interrupted = 0;
+	sig_int[NEW].sa_handler = &inthandler;
+	sigemptyset(&sig_int[NEW].sa_mask);
+	sig_int[NEW].sa_flags = 0;
+	sigaction(SIGINT, NULL, &sig_int[OLD]);
+	sigaction(SIGINT, &sig_int[NEW], NULL);
 
-	if(fetchLastErrCode == FETCH_UNCHANGED) {
-		_alpm_log(PM_LOG_DEBUG, "mtimes are identical, skipping %s\n", filename);
+	/* NOTE: libfetch does not reset the error code, be sure to do it before
+	 * calls into the library */
+
+	/* find out the remote size *and* mtime in one go. there is a lot of
+	 * trouble in trying to do both size and "if-modified-since" logic in a
+	 * non-stat request, so avoid it. */
+	fetchLastErrCode = 0;
+	if(fetchStat(fileurl, &ust, "") == -1) {
+		pm_errno = PM_ERR_LIBFETCH;
+		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
+				filename, gethost(fileurl), fetchLastErrString);
+		ret = -1;
+		goto cleanup;
+	}
+	check_stop();
+
+	_alpm_log(PM_LOG_DEBUG, "ust.mtime: %ld local_time: %ld compare: %ld\n",
+			ust.mtime, local_time, local_time - ust.mtime);
+	_alpm_log(PM_LOG_DEBUG, "ust.size: %jd local_size: %jd compare: %jd\n",
+			(intmax_t)ust.size, (intmax_t)local_size, (intmax_t)(local_size - ust.size));
+	if(!force && ust.mtime && ust.mtime == local_time
+			&& ust.size && ust.size == local_size) {
+		/* the remote time and size values agreed with what we have, so move on
+		 * because there is nothing more to do. */
+		_alpm_log(PM_LOG_DEBUG, "files are identical, skipping %s\n", filename);
 		ret = 1;
 		goto cleanup;
 	}
+	if(!ust.mtime || ust.mtime != local_time) {
+		_alpm_log(PM_LOG_DEBUG, "mtimes were different or unavailable, downloading %s from beginning\n", filename);
+		fileurl->offset = 0;
+	}
+
+	fetchLastErrCode = 0;
+	dlf = fetchGet(fileurl, "");
+	check_stop();
 
 	if(fetchLastErrCode != 0 || dlf == NULL) {
 		pm_errno = PM_ERR_LIBFETCH;
@@ -189,17 +219,14 @@ static int download_internal(const char *url, const char *localpath,
 		_alpm_log(PM_LOG_DEBUG, "connected to %s successfully\n", fileurl->host);
 	}
 
-	if(ust.mtime && mtimenew) {
-		*mtimenew = ust.mtime;
+	if(localf && fileurl->offset == 0) {
+		_alpm_log(PM_LOG_WARNING, _("resuming download of %s not possible; starting over\n"), filename);
+		fclose(localf);
+		localf = NULL;
+	} else if(fileurl->offset) {
+		_alpm_log(PM_LOG_DEBUG, "resuming download at position %jd\n", (intmax_t)fileurl->offset);
 	}
 
-	if(chk_resume && fileurl->offset == 0) {
-		_alpm_log(PM_LOG_WARNING, _("cannot resume download, starting over\n"));
-		if(localf != NULL) {
-			fclose(localf);
-			localf = NULL;
-		}
-	}
 
 	if(localf == NULL) {
 		_alpm_rmrf(tempfile);
@@ -207,7 +234,9 @@ static int download_internal(const char *url, const char *localpath,
 		dl_thisfile = 0;
 		localf = fopen(tempfile, "wb");
 		if(localf == NULL) { /* still null? */
-			_alpm_log(PM_LOG_ERROR, _("cannot write to file '%s'\n"), tempfile);
+			pm_errno = PM_ERR_RETRIEVE;
+			_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"),
+					tempfile, strerror(errno));
 			ret = -1;
 			goto cleanup;
 		}
@@ -219,15 +248,15 @@ static int download_internal(const char *url, const char *localpath,
 	}
 
 	while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) {
+		check_stop();
 		size_t nwritten = 0;
-		while(nwritten < nread) {
-			nwritten += fwrite(buffer, 1, (nread - nwritten), localf);
-			if(ferror(localf)) {
-				_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"),
-						destfile, strerror(errno));
-				ret = -1;
-				goto cleanup;
-			}
+		nwritten = fwrite(buffer, 1, nread, localf);
+		if((nwritten != nread) || ferror(localf)) {
+			pm_errno = PM_ERR_RETRIEVE;
+			_alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"),
+					tempfile, strerror(errno));
+			ret = -1;
+			goto cleanup;
 		}
 		dl_thisfile += nread;
 
@@ -262,36 +291,60 @@ static int download_internal(const char *url, const char *localpath,
 	fetchIO_close(dlf);
 	dlf = NULL;
 
+	/* set the times on the file to the same as that of the remote file */
+	if(ust.mtime) {
+		struct timeval tv[2];
+		memset(&tv, 0, sizeof(tv));
+		tv[0].tv_sec = ust.atime;
+		tv[1].tv_sec = ust.mtime;
+		utimes(tempfile, tv);
+	}
 	rename(tempfile, destfile);
 	ret = 0;
 
 cleanup:
-	/* restore any existing SIGPIPE signal handler */
-	sigaction(SIGPIPE, &old_action, NULL);
-
 	FREE(tempfile);
 	FREE(destfile);
 	if(localf != NULL) {
+		/* if we still had a local file open, we got interrupted. set the mtimes on
+		 * the file accordingly. */
+		fflush(localf);
+		if(ust.mtime) {
+			struct timeval tv[2];
+			memset(&tv, 0, sizeof(tv));
+			tv[0].tv_sec = ust.atime;
+			tv[1].tv_sec = ust.mtime;
+			futimes(fileno(localf), tv);
+		}
 		fclose(localf);
 	}
 	if(dlf != NULL) {
 		fetchIO_close(dlf);
 	}
 	fetchFreeURL(fileurl);
+
+	/* restore the old signal handlers */
+	sigaction(SIGINT, &sig_int[OLD], NULL);
+	sigaction(SIGPIPE, &sig_pipe[OLD], NULL);
+	/* if we were interrupted, trip the old handler */
+	if(dload_interrupted) {
+		raise(SIGINT);
+	}
+
 	return(ret);
 }
 #endif
 
 static int download(const char *url, const char *localpath,
-		time_t mtimeold, time_t *mtimenew) {
+		int force) {
 	if(handle->fetchcb == NULL) {
 #if defined(INTERNAL_DOWNLOAD)
-		return(download_internal(url, localpath, mtimeold, mtimenew));
+		return(download_internal(url, localpath, force));
 #else
 		RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
 #endif
 	} else {
-		int ret = handle->fetchcb(url, localpath, mtimeold, mtimenew);
+		int ret = handle->fetchcb(url, localpath, force);
 		if(ret == -1) {
 			RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
 		}
@@ -301,19 +354,15 @@ static int download(const char *url, const char *localpath,
 
 /*
  * Download a single file
- *   - if mtimeold is non-NULL, then only download the file if it's different
- *     than mtimeold.
- *   - if *mtimenew is non-NULL, it will be filled with the mtime of the remote
- *     file.
  *   - servers must be a list of urls WITHOUT trailing slashes.
  *
  * RETURN:  0 for successful download
- *          1 if the mtimes are identical
+ *          1 if the files are identical
  *         -1 on error
  */
 int _alpm_download_single_file(const char *filename,
 		alpm_list_t *servers, const char *localpath,
-		time_t mtimeold, time_t *mtimenew)
+		int force)
 {
 	alpm_list_t *i;
 	int ret = -1;
@@ -323,14 +372,14 @@ int _alpm_download_single_file(const char *filename,
 	for(i = servers; i; i = i->next) {
 		const char *server = i->data;
 		char *fileurl = NULL;
-		int len;
+		size_t len;
 
 		/* print server + filename into a buffer */
 		len = strlen(server) + strlen(filename) + 2;
 		CALLOC(fileurl, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1));
 		snprintf(fileurl, len, "%s/%s", server, filename);
 
-		ret = download(fileurl, localpath, mtimeold, mtimenew);
+		ret = download(fileurl, localpath, force);
 		FREE(fileurl);
 		if(ret != -1) {
 			break;
@@ -349,7 +398,7 @@ int _alpm_download_files(alpm_list_t *files,
 	for(lp = files; lp; lp = lp->next) {
 		char *filename = lp->data;
 		if(_alpm_download_single_file(filename, servers,
-					localpath, 0, NULL) == -1) {
+					localpath, 0) == -1) {
 			ret++;
 		}
 	}
@@ -376,7 +425,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(const char *url)
 	cachedir = _alpm_filecache_setup();
 
 	/* download the file */
-	ret = download(url, cachedir, 0, NULL);
+	ret = download(url, cachedir, 0);
 	if(ret == -1) {
 		_alpm_log(PM_LOG_WARNING, _("failed to download %s\n"), url);
 		return(NULL);

lib/libalpm/dload.h

@@ -1,7 +1,7 @@
 /*
  *  dload.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,11 +25,11 @@
 
 #include <time.h>
 
-#define PM_DLBUF_LEN (1024 * 10)
+#define PM_DLBUF_LEN (1024 * 16)
 
 int _alpm_download_single_file(const char *filename,
 		alpm_list_t *servers, const char *localpath,
-		time_t mtimeold, time_t *mtimenew);
+		int force);
 
 int _alpm_download_files(alpm_list_t *files,
 		alpm_list_t *servers, const char *localpath);

lib/libalpm/error.c

@@ -1,7 +1,7 @@
 /*
  *  error.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -117,8 +117,10 @@ const char SYMEXPORT *alpm_strerror(int err)
 			return _("cannot remove all files for package");
 		case PM_ERR_PKG_INVALID_NAME:
 			return _("package filename is not valid");
+		case PM_ERR_PKG_INVALID_ARCH:
+			return _("package architecture is not valid");
 		case PM_ERR_PKG_REPO_NOT_FOUND:
-			return _("no such repository");
+			return _("could not find repository for target");
 		/* Deltas */
 		case PM_ERR_DLT_INVALID:
 			return _("invalid or corrupted delta");

lib/libalpm/graph.h

@@ -1,7 +1,7 @@
 /*
  *  graph.h - helpful graph structure and setup/teardown methods
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/group.c

@@ -1,7 +1,7 @@
 /*
  *  group.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/group.h

@@ -1,7 +1,7 @@
 /*
  *  group.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/handle.c

@@ -1,7 +1,7 @@
 /*
  *  handle.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -79,6 +79,7 @@ void _alpm_handle_free(pmhandle_t *handle)
 	FREELIST(handle->cachedirs);
 	FREE(handle->logfile);
 	FREE(handle->lockfile);
+	FREE(handle->arch);
 	FREELIST(handle->dbs_sync);
 	FREELIST(handle->noupgrade);
 	FREELIST(handle->noextract);
@@ -168,7 +169,7 @@ const char SYMEXPORT *alpm_option_get_lockfile()
 	return handle->lockfile;
 }
 
-unsigned short SYMEXPORT alpm_option_get_usesyslog()
+int SYMEXPORT alpm_option_get_usesyslog()
 {
 	if (handle == NULL) {
 		pm_errno = PM_ERR_HANDLE_NULL;
@@ -213,13 +214,22 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps()
 	return handle->ignoregrp;
 }
 
-unsigned short SYMEXPORT alpm_option_get_nopassiveftp()
+const char SYMEXPORT *alpm_option_get_arch()
+{
+	if (handle == NULL) {
+		pm_errno = PM_ERR_HANDLE_NULL;
+		return NULL;
+	}
+	return handle->arch;
+}
+
+int SYMEXPORT alpm_option_get_usedelta()
 {
 	if (handle == NULL) {
 		pm_errno = PM_ERR_HANDLE_NULL;
 		return -1;
 	}
-	return handle->nopassiveftp;
+	return handle->usedelta;
 }
 
 pmdb_t SYMEXPORT *alpm_option_get_localdb()
@@ -436,7 +446,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 	return(0);
 }
 
-void SYMEXPORT alpm_option_set_usesyslog(unsigned short usesyslog)
+void SYMEXPORT alpm_option_set_usesyslog(int usesyslog)
 {
 	handle->usesyslog = usesyslog;
 }
@@ -529,12 +539,13 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp)
 	return(0);
 }
 
-void SYMEXPORT alpm_option_set_nopassiveftp(unsigned short nopasv)
+void SYMEXPORT alpm_option_set_arch(const char *arch)
 {
-	handle->nopassiveftp = nopasv;
+	if(handle->arch) FREE(handle->arch);
+	if(arch) handle->arch = strdup(arch);
 }
 
-void SYMEXPORT alpm_option_set_usedelta(unsigned short usedelta)
+void SYMEXPORT alpm_option_set_usedelta(int usedelta)
 {
 	handle->usedelta = usedelta;
 }

lib/libalpm/handle.h

@@ -1,7 +1,7 @@
 /*
  *  handle.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -57,9 +57,9 @@ typedef struct _pmhandle_t {
 	alpm_list_t *ignoregrp;   /* List of groups to ignore */
 
 	/* options */
-	unsigned short usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
-	unsigned short nopassiveftp; /* Don't use PASV ftp connections */
-	unsigned short usedelta;     /* Download deltas if possible */
+	int usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
+	char *arch;       /* Architecture of packages we should allow */
+	int usedelta;     /* Download deltas if possible */
 } pmhandle_t;
 
 /* global handle variable */

lib/libalpm/log.c

@@ -1,7 +1,7 @@
 /*
  *  log.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/log.h

@@ -1,7 +1,7 @@
 /*
  *  log.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify

lib/libalpm/md5.c

@@ -37,6 +37,9 @@
  *      to
  *        int md5_file( const char *path, unsigned char *output )
  *  * various static/inline changes
+ *
+ *  NOTE: XySSL has been renamed to PolarSSL, which is available at
+ *  www.polarssl.org. If we update, we should get it from there.
  */
 
 #include <string.h>

lib/libalpm/package.c

@@ -1,7 +1,7 @@
 /*
  *  package.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Christian Hamar <krics@linuxforum.hu>
@@ -295,7 +295,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_groups(pmpkg_t *pkg)
 	return pkg->groups;
 }
 
-unsigned short SYMEXPORT alpm_pkg_has_force(pmpkg_t *pkg)
+int SYMEXPORT alpm_pkg_has_force(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
 
@@ -423,13 +423,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg)
 	return pkg->backup;
 }
 
-alpm_list_t SYMEXPORT *alpm_pkg_get_removes(pmpkg_t *pkg)
-{
-	ASSERT(pkg != NULL, return(NULL));
-
-	return(pkg->removes);
-}
-
 pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg)
 {
 	/* Sanity checks */
@@ -466,7 +459,6 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
 		struct archive *archive = NULL;
 		struct archive_entry *entry;
 		const char *pkgfile = pkg->origin_data.file;
-		int ret = ARCHIVE_OK;
 
 		if((archive = archive_read_new()) == NULL) {
 			RET_ERR(PM_ERR_LIBARCHIVE, NULL);
@@ -480,7 +472,7 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg)
 			RET_ERR(PM_ERR_PKG_OPEN, NULL);
 		}
 
-		while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) {
+		while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
 			const char *entry_name = archive_entry_pathname(entry);
 
 			if(strcmp(entry_name, ".CHANGELOG") == 0) {
@@ -548,7 +540,7 @@ int SYMEXPORT alpm_pkg_changelog_close(const pmpkg_t *pkg, void *fp)
 	return(ret);
 }
 
-unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
+int SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
 
@@ -563,6 +555,23 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg)
 	return pkg->scriptlet;
 }
 
+static void find_requiredby(pmpkg_t *pkg, pmdb_t *db, alpm_list_t **reqs)
+{
+	const alpm_list_t *i;
+	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
+		if(!i->data) {
+			continue;
+		}
+		pmpkg_t *cachepkg = i->data;
+		if(_alpm_dep_edge(cachepkg, pkg)) {
+			const char *cachepkgname = cachepkg->name;
+			if(alpm_list_find_str(*reqs, cachepkgname) == 0) {
+				*reqs = alpm_list_add(*reqs, strdup(cachepkgname));
+			}
+		}
+	}
+}
+
 /**
  * @brief Compute the packages requiring a given package.
  * @param pkg a package
@@ -572,192 +581,29 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg)
 {
 	const alpm_list_t *i;
 	alpm_list_t *reqs = NULL;
+	pmdb_t *db;
 
-	pmdb_t *localdb = alpm_option_get_localdb();
-	for(i = _alpm_db_get_pkgcache(localdb); i; i = i->next) {
-		if(!i->data) {
-			continue;
-		}
-		pmpkg_t *cachepkg = i->data;
-		if(_alpm_dep_edge(cachepkg, pkg)) {
-			const char *cachepkgname = alpm_pkg_get_name(cachepkg);
-			reqs = alpm_list_add(reqs, strdup(cachepkgname));
+	if(pkg->origin == PKG_FROM_FILE) {
+		/* The sane option; search locally for things that require this. */
+		db = alpm_option_get_localdb();
+		find_requiredby(pkg, db, &reqs);
+	} else {
+		/* We have a DB package. if it is a local package, then we should
+		 * only search the local DB; else search all known sync databases. */
+		db = pkg->origin_data.db;
+		if(db->is_local) {
+			find_requiredby(pkg, db, &reqs);
+		} else {
+			for(i = handle->dbs_sync; i; i = i->next) {
+				db = i->data;
+				find_requiredby(pkg, db, &reqs);
+				reqs = alpm_list_msort(reqs, alpm_list_count(reqs), _alpm_str_cmp);
+			}
 		}
 	}
 	return(reqs);
 }
 
-/** Compare two version strings and determine which one is 'newer'.
- * Returns a value comparable to the way strcmp works. Returns 1
- * if a is newer than b, 0 if a and b are the same version, or -1
- * if b is newer than a.
- *
- * This function has been adopted from the rpmvercmp function located
- * at lib/rpmvercmp.c, and was most recently updated against rpm
- * version 4.4.2.3. Small modifications have been made to make it more
- * consistent with the libalpm coding style.
- *
- * Keep in mind that the pkgrel is only compared if it is available
- * on both versions handed to this function. For example, comparing
- * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield
- * -1 as expected. This is mainly for supporting versioned dependencies
- * that do not include the pkgrel.
- */
-int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b)
-{
-	char oldch1, oldch2;
-	char *str1, *str2;
-	char *ptr1, *ptr2;
-	char *one, *two;
-	int rc;
-	int isnum;
-	int ret = 0;
-
-	ALPM_LOG_FUNC;
-
-	/* libalpm added code. ensure our strings are not null */
-	if(!a) {
-		if(!b) return(0);
-		return(-1);
-	}
-	if(!b) return(1);
-
-	/* easy comparison to see if versions are identical */
-	if(strcmp(a, b) == 0) return(0);
-
-	str1 = strdup(a);
-	str2 = strdup(b);
-
-	one = str1;
-	two = str2;
-
-	/* loop through each version segment of str1 and str2 and compare them */
-	while(*one && *two) {
-		while(*one && !isalnum((int)*one)) one++;
-		while(*two && !isalnum((int)*two)) two++;
-
-		/* If we ran to the end of either, we are finished with the loop */
-		if(!(*one && *two)) break;
-
-		ptr1 = one;
-		ptr2 = two;
-
-		/* grab first completely alpha or completely numeric segment */
-		/* leave one and two pointing to the start of the alpha or numeric */
-		/* segment and walk ptr1 and ptr2 to end of segment */
-		if(isdigit((int)*ptr1)) {
-			while(*ptr1 && isdigit((int)*ptr1)) ptr1++;
-			while(*ptr2 && isdigit((int)*ptr2)) ptr2++;
-			isnum = 1;
-		} else {
-			while(*ptr1 && isalpha((int)*ptr1)) ptr1++;
-			while(*ptr2 && isalpha((int)*ptr2)) ptr2++;
-			isnum = 0;
-		}
-
-		/* save character at the end of the alpha or numeric segment */
-		/* so that they can be restored after the comparison */
-		oldch1 = *ptr1;
-		*ptr1 = '\0';
-		oldch2 = *ptr2;
-		*ptr2 = '\0';
-
-		/* this cannot happen, as we previously tested to make sure that */
-		/* the first string has a non-null segment */
-		if (one == ptr1) {
-			ret = -1;	/* arbitrary */
-			goto cleanup;
-		}
-
-		/* take care of the case where the two version segments are */
-		/* different types: one numeric, the other alpha (i.e. empty) */
-		/* numeric segments are always newer than alpha segments */
-		/* XXX See patch #60884 (and details) from bugzilla #50977. */
-		if (two == ptr2) {
-			ret = isnum ? 1 : -1;
-			goto cleanup;
-		}
-
-		if (isnum) {
-			/* this used to be done by converting the digit segments */
-			/* to ints using atoi() - it's changed because long  */
-			/* digit segments can overflow an int - this should fix that. */
-
-			/* throw away any leading zeros - it's a number, right? */
-			while (*one == '0') one++;
-			while (*two == '0') two++;
-
-			/* whichever number has more digits wins */
-			if (strlen(one) > strlen(two)) {
-				ret = 1;
-				goto cleanup;
-			}
-			if (strlen(two) > strlen(one)) {
-				ret = -1;
-				goto cleanup;
-			}
-		}
-
-		/* strcmp will return which one is greater - even if the two */
-		/* segments are alpha or if they are numeric.  don't return  */
-		/* if they are equal because there might be more segments to */
-		/* compare */
-		rc = strcmp(one, two);
-		if (rc) {
-			ret = rc < 1 ? -1 : 1;
-			goto cleanup;
-		}
-
-		/* restore character that was replaced by null above */
-		*ptr1 = oldch1;
-		one = ptr1;
-		*ptr2 = oldch2;
-		two = ptr2;
-
-		/* libalpm added code. check if version strings have hit the pkgrel
-		 * portion. depending on which strings have hit, take correct action.
-		 * this is all based on the premise that we only have one dash in
-		 * the version string, and it separates pkgver from pkgrel. */
-		if(*ptr1 == '-' && *ptr2 == '-') {
-			/* no-op, continue comparing since we are equivalent throughout */
-		} else if(*ptr1 == '-') {
-			/* ptr1 has hit the pkgrel and ptr2 has not. continue version
-			 * comparison after stripping the pkgrel from ptr1. */
-			*ptr1 = '\0';
-		} else if(*ptr2 == '-') {
-			/* ptr2 has hit the pkgrel and ptr1 has not. continue version
-			 * comparison after stripping the pkgrel from ptr2. */
-			*ptr2 = '\0';
-		}
-	}
-
-	/* this catches the case where all numeric and alpha segments have */
-	/* compared identically but the segment separating characters were */
-	/* different */
-	if ((!*one) && (!*two)) {
-		ret = 0;
-		goto cleanup;
-	}
-
-	/* the final showdown. we never want a remaining alpha string to
-	 * beat an empty string. the logic is a bit weird, but:
-	 * - if one is empty and two is not an alpha, two is newer.
-	 * - if one is an alpha, two is newer.
-	 * - otherwise one is newer.
-	 * */
-	if ( ( !*one && !isalpha((int)*two) )
-			|| isalpha((int)*one) ) {
-		ret = -1;
-	} else {
-		ret = 1;
-	}
-
-cleanup:
-	free(str1);
-	free(str2);
-	return(ret);
-}
-
 /** @} */
 
 pmpkg_t *_alpm_pkg_new(void)
@@ -858,7 +704,11 @@ void _alpm_pkg_free(pmpkg_t *pkg)
 	FREE(pkg);
 }
 
-/* Free transaction specific fields */
+/* This function should be used when removing a target from upgrade/sync target list
+ * Case 1: If pkg is a loaded package file (PKG_FROM_FILE), it will be freed.
+ * Case 2: If pkg is a pkgcache entry (PKG_FROM_CACHE), it won't be freed,
+ *         only the transaction specific fields of pkg will be freed.
+ */
 void _alpm_pkg_free_trans(pmpkg_t *pkg)
 {
 	ALPM_LOG_FUNC;
@@ -867,6 +717,11 @@ void _alpm_pkg_free_trans(pmpkg_t *pkg)
 		return;
 	}
 
+	if(pkg->origin == PKG_FROM_FILE) {
+		_alpm_pkg_free(pkg);
+		return;
+	}
+
 	alpm_list_free(pkg->removes);
 	pkg->removes = NULL;
 }
@@ -894,7 +749,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2)
 {
 	pmpkg_t *pkg1 = (pmpkg_t *)p1;
 	pmpkg_t *pkg2 = (pmpkg_t *)p2;
-	return(strcmp(alpm_pkg_get_name(pkg1), alpm_pkg_get_name(pkg2)));
+	return(strcmp(pkg1->name, pkg2->name));
 }
 
 /* Test for existence of a package in a alpm_list_t*
@@ -913,7 +768,7 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle)
 	for(lp = haystack; lp; lp = lp->next) {
 		pmpkg_t *info = lp->data;
 
-		if(info && strcmp(alpm_pkg_get_name(info), needle) == 0) {
+		if(info && strcmp(info->name, needle) == 0) {
 			return(info);
 		}
 	}

lib/libalpm/package.h

@@ -1,7 +1,7 @@
 /*
  *  package.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2006 by David Kimpe <dnaku@frugalware.org>
@@ -49,8 +49,8 @@ struct __pmpkg_t {
 	off_t size;
 	off_t isize;
 	off_t download_size;
-	unsigned short scriptlet;
-	unsigned short force;
+	int scriptlet;
+	int force;
 	pmpkgreason_t reason;
 	alpm_list_t *licenses;
 	alpm_list_t *replaces;

lib/libalpm/po/LINGUAS

@@ -1,4 +1,5 @@
 # Set of available languages.
+ca
 cs
 de
 el
@@ -8,12 +9,14 @@ fr
 hu
 it
 kk
-nb_NO
+nb
 pl
+pt
 pt_BR
 ro
 ru
-sv_SE
+sk
+sv
 tr
 uk
 zh_CN

lib/libalpm/po/ca.po

@@ -0,0 +1,563 @@
+# Translation of libpalm.po to Catalan
+# Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Manuel Tortosa <manutortosa@gmail.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-12 19:17+0200\n"
+"Last-Translator: Manuel Tortosa <manutortosa@gmail.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"s'està reemplaçant l'antiga versió %s-%s per %s en la llista d'objectius\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"s'ometrà %s-%s perquè la versió més nova %s és en la llista d'objectius\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"els permisos del directori difereixen en %s\n"
+"sistema de fitxers: %o paquet: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "extracció: no se sobreescriurà el directori amb el fitxer %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extracció: l'enllaç simbòlic %s no apunta al directori\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "no es pot extreure %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "no es pot reanomenar %s a %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s desat com %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "no es pot instal·lar %s com %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s instal·lat com %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "s'està extraient %s com %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "no es pot obtenir el directori de treball actual\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "ha ocorregut un problema en actualitzar %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "ha ocorregut un problema en instal·lar %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "no s'ha pogut actualitzar l'entrada de la base de dades %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "no s'ha pogut afegir l'entrada '%s' en la memòria cau\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "s'està eliminant la base de dades invàlida: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no s'ha pogut eliminar el directori de la base de dades %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "no s'ha pogut eliminar la base de dades %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "nom invàlid per l'entrada de la base de dades '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada de la base de dades duplicada '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "entrada de la base de dades corrupta '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "no es pot obrir el fitxer %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "la base de dades %s és inconsistent: nom erroni en el paquet %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "la base de dades %s és inconsistent: versió errònia en el paquet %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "no s'ha pogut crear el directori %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "no s'ha pogut analitzar el fitxers de descripció de paquet en %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "falta nom de paquet en %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "falta versió de paquet en %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "error en llegir paquet %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "falten les metadades del paquet en %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "no s'ha definit la ruta de la base de dades\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "intent de re-registre de la BD 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "s'ha detectat una dependència cíclica:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s serà eliminat després de la seva dependència %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s serà instal·lar abans de la seva dependència %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "s'està ignorant paquet %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "s'ha seleccionat un paquet proveïdor (%s proveeix %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "no es pot resoldre \"%s\", una dependència de \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disc"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' és invàlid\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "ha fallat en recuperar el fitxer '%s' des de %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "no es pot la reprendre la baixada de %s, s'està iniciant de nou\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "error en escriure al fitxer '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "ha fallat en recuperar el fitxer '%s' de %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s sembla estar truncat: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "ha fallat en baixar %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "memòria esgotada!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "error inesperat del sistema"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "privilegis insuficients"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "no es pot trobar o llegir fitxer"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "no es pot trobar o llegir directori"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "s'ha passat un argument erroni o NULL"
+
+#, c-format
+msgid "library not initialized"
+msgstr "llibreria no inicialitzada"
+
+#, c-format
+msgid "library already initialized"
+msgstr "la llibreria ja s'ha inicialitzat"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "no s'ha pogut bloquejar la base de dades"
+
+#, c-format
+msgid "could not open database"
+msgstr "no s'ha pogut obrir la base de dades"
+
+#, c-format
+msgid "could not create database"
+msgstr "no s'ha pogut crear la base de dades"
+
+#, c-format
+msgid "database not initialized"
+msgstr "base de dades no inicialitzada"
+
+#, c-format
+msgid "database already registered"
+msgstr "la base de dades ja s'ha registrat"
+
+#, c-format
+msgid "could not find database"
+msgstr "no s'ha pogut trobar la base de dades"
+
+#, c-format
+msgid "could not update database"
+msgstr "no s'ha pogut actualitzar la base de dades"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "no s'ha pogut suprimir l'entrada de la base de dades"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "url del servidor invàlid"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "no s'ha configurat cap servidor pel repositori"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "ja s'ha inicialitzat la transacció"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "no s'ha inicialitzat la transacció"
+
+#, c-format
+msgid "duplicate target"
+msgstr "objectiu duplicat"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "transacció no preparada"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "transacció cancel·lada"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "l'operació no és compatible amb el tipus de transacció"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr ""
+"intent de publicació de la transacció amb la base de dades no bloquejada"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "no s'ha pogut trobar o llegir el paquet"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operació cancel·lada degut a ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "paquet invàlid o corrupte"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "no s'ha pogut obrir el fitxer de paquet"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "no s'han pogut eliminar tots els fitxers del paquet"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "el nom de fitxer del paquet no és vàlid"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "l'arquitectura del paquet no és vàlida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "no s'ha pogut trobar el repositori per l'objectiu"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "delta invàlid o corrupte"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "ha fallat el pedaç delta"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "no s'han pogut satisfer les dependències"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "dependències conflictives"
+
+#, c-format
+msgid "conflicting files"
+msgstr "fitxers conflictius"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "ha fallat en recuperar alguns fitxers"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "expressió regular invàlida"
+
+#, c-format
+msgid "libarchive error"
+msgstr "error de libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "error de la llibreria de baixades"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "error en invocar el baixador extern"
+
+#, c-format
+msgid "unexpected error"
+msgstr "error inesperat"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "no s'ha pogut trobar %s en la base de dades -- s'està ometent\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "s'està eliminant %s de la llista d'objectius\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "no s'ha pogut eliminar el fitxer '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "no s'ha pogut eliminar la entrada de la base de dades %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "no s'ha pogut eliminar l'entrada '%s' de la memòria cau\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: s'ha ignorat l'actualització del paquet (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: s'ha ignorat la desactualització del paquet (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: desactualitzant de la versió %s a la versió %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) és més nou que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "s'està ignorant el reemplaçament del paquet (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "no s'ha pogut reemplaçar %s per %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s és al dia -- s'ignorarà\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s és al dia -- es reinstal·larà\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "desactualitzant paquet %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr ""
+"s'està eliminant '%s' de la llista d'objectius perquè té conflictes amb "
+"'%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "ha fallat en recuperar alguns fitxers de %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "no s'ha pogut publicar la transacció d'eliminació\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "no s'ha pogut publicar la transacció\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "no s'ha pogut eliminar el fitxer de bloqueig %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "no s'ha pogut crear el directori temporal\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "no s'ha pogut copiar el fitxer temporal a %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "no s'ha pogut eliminar el directori temporal %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "no s'ha pogut canviar el directori a %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "no s'ha pogut bifurcar a un nou procés (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "no s'ha pogut canviar el directori arrel (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "no s'ha pogut canviar el directori a / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "ha fallat la crida a popen (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "ha fallat la crida a waitpid (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "l'ordre a fallat a executar-se correctament\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "no existeix memòria cau %s, s'està creant...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "no s'ha pogut crear la memòria cau del paquet, s'usarà /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "s'han trobat paquets conflictius en la llista d'objectius\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "no podeu instal·lar dos paquets amb conflictes alhora\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "no està implementat reemplaçar paquets amb -U\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "podeu reemplaçar paquets manualment usant -Rd i -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no s'ha especificat l'esquema url, s'està assumint HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no s'ha pogut escriure al fitxer '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existeix aquest repositori"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "no s'ha trobat el repositori '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció d'eliminació\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no s'ha pogut crear la transacció\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció d'eliminació\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no s'ha pogut inicialitzar la transacció\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no s'ha pogut preparar la transacció d'eliminació\n"

lib/libalpm/po/cs.po

@@ -1,16 +1,16 @@
 # translation of cs.po to Čeština
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
-#
-# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008, 2009.
+# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:08+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 12:56+0200\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +25,6 @@ msgstr "v seznamu cílů nahrazena starší verze %s-%s za %s\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "vynechává se %s-%s, protože v seznamu cílů je novější veze %s\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nelze instalovat dva konfliktní balíčky současně\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -105,6 +89,14 @@ msgstr "nelze přidat položku '%s' do cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "odstraňuje se chybná databáze: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nelze otevřít %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nelze odstranit adresář databáze %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "nelze odstranit záznam v databázi %s\n"
@@ -113,6 +105,10 @@ msgstr "nelze odstranit záznam v databázi %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "chybný název záznamu v databázi '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicitní záznam v databázi '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "poškozený záznam v databázi '%s'\n"
@@ -153,14 +149,14 @@ msgstr "chyba při čtení balíčku %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "chybí metadata balíčku v %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "cesta k databázi není definována\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "zjištěna cyklická závislost:\n"
@@ -185,29 +181,21 @@ msgstr "byl vybrán nahrazující balíček (%s poskytuje %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nelze vyřešit \"%s\", závislost \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' je chybná\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je chybná\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nelze navázat stahování, začíná se znovu\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nelze zapisovat do souboru '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nelze navázat stahování %s, začíná se znovu\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -350,8 +338,12 @@ msgid "package filename is not valid"
 msgstr "jméno souboru balíčku není platné"
 
 #, c-format
-msgid "no such repository"
-msgstr "takový repositář není nastaven"
+msgid "package architecture is not valid"
+msgstr "architektura balíčku není platná"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "nelze nalézt repositář cíle"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -441,10 +433,6 @@ msgstr "ignoruje se náhrada balíčku (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "nelze nahradit soubor %s souborem %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositář '%s' nebyl nalezen\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s je aktuální -- vynechat\n"
@@ -469,26 +457,6 @@ msgstr "'%s' odstraněn ze seznamu cílů, protože je konfliktní s '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "selhalo získání některých souborů z %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nelze vytvořit transakci pro odstranění\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nelze vytvořit transakci\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nelze inicializovat transakci pro odstranění\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nelze inicializovat transakci\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nelze připravit transakci pro odstranění\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nelze provést transakci pro odstranění\n"
@@ -513,10 +481,6 @@ msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nelze otevřít %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
@@ -553,6 +517,45 @@ msgstr "neexistuje cache %s, vytváří se...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nelze vytvořit cache balíčků, používá se /tmp\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nelze instalovat dva konfliktní balíčky současně\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "nahrazování balíčků pomocí -U není nyní podporováno\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "balíčky lze nahradit ručně použitím -Rd a -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schéma URL nedefinováno, předpokládá se HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nelze zapisovat do souboru '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "takový repositář není nastaven"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositář '%s' nebyl nalezen\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nelze vytvořit transakci pro odstranění\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nelze vytvořit transakci\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nelze inicializovat transakci pro odstranění\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nelze inicializovat transakci\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nelze připravit transakci pro odstranění\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "chyba při stahování '%s': %s\n"
 

lib/libalpm/po/de.po

@@ -1,6 +1,6 @@
 # translation of de.po to German
 # German translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 #
 # Marcus Habermehl <bmh1980@frugalware.org>, 2006.
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:08+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-07 20:02+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,24 +31,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "Überspringe %s-%s, da sich die neuere Version %s in der Ziel-Liste befindet\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "In Konflikt stehende Pakete wurden in der Ziel-Liste gefunden\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
-"installieren\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "Das Ersetzen von Paketen mit -U wird noch nicht unterstützt\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -112,6 +95,14 @@ msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n"
 msgid "removing invalid database: %s\n"
 msgstr "Entferne die ungültige Datenbank: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "Konnte Datei %s nicht öffnen: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "Konnte Datenbank-Verzeichnis %s nicht entfernen\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "Konnte Datenbank %s nicht entfernen\n"
@@ -120,6 +111,10 @@ msgstr "Konnte Datenbank %s nicht entfernen\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "Ungültiger Name für Datenbank-Eintrag '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "Doppelter Datenbank-Eintrag '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "Beschädigter Datenbank-Eintrag '%s'\n"
@@ -164,14 +159,14 @@ msgstr "Fehler beim Lesen des Paketes %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "Fehlende Paket-Metadaten in %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "Datenbank-Pfad ist nicht definiert\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "Abhängigkeits-Zyklus entdeckt:\n"
@@ -196,29 +191,21 @@ msgstr "Bereitstellendes Paket wurde ausgewählt (%s enthält %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "Kann \"%s\" nicht auflösen (eine Abhängigkeit von \"%s\")\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' ist ungültig\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "URL-Schema nicht spezifiziert, vermute HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "Platte"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' ist ungültig\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "Kann Datei '%s' nicht beschreiben\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "Kann den Download von %s wieder aufnehmen, starte neu\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -362,8 +349,12 @@ msgid "package filename is not valid"
 msgstr "Der Dateiname des Paketes ist nicht gültig"
 
 #, c-format
-msgid "no such repository"
-msgstr "Kein solches Repositorium"
+msgid "package architecture is not valid"
+msgstr "Die Paket-Architektur ist ungültig"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "Konnte kein Repositorium für das Ziel finden"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -453,10 +444,6 @@ msgstr "Ignoriere Paket-Ersetzung (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "Kann %s nicht durch %s ersetzen\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "Repositorium '%s' nicht gefunden\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
@@ -481,26 +468,6 @@ msgstr "Entferne '%s' aus der Ziel-Liste, da es mit '%s' in Konflikt steht\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "Konnte manche Dateien von %s nicht übertragen\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "Konnte den Vorgang nicht erstellen\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "Konnte den Vorgang nicht beginnen\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
@@ -525,10 +492,6 @@ msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "Konnte Datei %s nicht öffnen: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"

lib/libalpm/po/el.po

@@ -1,20 +1,23 @@
 # Greek translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 #
-# Christos Nouskas <nous@archlinux.us>, 2009.
+# Christos Nouskas <nous@archlinux.us>, 2009, 2010.
+# Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-06 19:21+0200\n"
-"Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
-"Language-Team: greek <el@li.org>\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-09 23:02+0300\n"
+"Last-Translator: Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>\n"
+"Language-Team: Greek <>\n"
+"Language: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
@@ -26,28 +29,12 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "παράλειψη %s-%s καθώς υπάρχει νεότερη έκδοση %s στην λίστα διεκπεραίωσης\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "βρέθηκαν αντιτιθέμενα πακέτα στην λίστα διεκπεραίωσης\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "δεν επιτρέπεται η ταυτόχρονη εγκατάσταση δύο αντιτιθεμένων πακέτων\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "η αντικατάσταση πακέτων με όρισμα -U δεν υποστηρίζεται ακόμη\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "η αντικατάσταση πακέτων μπορεί να γίνει χειροκίνητα με -Rd and -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"οι άδειες καταλόγου διαφέρουν στο %s\n"
+"τα δικαιώματα καταλόγου διαφέρουν στο %s\n"
 "σύστημα αρχείων: %o  πακέτο: %o\n"
 
 #, c-format
@@ -68,7 +55,7 @@ msgstr "αδυναμία μετονομασίας %s σε %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "το %s αποθηκεύθηκε ως %s\n"
+msgstr "αποθήκευση %s ως %s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
@@ -84,7 +71,7 @@ msgstr "εξαγωγή %s ως %s.pacnew\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "αδυναμία πρόσκτησης τρέχοντος καταλόγου\n"
+msgstr "αδυναμία χρήσης τρέχοντος καταλόγου\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
@@ -106,6 +93,14 @@ msgstr "αδυναμία προσθήκης εγγραφής '%s' στην κρ
 msgid "removing invalid database: %s\n"
 msgstr "διαγραφή άκυρης βάσης: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "αδυναμία ανάγνωσης %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "αδυναμία διαγραφής καταλόγου βάσης %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "αδυναμία διαγραφής βάσης %s\n"
@@ -114,9 +109,13 @@ msgstr "αδυναμία διαγραφής βάσης %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "άκυρο όνομα εγγραφής βάσης '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "διπλότυπη εγγραφή βάσης '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "κατεστραμμένο όνομα εγγραφής βάσης '%s'\n"
+msgstr "κατεστραμμένη εγγραφή βάσης '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -154,29 +153,29 @@ msgstr "σφάλμα ανάγνωσης πακέτου %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "απόντα μετα-δεδομένα πακέτου στο %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "προσπάθεια επανακαταχώρησης 'τοπικής' βάσης\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "ακαθόριστη διαδρομή βάσης\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "προσπάθεια επανακαταχώρησης 'τοπικής' βάσης\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "εντοπισμός κυκλικής εξάρτησης:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "κατάργηση του %s μετά την εξάρτηση %s\n"
+msgstr "κατάργηση του %s μετά την εξάρτησή του %s\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "εγκατάσταση του %s πρίν από την εξάρτηση %s\n"
+msgstr "εγκατάσταση του %s πρίν από την εξάρτησή του %s\n"
 
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr "αγνόηση πακέτου %s-%s\n"
+msgstr "παράβλεψη πακέτου %s-%s\n"
 
 #, c-format
 msgid "provider package was selected (%s provides %s)\n"
@@ -186,29 +185,21 @@ msgstr "επιλογή παρέχοντος πακέτου (το %s παρέχε
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "αδυναμία εύρεσης του \"%s\", εξάρτησης του \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "άκυρο url '%s'\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "ακαθόριστο πρωτόκολλο url, εικάζεται HTTP\n"
-
 #, c-format
 msgid "disk"
-msgstr "δίσκο(ς)"
+msgstr "δίσκο"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "άκυρη διεύθυνση '%s'\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "αποτυχία λήψης αρχείου '%s' από %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "αδυναμία συνέχισης λήψης, επανάληψη\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "αδυναμία εγγραφής στο '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "συνέχιση λήψης %s αδύνατη, επανεκκίνηση\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -220,7 +211,7 @@ msgstr "αποτυχία λήψης αρχείου '%s' από %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "το %s φαίνεται ελλιπές: %jd/%jd bytes\n"
+msgstr "το %s δείχνει ημιτελές: %jd/%jd bytes\n"
 
 #, c-format
 msgid "failed to download %s\n"
@@ -228,7 +219,7 @@ msgstr "αποτυχία λήψης %s\n"
 
 #, c-format
 msgid "out of memory!"
-msgstr "έλλειψη μνήμης!"
+msgstr "ανεπαρκής μνήμη!"
 
 #, c-format
 msgid "unexpected system error"
@@ -248,15 +239,15 @@ msgstr "αδυναμία εύρεσης ή ανάγνωσης καταλόγου
 
 #, c-format
 msgid "wrong or NULL argument passed"
-msgstr "εσφαλμένο ή ΚΕΝΟ όρισμα"
+msgstr "εσφαλμένο ή NULL όρισμα"
 
 #, c-format
 msgid "library not initialized"
-msgstr "βιβλιοθήκη δεν εκκινήθηκε"
+msgstr "βιβλιοθήκη μη εκκινηθείσα"
 
 #, c-format
 msgid "library already initialized"
-msgstr "βιβλιοθήκη ήδη εκκινήθηκε"
+msgstr "βιβλιοθήκη ήδη εκκινηθείσα"
 
 #, c-format
 msgid "unable to lock database"
@@ -272,11 +263,11 @@ msgstr "αδυναμία δημιουργίας βάσης"
 
 #, c-format
 msgid "database not initialized"
-msgstr "βάση ήδη εκκινήθηκε"
+msgstr "βάση μη εκκινηθείσα"
 
 #, c-format
 msgid "database already registered"
-msgstr "βάση ήδη καταχωρήθηκε"
+msgstr "βάση ήδη εκκινηθείσα"
 
 #, c-format
 msgid "could not find database"
@@ -292,19 +283,19 @@ msgstr "αδυναμία κατάργησης εγγραφής βάσης"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "άκυρο url διακομιστή"
+msgstr "άκυρη διεύθυνση διακομιστή"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr "δεν ορίσθηκαν διακομιστές αποθήκης"
+msgstr "ακαθόριστοι διακομιστές αποθήκης"
 
 #, c-format
 msgid "transaction already initialized"
-msgstr "διεκπεραίωση ήδη εκκινήθηκε"
+msgstr "διεκπεραίωση ήδη εκκινηθείσα"
 
 #, c-format
 msgid "transaction not initialized"
-msgstr "διεκπεραίωση δεν εκκινήθηκε"
+msgstr "διεκπεραίωση μη εκκινηθείσα"
 
 #, c-format
 msgid "duplicate target"
@@ -312,11 +303,11 @@ msgstr "διπλότυπος στόχος"
 
 #, c-format
 msgid "transaction not prepared"
-msgstr "διεκπεραίωση δεν προετοιμάσθηκε"
+msgstr "απροετοίμαστη διεκπεραίωση"
 
 #, c-format
 msgid "transaction aborted"
-msgstr "διεκπεραίωση ματαιώθηκε"
+msgstr "ματαίωση διεκπεραίωσης"
 
 #, c-format
 msgid "operation not compatible with the transaction type"
@@ -344,15 +335,19 @@ msgstr "αδυναμία ανοίγματος πακέτου"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "αδυναμία κατάργησης όλων των αρχείων του πακέτου"
+msgstr "αδυναμία διαγραφής όλων των αρχείων του πακέτου"
 
 #, c-format
 msgid "package filename is not valid"
 msgstr "μη έγκυρο όνομα πακέτου"
 
 #, c-format
-msgid "no such repository"
-msgstr "δεν υπάρχει τέτοια αποθήκη"
+msgid "package architecture is not valid"
+msgstr "μη έγκυρη αρχιτεκτονική πακέτου"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "αδυναμία εύρεσης αποθήκης για διεκπεραίωση"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -364,7 +359,7 @@ msgstr "αποτυχία μπάλωματος delta"
 
 #, c-format
 msgid "could not satisfy dependencies"
-msgstr "αδυναμία ικανοποίησης εξαρτήσεων"
+msgstr "αδυναμία επίλυσης εξαρτήσεων"
 
 #, c-format
 msgid "conflicting dependencies"
@@ -400,7 +395,7 @@ msgstr "απροσδόκητο σφάλμα"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "δεν βρέθηκε το %s στην βάση -- παράλειψη\n"
+msgstr "δεν βρέθηκε το %s στη βάση -- παράλειψη\n"
 
 #, c-format
 msgid "removing %s from target list\n"
@@ -412,19 +407,19 @@ msgstr "αδυναμία διαγραφής αρχείου '%s': %s\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "αδυναμία κατάργησης εγγραφής βάσης %s-%s\n"
+msgstr "αδυναμία διαγραφής εγγραφής βάσης %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "αδυναμία κατάργησης εγγραφής '%s' από κρύπτη\n"
+msgstr "αδυναμία διαγραφής εγγραφής '%s' από κρύπτη\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: αγνόηση αναβάθμισης πακέτου (%s => %s)\n"
+msgstr "%s: παράβλεψη αναβάθμισης πακέτου (%s => %s)\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%s: αγνόηση υποβάθμισης πακέτου (%s => %s)\n"
+msgstr "%s: παράβλεψη υποβάθμισης πακέτου (%s => %s)\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
@@ -432,27 +427,23 @@ msgstr "%s: υποβάθμιση από έκδοση %s στην έκδοση %s
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: το τοπικό (%s) είναι νεότερο από το %s (%s)\n"
+msgstr "%s: τοπικό (%s) νεότερο από του [%s] (%s)\n"
 
 #, c-format
 msgid "ignoring package replacement (%s-%s => %s-%s)\n"
-msgstr "αγνόηση αντικαταστάτη πακέτου (%s-%s => %s-%s)\n"
+msgstr "παράβλεψη αντικαταστάτη πακέτου (%s-%s => %s-%s)\n"
 
 #, c-format
 msgid "cannot replace %s by %s\n"
 msgstr "αδυναμία αντικατάστασης του %s από το %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "δεν βρέθηκε αποθήκη'%s'\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "το %s-%s είναι ενημερωμένο -- παράλειψη\n"
+msgstr "%s-%s ενημερωμένο -- παράλειψη\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "το %s-%s είναι ενημερωμένο -- επανεγκατάσταση\n"
+msgstr "%s-%s ενημερωμένο -- επανεγκατάσταση\n"
 
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
@@ -465,35 +456,15 @@ msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτ
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
-"κατάργηση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
+"αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "αποτυχία λήψεως κάποιων αρχείων από το %s\n"
-
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "αδυναμία διεκπεραίωσης κατάργησης\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "αδυναμία δημιουργίας διεκπεραίωσης\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "αδυναμία εκκίνησης κατάργησης\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "αδυναμία εκκίνησης διεκπεραίωσης\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "αδυναμία προετοιμασίας κατάργησης\n"
+msgstr "αποτυχία λήψεως κάποιων αρχείων από %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "αδυναμία ολοκλήρωσης κατάργησης\n"
+msgstr "αδυναμία διεκπεραίωσης διαγραφής\n"
 
 #, c-format
 msgid "could not commit transaction\n"
@@ -515,13 +486,9 @@ msgstr "αδυναμία αντιγραφής προσωρινού αρχείο
 msgid "could not remove tmpdir %s\n"
 msgstr "αδυναμία διαγραφής προσωρινού καταλόγου %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "αδυναμία ανοίγματος %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "αδυναμία αλλαγής καταλόγου σε %s (%s)\n"
+msgstr "αδυναμία μετάβασης στον κατάλογο %s (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -549,8 +516,48 @@ msgstr "αποτυχία σωστής εκτέλεσης εντολής\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "δεν υπάρχει κρύπτη %s, δημιουργία...\n"
+msgstr "δημιουργία κρύπτης %s...\n"
 
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "αδυναμία δημιουργίας κρύπτης πακέτων, χρήση /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "βρέθηκαν αντιτιθέμενα πακέτα στην λίστα διεκπεραίωσης\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "δεν επιτρέπεται η ταυτόχρονη εγκατάσταση δύο αντιτιθεμένων πακέτων\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "η αντικατάσταση πακέτων με όρισμα -U δεν υποστηρίζεται ακόμη\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "η αντικατάσταση πακέτων μπορεί να γίνει χειροκίνητα με -Rd and -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "ακαθόριστο πρωτόκολλο url, εικάζεται HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "αδυναμία εγγραφής στο '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "δεν υπάρχει τέτοια αποθήκη"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "δεν βρέθηκε αποθήκη'%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "αδυναμία διεκπεραίωσης κατάργησης\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "αδυναμία δημιουργίας διεκπεραίωσης\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "αδυναμία εκκίνησης κατάργησης\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "αδυναμία εκκίνησης διεκπεραίωσης\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "αδυναμία προετοιμασίας κατάργησης\n"

lib/libalpm/po/en_GB.po

@@ -1,16 +1,16 @@
 # English (British) translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
-#
 # Jeff Bailes <thepizzaking@gmail.com>, 2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: 2009-10-04 17:08+0200\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,22 +24,6 @@ msgstr "replacing older version %s-%s by %s in target list\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "skipping %s-%s because newer version %s is in target list\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "conflicting packages were found in target list\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "you cannot install two conflicting packages at the same time\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "replacing packages with -U is not supported yet\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "you can replace packages manually using -Rd and -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -104,6 +88,14 @@ msgstr "could not add entry '%s' in cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "removing invalid database: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "could not open %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "could not remove database directory %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "could not remove database %s\n"
@@ -112,6 +104,10 @@ msgstr "could not remove database %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "invalid name for database entry '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicated database entry '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "corrupted database entry '%s'\n"
@@ -152,14 +148,14 @@ msgstr "error while reading package %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "missing package metadata in %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "attempt to re-register the 'local' DB\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "attempt to re-register the 'local' DB\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependency cycle detected:\n"
@@ -184,29 +180,21 @@ msgstr "provider package was selected (%s provides %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' is invalid\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "URL scheme not specified, assuming HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' is invalid\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "failed retrieving file '%s' from %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "cannot resume download, starting over\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "cannot write to file '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "resuming download of %s not possible; starting over\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -349,8 +337,12 @@ msgid "package filename is not valid"
 msgstr "package filename is not valid"
 
 #, c-format
-msgid "no such repository"
-msgstr "no such repository"
+msgid "package architecture is not valid"
+msgstr "package architecture is not valid"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "could not find repository for target"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -440,10 +432,6 @@ msgstr "ignoring package replacement (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "cannot replace %s by %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repository '%s' not found\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s is up to date -- skipping\n"
@@ -468,26 +456,6 @@ msgstr "removing '%s' from target list because it conflicts with '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "failed to retrieve some files from %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "could not create removal transaction\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "could not create transaction\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "could not initialise the removal transaction\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "could not initialise transaction\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "could not prepare removal transaction\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "could not commit removal transaction\n"
@@ -512,10 +480,6 @@ msgstr "could not copy tempfile to %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "could not remove tmpdir %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "could not open %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
@@ -551,48 +515,3 @@ msgstr "no %s cache exists, creating...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
-
-#~ msgid "error downloading '%s': %s\n"
-#~ msgstr "error downloading '%s': %s\n"
-
-#~ msgid "could not chdir to %s\n"
-#~ msgstr "could not chdir to %s\n"
-
-#~ msgid "running XferCommand: fork failed!\n"
-#~ msgstr "running XferCommand: fork failed!\n"
-
-#~ msgid "could not commit transaction"
-#~ msgstr "could not commit transaction"
-
-#~ msgid "could not download all files"
-#~ msgstr "could not download all files"
-
-#~ msgid "cannot load package data"
-#~ msgstr "cannot load package data"
-
-#~ msgid "package not installed or lesser version"
-#~ msgstr "package not installed or lesser version"
-
-#~ msgid "group not found"
-#~ msgstr "group not found"
-
-#~ msgid "user aborted the operation"
-#~ msgstr "user aborted the operation"
-
-#~ msgid "internal error"
-#~ msgstr "internal error"
-
-#~ msgid "not confirmed"
-#~ msgstr "not confirmed"
-
-#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-#~ msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-
-#~ msgid "command: %s\n"
-#~ msgstr "command: %s\n"
-
-#~ msgid "could not prepare transaction\n"
-#~ msgstr "could not prepare transaction\n"
-
-#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-#~ msgstr "No /bin/sh in parent environment, aborting scriptlet\n"

lib/libalpm/po/es.po

@@ -1,13 +1,15 @@
 # Juan Pablo González Tognarelli <jotapesan@gmail.com>, 2008, 2009.
 # Juan Pablo González Tognarelli <juan.gonzalez.tognarelli@gmail.com>, 2009.
+# Juan Pablo Gonzalez <jotapesan@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:08+0200\n"
-"Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-13 10:49-0400\n"
+"Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
 "Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,25 +31,6 @@ msgstr ""
 "saltando %s-%s debido a la nueva versión de %s esta en la lista de "
 "objetivos\n"
 
-# , c-format
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"usted no puede instalar simultáneamente dos paquetes que poseen conflictos "
-"entre si\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "reemplazar paquetes con -U aún no esta soportado\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -113,6 +96,14 @@ msgstr "no se pudo agregar '%s' en la cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "quitando la base de datos inválida: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "no se pudo abrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "no se pudo quitar el directorio de la base de datos %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "no se pudo quitar la base de datos %s\n"
@@ -121,6 +112,10 @@ msgstr "no se pudo quitar la base de datos %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nombre invalido para la entrada de la base de datos '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada duplicada en la base de datos '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "entrada corrupta en la base de datos '%s'\n"
@@ -132,14 +127,14 @@ msgstr "no se pudo abrir el archivo %s: %s\n"
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
 msgstr ""
-"la base de datos %s es inconsistente: nombre mal emparejado en el paquete %"
-"s\n"
+"la base de datos %s es inconsistente: nombre mal emparejado en el paquete "
+"%s\n"
 
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
-"la base de datos %s es inconsistente: versión mal emparejada en el paquete %"
-"s\n"
+"la base de datos %s es inconsistente: versión mal emparejada en el paquete "
+"%s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -165,14 +160,14 @@ msgstr "error mientras se leía el paquete %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "faltan los metadatos del paquete en %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "intento para re-registrar la base de datos 'local'\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "la ruta para la base de datos no está definida\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "intento para re-registrar la base de datos 'local'\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "ciclo de dependencias detectado:\n"
@@ -197,29 +192,21 @@ msgstr "El paquete proveedor fue seleccionado (%s provee %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "la url %s no es válida\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "no fue especificado el esquema de url, asumiendo HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disco"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "la url %s no es válida\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "falló al obtener archivo '%s' desde %s: %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "no se puede resumir la descarga, empezando de nuevo\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "no se puede escribir en el archivo '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "no es posible continuar la descarga de %s; empezando de nuevo\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -363,8 +350,12 @@ msgid "package filename is not valid"
 msgstr "el nombre de archivo del paquete no es válido"
 
 #, c-format
-msgid "no such repository"
-msgstr "no existe el repositorio"
+msgid "package architecture is not valid"
+msgstr "no es válida la arquitectura del paquete"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "no pudo encontrarse un repositorio para el objetivo"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -455,10 +446,6 @@ msgstr "ignorando el reemplazo del paquete (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "no se pudo reemplazar el archivo %s por %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositorio '%s' no encontrado\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s esta al día -- saltando\n"
@@ -478,33 +465,13 @@ msgstr "se han detectado paquetes con conflictos no resueltos\n"
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
 msgstr ""
-"quitando '%s' de la lista de objetivos debido a que posee conflictos con '%"
-"s'\n"
+"quitando '%s' de la lista de objetivos debido a que posee conflictos con "
+"'%s'\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "falló al descargar algunos archivos desde %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "no se pudo crear la operación de eliminación\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "no se pudo crear la operación\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "no se pudo iniciar la operación de eliminación\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "no se pudo iniciar la operación\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "no se pudo preparar la operación de eliminación\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "no se pudo enviar la operación de eliminación\n"
@@ -529,10 +496,6 @@ msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "no se pudo eliminar el directorio temporal %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "no se pudo abrir %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "no se pudo cambiar el directorio a %s (%s)\n"
@@ -569,3 +532,45 @@ msgstr "no existe la cache %s, creando...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
+
+# , c-format
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "se encontraron paquetes con conflictos en la lista de objetivos\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "usted no puede instalar simultáneamente dos paquetes que poseen "
+#~ "conflictos entre si\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "reemplazar paquetes con -U aún no esta soportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "no fue especificado el esquema de url, asumiendo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "no se puede escribir en el archivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "no existe el repositorio"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositorio '%s' no encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "no se pudo crear la operación de eliminación\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "no se pudo crear la operación\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "no se pudo iniciar la operación de eliminación\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "no se pudo iniciar la operación\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "no se pudo preparar la operación de eliminación\n"

lib/libalpm/po/fr.po

@@ -1,14 +1,15 @@
 # French translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:08+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-06 20:26+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,23 +27,6 @@ msgstr ""
 "ignore le paquet %s-%s car une version plus récente %s est dans la liste des "
 "cibles\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "des paquets en conflit ont été trouvés dans la liste des cibles\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "remplacer un paquet avec -U n'est pas encore possible\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-"vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -108,6 +92,14 @@ msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 msgid "removing invalid database: %s\n"
 msgstr "suppression d'une base de données invalide: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "l'ouverture de %s: %s a échoué\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "la suppression de la base de données %s a échoué\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "la suppression de la base de données %s a échoué\n"
@@ -116,6 +108,10 @@ msgstr "la suppression de la base de données %s a échoué\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nom invalide pour l'entrée de base de données '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "l'entrée '%s' de la base de données est dupliquée\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "l'entrée '%s' de la base de données est corrompue\n"
@@ -156,14 +152,14 @@ msgstr "erreur lors de la lecture du paquet %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "méta-données du paquet manquantes dans %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentative de ré-enregistrer la base de données locale\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "base de données non initialisée\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentative de ré-enregistrer la base de données locale\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "cycle de dépendances détecté:\n"
@@ -188,29 +184,21 @@ msgstr "Une provision a été sélectionnée (%s fournit %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' est invalide\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
-
 #, c-format
 msgid "disk"
 msgstr "disque"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' est invalide\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "le téléchargement ne peut pas être repris, relance\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "écriture dans le fichier '%s' impossible\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "le téléchargement de %s ne peut pas être continué, reprise au début\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -332,7 +320,7 @@ msgstr ""
 
 #, c-format
 msgid "could not find or read package"
-msgstr "trouver ou de lire le paquet a échoué"
+msgstr "impossible de trouver ou de lire le paquet"
 
 #, c-format
 msgid "operation cancelled due to ignorepkg"
@@ -355,8 +343,12 @@ msgid "package filename is not valid"
 msgstr "nom de paquet invalide"
 
 #, c-format
-msgid "no such repository"
-msgstr "ce dépôt n'existe pas"
+msgid "package architecture is not valid"
+msgstr "architecture invalide"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "impossible de trouver le dépôt pour la cible"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -446,10 +438,6 @@ msgstr "ignore le remplacement du paquet (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "le remplacement de %s par %s est impossible\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "dépôt '%s' non trouvé\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s est à jour -- ignoré\n"
@@ -474,26 +462,6 @@ msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "échec de récupération de certains fichiers depuis %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "la création de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "la création de la transaction a échoué\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "l'initialisation de la transaction de suppression a échoué\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "l'initialisation de la transaction a échoué\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "la préparation de la transaction de suppression a échoué\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "appliquer la transaction de suppression a échoué\n"
@@ -518,10 +486,6 @@ msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "la suppression du répertoire temporaire %s a échoué\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "l'ouverture de %s: %s a échoué\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "changer de répertoire vers %s a échoué (%s)\n"

lib/libalpm/po/hu.po

@@ -1,5 +1,5 @@
 # Hungarian translations for libalpm package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Miklos Vajna <vmiklos@frugalware.org>, 2006.
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: 2009-10-04 17:08+0200\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,6 @@ msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a célok listájába
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "%s-%s kihagyása, mert újabb verzió (%s) van a célok között\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "ütköző csomagokat találtam a célok között\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nem telepíthető két ütköző csomag egyszerre\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "csomagok lecserélése még nem támogatott -U esetén\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "a -Rd és -U használatával elvégezhető a csere\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -105,6 +90,14 @@ msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 msgid "removing invalid database: %s\n"
 msgstr "hibás adatbázis eltávolítása: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nem sikerült eltávolítani a(z) %s adatbázis-könyvtárat\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
@@ -113,9 +106,13 @@ msgstr "sikertelen a(z) %s adatbázis eltávolítása\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "hibás név a '%s' adatbázis-bejegyzés számára\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplikált adatbázis-bejegyzés: '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "sérült adatbázis bejegyzés: '%s'\n"
+msgstr "sérült adatbázis-bejegyzés: '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -153,14 +150,14 @@ msgstr "hiba a(z) %s csomag olvasása közben: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "hiányzó csomaginformációs fájl itt: %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "az adatbázis-útvonal nincs megadva\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "körkörös függőséget észleltem:\n"
@@ -185,29 +182,21 @@ msgstr "közvetett csomagválasztás (%s szolgáltatja %s-t)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "a '%s' URL hibás\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "az URL séma nem definiált, http feltételezése\n"
-
 #, c-format
 msgid "disk"
 msgstr "diszk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "a '%s' URL hibás\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nem tudom folytatni a letöltést, újrakezdem\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nem sikerült a(z) '%s' fájlba írni\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nem tudom folytatni a(z) %s letöltését; újrakezdem\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -350,8 +339,12 @@ msgid "package filename is not valid"
 msgstr "érvénytelen csomagnév"
 
 #, c-format
-msgid "no such repository"
-msgstr "nincs ilyen repó"
+msgid "package architecture is not valid"
+msgstr "érvénytelen csomag-architektúra"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "nem található repó a célcsomaghoz"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -441,10 +434,6 @@ msgstr "csomag-lecserélés kihagyása (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "nem lehet lecserélni a(z) %s csomagot a(z) %s csomaggal\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "a(z) '%s' repó nem található\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "a(z) %s-%s naprakész -- kihagyás\n"
@@ -469,26 +458,6 @@ msgstr "'%s' kihagyása, mert ütközik a következővel: '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "nem sikerült néhány fájlt letölteni innen: %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nem sikerült létrehozni a tranzakciót\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nem sikerült inicializálni a tranzakciót\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nem sikerült végrehajtani az eltávolító tranzakciót\n"
@@ -513,10 +482,6 @@ msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"

lib/libalpm/po/it.po

@@ -1,19 +1,20 @@
 # Italian translation of libalpm.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
-# Giovanni 'voidnull' Scafora <giovanni@archlinux.org>, 2007, 2008, 2009
+# Giovanni 'voidnull' Scafora <giovanni@archlinux.org>, 2007, 2008, 2009, 2010
 # Andrea 'bash' Scarpino <bash.lnx@gmail.com>, 2008
 # Alessio 'mOLOk' Bolognino <themolok@gmail.com>, 2007
 # Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Project-Id-Version: Pacman package manager 3.4.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:08+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 18:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,25 +29,6 @@ msgstr ""
 "ignoro %s-%s perché la nuova versione %s è presente nella lista dei "
 "pacchetti\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr ""
-"ci sono dei pacchetti in conflitto all'interno della lista dei pacchetti\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"non puoi installare contemporaneamente due pacchetti che vanno in conflitto\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr ""
-"la sostituzione dei pacchetti con l'opzione -U non è ancora supportata\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "puoi sostituire i pacchetti manualmente, usando le opzioni -Rd e -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -111,6 +93,14 @@ msgstr "impossible includere la voce '%s' nella cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "rimozione del database: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "impossibile aprire %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "impossibile rimuovere la directory %s del database\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "impossibile rimuovere il database %s\n"
@@ -119,6 +109,10 @@ msgstr "impossibile rimuovere il database %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome non valido per la voce del database '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "la voce nel database '%s' è duplicata\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "la voce nel database '%s' è corrotta\n"
@@ -162,14 +156,14 @@ msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "manca il metadata del pacchetto in %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "il percorso del database non è stato definito\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "tentativo in corso di registrare di nuovo il DB 'locale'\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "individuato un possibile ciclo di dipendenze:\n"
@@ -194,29 +188,21 @@ msgstr "il pacchetto è già stato selezionato (%s dipende da %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "l'url '%s' non è esatto\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "il protocollo dell'url non è stato specificato, sarà usato HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disco"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "l'url '%s' non è esatto\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "impossibile scaricare il pacchetto '%s' da %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "impossibile riprendere il download\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "impossibile scrivere nel file '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "impossibile riprendere il download di %s\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -359,8 +345,12 @@ msgid "package filename is not valid"
 msgstr "il nome del pacchetto non è valido"
 
 #, c-format
-msgid "no such repository"
-msgstr "nessun repository corrispondente"
+msgid "package architecture is not valid"
+msgstr "l'architettura del pacchetto non è valida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "impossibile trovare un repository contenente questo pacchetto"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -451,10 +441,6 @@ msgstr "sto ignorando la sostituzione del pacchetto (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "impossibile sostituire %s con %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "impossibile trovare il repository '%s'\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s è aggiornato, sarà ignorato\n"
@@ -466,8 +452,8 @@ msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
 msgstr ""
-"installazione in corso di una versione meno recente del pacchetto %s (%s => %"
-"s)\n"
+"installazione in corso di una versione meno recente del pacchetto %s (%s => "
+"%s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
@@ -482,26 +468,6 @@ msgstr ""
 msgid "failed to retrieve some files from %s\n"
 msgstr "impossibile scaricare alcuni file da %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "impossibile eseguire l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "impossibile eseguire l'operazione\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "impossibile inizializzare l'operazione di rimozione\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "impossibile inizializzare l'operazione\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "impossibile preparare l'operazione di rimozione\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "impossibile eseguire l'operazione di rimozione\n"
@@ -526,10 +492,6 @@ msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "impossibile rimuovere la directory temporanea %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "impossibile aprire %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"

lib/libalpm/po/kk.po

@@ -1,5 +1,5 @@
 # Kazakh translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com> 2009
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:09+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-07 09:22+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "%s-%s өткізіледі, өйткені жаңа %s нұсқасы мақсаттар тізімінде бар болып тұр\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "сіз екі екі ерегісетін дестені орната алмайсыз\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "дестелерді -A мен -U опцияларын қолданып алмастыру әлі жасалмаған\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-"сіз дестелерді қолмен алмастыра аласыз, ол үшін -Rd мен -U қолданыңыз\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -68,7 +52,7 @@ msgstr "%s атын жаңа %s атына ауыстыру мүмкін еме
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s қазір %s деп сақталды\n"
+msgstr "%s қазір %s етіп сақталды\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
@@ -106,6 +90,14 @@ msgstr "кэш ішіне '%s' жазбасын қосу мүмкін емес\n
 msgid "removing invalid database: %s\n"
 msgstr "қате дерекқорды өшіру: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "%s ашу мүмкін емес: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "дерекқор %s бумасын өшіру мүмкін емес\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "%s дерекқорын өшіру мүмкін емес\n"
@@ -114,6 +106,10 @@ msgstr "%s дерекқорын өшіру мүмкін емес\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "дерекқордағы '%s' жазбасының аты қате\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "деркқордағы '%s' жазбасы қайталанып тұр\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "дерекқордағы '%s' жазбасы зақымдалған\n"
@@ -154,14 +150,14 @@ msgstr "%s дестесін оқу қатесі: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "%s ішінде дестенің мета мәліметтері жоқ\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "дерекқорды қайта тіркеу талабы\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "дерекқорға жол анықталмаған\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "дерекқорды қайта тіркеу талабы\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "циклдік тәуелділік табылды:\n"
@@ -186,29 +182,21 @@ msgstr "тандалған %s дестесі %s ұсынады\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "\"%s\" шешу мүмкін емес, ол \"%s\" тәуелділігі болып тұр\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "'%s' сілтемесі қате\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "сілтеменің түрі анықталмады, HTTP деп саналады\n"
-
 #, c-format
 msgid "disk"
 msgstr "дискі"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "'%s' сілтемесі қате\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "'%s' файлын  %s адресінен алу қатемен аяқталды : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "жүктемені жалғастыру мүмкін емес, басынан басталады\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "'%s' файлына жазу мүмкін емес\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "%s жүктемесін жалғастыру мүмкін емес; басынан басталады\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -220,7 +208,7 @@ msgstr "'%s' файлын  %s адресінен алу қатемен аяқт
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "%s қысқартылады: %jd/%jd байт\n"
+msgstr "%s қысқартылған сияқты: %jd/%jd байт\n"
 
 #, c-format
 msgid "failed to download %s\n"
@@ -252,11 +240,11 @@ msgstr "аргумент қате не нөлдік болып тұр"
 
 #, c-format
 msgid "library not initialized"
-msgstr "library іске қосылмады"
+msgstr "жинақ іске қосылмады"
 
 #, c-format
 msgid "library already initialized"
-msgstr "library іске қосылған болып тұр"
+msgstr "жинақ іске қосылған болып тұр"
 
 #, c-format
 msgid "unable to lock database"
@@ -268,7 +256,7 @@ msgstr "дерекқорды ашу мүмкін емес"
 
 #, c-format
 msgid "could not create database"
-msgstr "дерекқорды құру мүмкін емес"
+msgstr "дерекқорды жасау мүмкін емес"
 
 #, c-format
 msgid "database not initialized"
@@ -351,8 +339,12 @@ msgid "package filename is not valid"
 msgstr "десте файлдың аты қате"
 
 #, c-format
-msgid "no such repository"
-msgstr "мұндай репозиторий жоқ"
+msgid "package architecture is not valid"
+msgstr "десте файлдың архитектурасы қате"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "көрсетілген мақсат үшін репозиторийді табу мүмкін емес"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -404,7 +396,7 @@ msgstr "дерекқор ішінде %s табылмады --  өткізіп
 
 #, c-format
 msgid "removing %s from target list\n"
-msgstr "мақсаттар тізімінен '%s' өшіріру\n"
+msgstr "мақсаттар тізімінен '%s' өшіру\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
@@ -442,10 +434,6 @@ msgstr "дестені алмастыруды елемеу (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "%s жаңа %s нұсқасымен алмастыру мүмкін емес\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "'%s' репозиторийі табылмады\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ескірмеді --  өткізіледі\n"
@@ -460,7 +448,7 @@ msgstr "дестенің нұсқасын төмендету %s (%s => %s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "шешілмейтін дестелер ерегісі табылды\n"
+msgstr "дестелердің шешілмейтін ерегісі табылды\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
@@ -471,26 +459,6 @@ msgstr ""
 msgid "failed to retrieve some files from %s\n"
 msgstr "%s адресінен кейбір файлдарды алу мүмкін емес\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "өшіруге сұранымды құру мүмкін емес\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "сұранымды жасау мүмкін емес\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "өшіруге сұранымды іске қосу мүмкін емес\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "сұранымды іске қосу мүмкін емес\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "өшіруге сұранымды дайындау мүмкін емес\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "өшіруге сұранымды орындау мүмкін емес\n"
@@ -513,11 +481,7 @@ msgstr "уақытша файлды %s ішіне көшіру мүмкін ем
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "tmpdir %s өшіру мүмкін емес\n"
-
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "%s ашу мүмкін емес: %s\n"
+msgstr "%s уақытша бумасын өшіру мүмкін емес\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
@@ -525,7 +489,7 @@ msgstr "%s бумасына ауысу мүмкін емес (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "жаңа үрдісті құру мүмкін емес (%s)\n"
+msgstr "жаңа үрдісті жасау мүмкін емес (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"
@@ -555,6 +519,46 @@ msgstr "%s кэші жоқ болып тұр, құрылады...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "дестелер кэшін құру мүмкін емес, оның орнына /tmp қолданылады\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "мақсаттар тізімінде ерегісетін дестелер табылды\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "сіз екі екі ерегісетін дестені орната алмайсыз\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "дестелерді -A мен -U опцияларын қолданып алмастыру әлі жасалмаған\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "сіз дестелерді қолмен алмастыра аласыз, ол үшін -Rd мен -U қолданыңыз\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "сілтеменің түрі анықталмады, HTTP деп саналады\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "'%s' файлына жазу мүмкін емес\n"
+
+#~ msgid "no such repository"
+#~ msgstr "мұндай репозиторий жоқ"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "'%s' репозиторийі табылмады\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "өшіруге сұранымды құру мүмкін емес\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "сұранымды жасау мүмкін емес\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "өшіруге сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "сұранымды іске қосу мүмкін емес\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "өшіруге сұранымды дайындау мүмкін емес\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "'%s' жүктеп алу қатесі: %s\n"
 

lib/libalpm/po/libalpm.pot

@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,22 +25,6 @@ msgstr ""
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr ""
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr ""
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -102,6 +87,14 @@ msgstr ""
 msgid "removing invalid database: %s\n"
 msgstr ""
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr ""
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr ""
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr ""
@@ -110,6 +103,10 @@ msgstr ""
 msgid "invalid name for database entry '%s'\n"
 msgstr ""
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr ""
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr ""
@@ -151,11 +148,11 @@ msgid "missing package metadata in %s\n"
 msgstr ""
 
 #, c-format
-msgid "attempt to re-register the 'local' DB\n"
+msgid "database path is undefined\n"
 msgstr ""
 
 #, c-format
-msgid "database path is undefined\n"
+msgid "attempt to re-register the 'local' DB\n"
 msgstr ""
 
 #, c-format
@@ -182,28 +179,20 @@ msgstr ""
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr ""
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr ""
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr ""
-
 #, c-format
 msgid "disk"
 msgstr ""
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr ""
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr ""
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr ""
-
-#, c-format
-msgid "cannot write to file '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
 msgstr ""
 
 #, c-format
@@ -347,7 +336,11 @@ msgid "package filename is not valid"
 msgstr ""
 
 #, c-format
-msgid "no such repository"
+msgid "package architecture is not valid"
+msgstr ""
+
+#, c-format
+msgid "could not find repository for target"
 msgstr ""
 
 #, c-format
@@ -438,10 +431,6 @@ msgstr ""
 msgid "cannot replace %s by %s\n"
 msgstr ""
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr ""
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr ""
@@ -466,26 +455,6 @@ msgstr ""
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr ""
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr ""
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr ""
@@ -510,10 +479,6 @@ msgstr ""
 msgid "could not remove tmpdir %s\n"
 msgstr ""
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr ""
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr ""

lib/libalpm/po/nb.po

@@ -1,5 +1,5 @@
 # Language libalpm translations for PACKAGE package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 #  <maister@archlinux.us>, 2009.
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: 2009-10-04 17:09+0200\n"
 "Last-Translator:  <maister@archlinux.us>\n"
 "Language-Team: Language libalpm\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,22 +24,6 @@ msgstr "bytter ut eldre versjon %s-%s med %s i liste\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "hopper over %s-%s siden nyere versjon %s finnes i liste\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "motstridige pakker ble funnet i målliste\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "du kan ikke installere to motstridige pakker samtidig\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "å bytte ut pakker med -U er ikke støttet enda\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "du kan bytte ut pakker manuelt ved å bruke -Rd og -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -103,6 +88,14 @@ msgstr "kunne ikke legge til '%s' i cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "fjerner ugyldig database: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "kunne ikke åpne %s: %s\n"
+
+#, fuzzy, c-format
+msgid "could not remove database directory %s\n"
+msgstr "kunne ikke fjerne databaseelement %s-%s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "kunne ikke fjerne database %s\n"
@@ -111,6 +104,10 @@ msgstr "kunne ikke fjerne database %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "ugyldig navn for databaseelement '%s'\n"
 
+#, fuzzy, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "korrupt databaseelement '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "korrupt databaseelement '%s'\n"
@@ -151,14 +148,14 @@ msgstr "feil oppstod under lesing av pakke: %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "mangler metadata i %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "forsøker å re-registrere den lokale databasen\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "databaseplassering er udefinert\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "forsøker å re-registrere den lokale databasen\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "avhengighetssyklus oppdaget\n"
@@ -183,30 +180,22 @@ msgstr "tilføringspakke ble valgt (%s tilfører %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' er ugyldig\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url-protokoll ikke gitt, bruker HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' er ugyldig\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "mottakelse av fil '%s' fra %s : %s feilet\n"
 
-#, c-format
-msgid "cannot resume download, starting over\n"
+#, fuzzy, c-format
+msgid "resuming download of %s not possible; starting over\n"
 msgstr "kan ikke fortsette nedlasting, starter på nytt\n"
 
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "kan ikke skrive til fil '%s'\n"
-
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "skriving til fil '%s': %s feilet\n"
@@ -347,9 +336,13 @@ msgstr "kan ikke fjerne alle filer for pakke"
 msgid "package filename is not valid"
 msgstr "pakkens filnavn er ikke gyldig"
 
-#, c-format
-msgid "no such repository"
-msgstr "ingen slik pakkebrønn"
+#, fuzzy, c-format
+msgid "package architecture is not valid"
+msgstr "pakkens filnavn er ikke gyldig"
+
+#, fuzzy, c-format
+msgid "could not find repository for target"
+msgstr "kunne ikke finne eller lese pakke"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -439,10 +432,6 @@ msgstr "ignorerer utbytting av pakke (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "kan ikke bytte ut %s med %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "pakkebrønn '%s' ikke funnet\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s er allerede oppdatert -- hopper over\n"
@@ -467,26 +456,6 @@ msgstr "fjerner '%s' fra mållisten fordi den strider mot '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "feilet å motta noen filer fra %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kunne ikke opprette fjerningstransaksjon\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "kunne ikke opprette transaksjon\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kunne ikke initialisere fjerningstransaksjonen\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "kunne ikke initialisere transaksjon\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kunne ikke forberede fjerningstransaksjon\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "kunne ikke begå fjerningstransaksjon\n"
@@ -511,10 +480,6 @@ msgstr "kunne ikke kopiere midertidig fil til %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "kunne ikke fjerne midlertidig mappe %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "kunne ikke åpne %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunne ikke endre mappe til %s (%s)\n"
@@ -550,3 +515,42 @@ msgstr "ingen %s cache eksisterer, lager en ...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "kunne ikke danne pakke-cache, bruker /tmp istedenfor\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "motstridige pakker ble funnet i målliste\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "du kan ikke installere to motstridige pakker samtidig\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "å bytte ut pakker med -U er ikke støttet enda\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "du kan bytte ut pakker manuelt ved å bruke -Rd og -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url-protokoll ikke gitt, bruker HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "kan ikke skrive til fil '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "ingen slik pakkebrønn"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "pakkebrønn '%s' ikke funnet\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kunne ikke opprette fjerningstransaksjon\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "kunne ikke opprette transaksjon\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kunne ikke initialisere fjerningstransaksjonen\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "kunne ikke initialisere transaksjon\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kunne ikke forberede fjerningstransaksjon\n"

lib/libalpm/po/pl.po

@@ -1,6 +1,6 @@
 # Polish translations for Pacman package manager package
 # Polskie tłumaczenia dla pakietu Pacman package manager.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
 # Mateusz Herych <heniekk@gmail.com>, 2008-2009.
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:09+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-08-01 05:10+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,25 +28,6 @@ msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "pomijam %s-%s ponieważ nowsza wersja %s jest na liście celów\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "konfliktujące pakiety zostały znalezione na liście celów\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w tym "
-"samym czasie\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"
-
-# hmm
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -110,6 +92,14 @@ msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n"
 msgid "removing invalid database: %s\n"
 msgstr "usuwanie niepoprawnej bazy danych: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nie udało się otworzyć %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nie udało się usunąć katalogu bazy danych %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "nie można usunąć bazy danych %s\n"
@@ -118,6 +108,10 @@ msgstr "nie można usunąć bazy danych %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "zduplikowany wpis '%s' w bazie danych\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "zepsuty wpis w bazie danych '%s'\n"
@@ -158,14 +152,14 @@ msgstr "błąd odczytywania pakietu: %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "brak metadanych pakietu w %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "ścieżka bazy danych jest niezdefiniowana\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "wykryto cykl zależności:\n"
@@ -190,29 +184,21 @@ msgstr "dostawca pakietu został wybrany (%s dostarcza %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' jest błędny\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schemat url nie został sprecyzowany, wybieranie HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "dysk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' jest błędny\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nie można zapisywać do pliku '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "kontynuowanie pobieranie %s jest niemożliwe; zaczynam od nowa\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -355,8 +341,12 @@ msgid "package filename is not valid"
 msgstr "nazwa pakietu jest nieprawidłowa"
 
 #, c-format
-msgid "no such repository"
-msgstr "nie ma takiego repozytorium"
+msgid "package architecture is not valid"
+msgstr "architektura pakietu jest nieprawidłowa"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "nie mogę znaleźć repozytorium dla celu"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -447,10 +437,6 @@ msgstr "ignorowanie zastępowania pakietu (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "nie udało się zastąpić %s przez %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repozytorium '%s' nie zostało znalezione\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
@@ -475,26 +461,6 @@ msgstr "usuwanie '%s' z listy celów ponieważ konfliktuje z '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "nie udało się pobrać niektórych plików z %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nie udało się utworzyć tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nie udało się stworzyć tranzakcji\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nie udało się zainicjować tranzakcji usuwania\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nie udało się zainicjować tranzakcji\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nie udało się przygotować tranzakcji usuwania\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nie udało się wykonać tranzakcji usuwania\n"
@@ -519,10 +485,6 @@ msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nie udało się otworzyć %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nie udało się zmienić katalogu na %s (%s)\n"
@@ -560,48 +522,13 @@ msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
 
-#~ msgid "error downloading '%s': %s\n"
-#~ msgstr "błąd podczas pobierania '%s': %s\n"
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "konfliktujące pakiety zostały znalezione na liście celów\n"
 
-#~ msgid "could not chdir to %s\n"
-#~ msgstr "nie udało się zmienić katalogu na / %s\n"
-
-#~ msgid "running XferCommand: fork failed!\n"
-#~ msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
-
-#~ msgid "could not commit transaction"
-#~ msgstr "nie udało się wykonać tranzakcji"
-
-#~ msgid "could not download all files"
-#~ msgstr "nie udało się pobrać wszystkich plików"
-
-#~ msgid "cannot load package data"
-#~ msgstr "nie udało się załadować danych pakietu"
-
-#~ msgid "package not installed or lesser version"
-#~ msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
-
-#~ msgid "group not found"
-#~ msgstr "grupa nie została odnaleziona"
-
-#~ msgid "user aborted the operation"
-#~ msgstr "użytkownik zaniechał operacji"
-
-#~ msgid "internal error"
-#~ msgstr "błąd wewnętrzny"
-
-#~ msgid "not confirmed"
-#~ msgstr "nie potwierdzono"
-
-#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgid "you cannot install two conflicting packages at the same time\n"
 #~ msgstr ""
-#~ "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
+#~ "nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w "
+#~ "tym samym czasie\n"
 
-#~ msgid "command: %s\n"
-#~ msgstr "komenda: %s\n"
-
-#~ msgid "could not prepare transaction\n"
-#~ msgstr "nie udało się przygotować tranzakcji\n"
-
-#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-#~ msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"

lib/libalpm/po/pt.po

@@ -0,0 +1,615 @@
+# translation of pt_PT.po to European Portuguese
+# European Portuguese translations for Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Gaspar Santos aka ArchGalileu <omeuviolino@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-08-31 18:25+0100\n"
+"Last-Translator: \n"
+"Language-Team: Gaspar Santos aka ArchGalileu <omeuviolino@gmail.com>\n"
+"Language: pt_PT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.1\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"a substituir a versão antiga %s-%s por %s na lista de pacotes para "
+"actualizar\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"a ignorar %s-%s por que uma versão mais nova %s está na lista de pacotes "
+"para actualizar\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"permissões do diretório diferem em %s\n"
+"sistema de ficheiros: %o  pacote: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "extracção: não sobrescrever diretório com o ficheiro %s\n"
+
+# ?
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extracção: symlink %s não aponta para diretório\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "não foi possível extrair %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "não foi possível renomear %s para %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s salvo como %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "não foi possível instalar %s como %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s instalado como %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "a extrair %s como %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "não foi possível obter o diretório de trabalho actual\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "ocorreram erros durante a actualização de %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "ocorreram erros durante a instalação de %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "não foi possível actualizar a entrada na base de dados %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "não foi possível adicionar a entrada '%s' à cache\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "a remover banco de dados inválido: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "não foi possível abrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "não foi possível remover o diretório da base de dados %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "não foi possível remover a base de dados %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "nome inválido para a entrada na base de dados '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada da base de dados duplicada '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "entrada da base de dados corrompida '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "não foi possível abrir o ficheiro %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "%s base de dados está inconsistente: nome no pacote %s não coincide\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+"%s base de dados está inconsistente: versão do pacote %s não coincide\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "não foi possível criar o diretório %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "não foi possível interpretar o ficheiro de descrição do pacote em %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "em falta o nome do pacote em %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "em falta a versão do pacote em %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "erro ao ler o pacote %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "em falta metadados do pacote em %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "localização da base de dados não definida\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "nova tentativa de registrar a base de dados 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "dependência cíclica detectada:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s será removido após a dependência %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s será instalado antes da dependência %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "a ignorar pacote %s-%s\n"
+
+# ?
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "foi selecionado o pacote que fornece (%s fornece %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disco"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' é inválida\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "falha ao obter ficheiro '%s' de %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "não foi possível retomar a descarga de %s; a reiniciar a descarga\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "erro ao escrever no ficheiro '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "falha ao obter o ficheiro '%s' de %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s parece estar quebrado: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "falha ao fazer a descarga de %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "memória cheia!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "erro inesperado do sistema"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "privilégios insuficientes"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "não foi possível encontrar ou ler o ficheiro"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "não foi possível encontrar ou ler o diretório"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "argumento comunicado está errado ou NULO"
+
+#, c-format
+msgid "library not initialized"
+msgstr "biblioteca não inicializada"
+
+#, c-format
+msgid "library already initialized"
+msgstr "biblioteca já inicializada"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "não foi possível bloquear a base de dados"
+
+#, c-format
+msgid "could not open database"
+msgstr "não foi possível abrir a base de dados"
+
+#, c-format
+msgid "could not create database"
+msgstr "não foi possível criar a base de dados"
+
+#, c-format
+msgid "database not initialized"
+msgstr "base de dados não inicializada"
+
+#, c-format
+msgid "database already registered"
+msgstr "base de dados já registrada"
+
+#, c-format
+msgid "could not find database"
+msgstr "não foi possível encontrar a base de dados"
+
+#, c-format
+msgid "could not update database"
+msgstr "não foi possível actualizar a base de dados"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "não foi possível remover a entrada da base de dados"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "url inválida para o servidor"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "nenhum servidor configurado para o repositório"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "operação já inicializada"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "operação não inicializada"
+
+#, c-format
+msgid "duplicate target"
+msgstr "objecto alvo duplicado"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "operação não está pronta"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "operação abortada"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "actividade não compatível com o tipo de operação"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "tentativa de aceitar a operação com a base de dados não bloqueada"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "não foi possível ler ou escrever o pacote"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operação cancelada devido a ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "pacote inválido ou corrompido"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "não foi possível abrir o ficheiro do pacote"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "não foi possível remover todos os ficheiros do pacote"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "o nome do pacote não é válido"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "a arquitectura do pacote não é válida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "não foi possível encontrar o repositório para o pacote"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "delta inválido ou corrompido"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "patch do delta falhou"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "não foi possível cumprir as dependências"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "dependências em conflito"
+
+#, c-format
+msgid "conflicting files"
+msgstr "ficheiros em conflito"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "falha ao descarregar alguns ficheiros"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "expressão regular inválida"
+
+#, c-format
+msgid "libarchive error"
+msgstr "erro na libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "erro na biblioteca de descargas"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "erro ao invocar o programa de descargas externo"
+
+#, c-format
+msgid "unexpected error"
+msgstr "erro inesperado"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "não foi possível encontrar %s na base de dados - a ignorar\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "a remover \"%s\" da lista de pacotes a serem actualizados\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "não foi possível remover o ficheiro '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "não foi possível remover a entrada da base de dados %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "não foi possível remover a entrada '%s' da cache\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: a ignorar actualização do pacote (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: a ignorar downgrade do pacote (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: a voltar da versão %s para a versão %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) é mais recente que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "a ignorar substituição do pacote (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "não foi possível substituir %s por %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s está actualizado -- a ignorar\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s está actualizado -- a reinstalar\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "a fazer downgrade do pacote %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "detectado conflito entre pacotes sem solução\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "a remover '%s' da lista de pacotes porque entra em conflito com '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "falha ao obter alguns ficheiros de %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "não foi possível efectuar a operação de remoção\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "não foi possível efectuar a operação\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "não foi possível remover o ficheiro bloqueado %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "não foi possível criar diretório temporário\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "não foi possível copiar ficheiro temporário para %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "não foi possível remover o diretório temporário %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "não foi possível mudar o diretório para %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "não foi possível fazer fork de um novo processo (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "não foi possível mudar o diretório raiz (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "não foi possível mudar o diretório para / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "chamada para popen falhou (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "chamada para waitpid falhou (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "comando não executado corretamente\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "cache %s não existe, a criar...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+"não foi possível criar cache de pacotes, a usar /tmp como alternativa\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr ""
+#~ "pacotes conflitantes foram encontrados na lista de pacotes a serem "
+#~ "atualizados\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "substituir pacotes com -U ainda não é suportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "esquema da url não especificado, assumindo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "não foi possível escrever no arquivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "repositório não existe"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositório '%s' não encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "não foi possível criar transação de remoção\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "não foi possível criar a transação\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "não foi possível inicializar a transação de remoção\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "não foi possível inicializar a transação\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "não foi possível preparar a transação de remoção\n"
+
+#~ msgid "error downloading '%s': %s\n"
+#~ msgstr "erro no download de '%s': %s\n"
+
+#~ msgid "could not chdir to %s\n"
+#~ msgstr "não foi possível mudar para o diretório %s\n"
+
+#~ msgid "running XferCommand: fork failed!\n"
+#~ msgstr "rodando XferCommand: fork falhou!\n"
+
+#~ msgid "could not commit transaction"
+#~ msgstr "não foi possível realizar transação"
+
+#~ msgid "could not download all files"
+#~ msgstr "não foi possível fazer o download de todos os arquivos"
+
+#~ msgid "cannot load package data"
+#~ msgstr "não foi possível carregar dados do pacote"
+
+#~ msgid "package not installed or lesser version"
+#~ msgstr "pacote não instalado ou versão inferior"
+
+#~ msgid "group not found"
+#~ msgstr "grupo não encontrado"
+
+#~ msgid "user aborted the operation"
+#~ msgstr "usuário abortou a operação"
+
+#~ msgid "internal error"
+#~ msgstr "erro interno"
+
+#~ msgid "not confirmed"
+#~ msgstr "não confirmado"
+
+#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgstr ""
+#~ "%s-%s: ignorando atualização do pacote (a ser substituido por %s-%s)\n"
+
+#~ msgid "command: %s\n"
+#~ msgstr "comando: %s\n"
+
+#~ msgid "could not prepare transaction\n"
+#~ msgstr "não foi possível preparar a transação\n"
+
+#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+#~ msgstr "/bin/sh não encontrado no diretório pai, abortando scriptlet\n"

lib/libalpm/po/pt_BR.po

@@ -1,22 +1,22 @@
 # translation of pt_BR.po to Português do Brasil
 # Portuguese translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Lincoln de Sousa <lincoln@archlinux-br.org>, 2007.
 # Hugo Doria <hugodoria@archlinux-br.org>, 2007-2008.
 # Douglas Soares de Andrade <dsandrade@gmail.com>, 2008.
 # João Felipe Santos <jfsantos@archlinux-br.org>, 2008.
 # Armando M. Baratti <ambaratti@archlinux-br.org>, 2008.
-# Rodrigo L. M. Flores <flores@archlinux-br.org>, 2009
-#
+# Rodrigo L. M. Flores <flores@archlinux-br.org>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:09+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-07 21:09-0300\n"
 "Last-Translator: Rodrigo L. M. Flores <flores@archlinux-br.org>\n"
 "Language-Team: Português do Brasil <www.archlinux-br.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,24 +34,6 @@ msgstr ""
 "pulando %s-%s por que uma versão mais nova %s está na lista de pacotes a "
 "serem atualizados\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr ""
-"pacotes conflitantes foram encontrados na lista de pacotes a serem "
-"atualizados\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "substituir pacotes com -U ainda não é suportado\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -82,7 +64,7 @@ msgstr "%s salvo como %s\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
-msgstr "não foi possível instalar %s como %s: (%s)\n"
+msgstr "não foi possível instalar %s como %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -98,7 +80,7 @@ msgstr "não foi possível obter o diretório de trabalho atual\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "erros ocorreram durante o upgrade de %s\n"
+msgstr "erros ocorreram durante a atualização de %s\n"
 
 #, c-format
 msgid "problem occurred while installing %s\n"
@@ -116,6 +98,14 @@ msgstr "não foi possível adicionar a entrada '%s' ao cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "removendo banco de dados inválido: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "não foi possível abrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "não foi possível remover o diretório da base de dados %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "não foi possível remover a base de dados %s\n"
@@ -124,9 +114,13 @@ msgstr "não foi possível remover a base de dados %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome inválido para a entrada na base de dados '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada da base de dados duplicada '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "entrada corrompida da base de dados '%s'\n"
+msgstr "entrada da base de dados corrompida '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -139,7 +133,7 @@ msgstr "%s base de dados está inconsistente: nome no pacote %s não coincide\n"
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
-"%s base de dados está inconsistente: versão no pacote %s não coincide\n"
+"%s base de dados está inconsistente: versão do pacote %s não coincide\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -165,14 +159,14 @@ msgstr "erro ao ler o pacote %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "faltando metadados do pacote em %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "tentativa de registrar a base de dados 'local' novamente\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "caminho da base de dados não definido\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "nova tentativa de registrar a base de dados 'local'\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependência cíclica detectada:\n"
@@ -197,29 +191,21 @@ msgstr "pacote provedor foi selecionado (%s provê %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' é inválida\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "esquema da url não especificado, assumindo HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disco"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' é inválida\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "falha ao obter arquivo '%s' de %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "não foi possível retomar o download, reiniciando\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "não foi possível escrever no arquivo '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "não foi possível retomar o download de %s; reiniciando download\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -303,7 +289,7 @@ msgstr "não foi possível remover a entrada da base de dados"
 
 #, c-format
 msgid "invalid url for server"
-msgstr "url inválida para servidor"
+msgstr "url inválida para o servidor"
 
 #, c-format
 msgid "no servers configured for repository"
@@ -355,15 +341,19 @@ msgstr "não foi possível abrir arquivo do pacote"
 
 #, c-format
 msgid "cannot remove all files for package"
-msgstr "não foi possível remover todos os arquivos para o pacote"
+msgstr "não foi possível remover todos os arquivos do pacote"
 
 #, c-format
 msgid "package filename is not valid"
-msgstr "o nome do arquivo do pacote não é valido"
+msgstr "o nome do pacote não é valido"
 
 #, c-format
-msgid "no such repository"
-msgstr "repositório não existe"
+msgid "package architecture is not valid"
+msgstr "a arquitetura do pacote não é valida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "não foi possível encontrar o repositório para o pacote"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -403,7 +393,7 @@ msgstr "erro na biblioteca de download"
 
 #, c-format
 msgid "error invoking external downloader"
-msgstr "erro invocando programa de download externo"
+msgstr "erro ao invocar o programa de download externo"
 
 #, c-format
 msgid "unexpected error"
@@ -435,7 +425,7 @@ msgstr "%s: ignorando atualização do pacote (%s => %s)\n"
 
 #, c-format
 msgid "%s: ignoring package downgrade (%s => %s)\n"
-msgstr "%s: ignorando retorno de versão do pacote (%s => %s)\n"
+msgstr "%s: ignorando downgrade do pacote (%s => %s)\n"
 
 #, c-format
 msgid "%s: downgrading from version %s to version %s\n"
@@ -453,10 +443,6 @@ msgstr "ignorando substituição do pacote (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "não foi possível substituir %s por %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "repositório '%s' não encontrado\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s está atualizado -- pulando\n"
@@ -481,26 +467,6 @@ msgstr "removendo '%s' da lista de pacotes porque ele conflita com '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "falha ao obter alguns arquivos de %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "não foi possível criar transação de remoção\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "não foi possível criar a transação\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "não foi possível inicializar a transação de remoção\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "não foi possível inicializar a transação\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "não foi possível preparar a transação de remoção\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "não foi possível efetuar a transação de remoção\n"
@@ -525,13 +491,9 @@ msgstr "não foi possível copiar arquivo temporário para %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "não foi possível remover o diretório temporário %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "não foi possível abrir %s : %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "não foi possível mudar diretório para %s (%s)\n"
+msgstr "não foi possível mudar o diretório para %s (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -555,7 +517,7 @@ msgstr "chamada para waitpid falhou (%s)\n"
 
 #, c-format
 msgid "command failed to execute correctly\n"
-msgstr "o comando falhou em executar corretamente\n"
+msgstr "comando não executado corretamente\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
@@ -565,6 +527,48 @@ msgstr "cache %s não existe, criando...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "não foi possível criar cache de pacotes, usando /tmp em seu lugar\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr ""
+#~ "pacotes conflitantes foram encontrados na lista de pacotes a serem "
+#~ "atualizados\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "substituir pacotes com -U ainda não é suportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "esquema da url não especificado, assumindo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "não foi possível escrever no arquivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "repositório não existe"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositório '%s' não encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "não foi possível criar transação de remoção\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "não foi possível criar a transação\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "não foi possível inicializar a transação de remoção\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "não foi possível inicializar a transação\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "não foi possível preparar a transação de remoção\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "erro no download de '%s': %s\n"
 

lib/libalpm/po/ro.po

@@ -1,5 +1,5 @@
 # libalpm Romanian translation.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Volodia Macovei <blog@volodia.ro>, 2009.
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
 "PO-Revision-Date: 2009-10-04 17:09+0200\n"
 "Last-Translator: volodia macovei <blog@volodia.ro>\n"
 "Language-Team: Romanian SbLUG for Arch <blog@volodia.ro>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "se trece peste %s-%s deoarece o versiune mai nouă %s există în lista ţintă\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "s-au găsit pachete în conflict în lista ţintă\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nu puteţi instala două pachete aflate în conflict în acelaşi timp\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "înlocuirea pachetelor cu -U nu este suportată încă\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "puteţi înlocui manual pachetele folosind -Rd şi -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -105,6 +90,14 @@ msgstr "nu se poate adăuga intrarea '%s' în cache\n"
 msgid "removing invalid database: %s\n"
 msgstr "se elimină baza de date nevalidă %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nu se poate deschide %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nu se poate elimina directorul cu baza de date %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "nu poate fi eliminată baza de date %s\n"
@@ -113,6 +106,10 @@ msgstr "nu poate fi eliminată baza de date %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nume pentru intrarea în baza de date nevalid '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "intrare duplicitara pentru baza de date '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "intrare în baza de date coruptă  '%s'\n"
@@ -129,8 +126,8 @@ msgstr ""
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
 msgstr ""
-"baza de date %s este inconsistentă: versiunea nu se potriveşte cu pachetul %"
-"s\n"
+"baza de date %s este inconsistentă: versiunea nu se potriveşte cu pachetul "
+"%s\n"
 
 #, c-format
 msgid "could not create directory %s: %s\n"
@@ -156,14 +153,14 @@ msgstr "eroare la citirea pachetului %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "lipsă metadata pentru pachet în %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "încercare de a reînregistra 'local' DB\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "calea bazei de date este nedefinită\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "încercare de a reînregistra 'local' DB\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "a fost detectat ciclul de dependenţă:\n"
@@ -188,29 +185,21 @@ msgstr "pachetul furnizor a fost selectat (%s furnizează %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "nu se poate rezolva \"%s\", o dependenţă a \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "URL '%s' este nevalid\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "schemă URL nespecificată, se presupune HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' este nevalid\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "eşec la regăsirea fişierului '%s' din %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "nu se poate relua descărcare, se începe peste\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "nu se poate scrie în fişierul '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nu se poate relua descărcare pentru %s; se începe peste\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -353,8 +342,12 @@ msgid "package filename is not valid"
 msgstr "numele de fişier pachet este nevalid"
 
 #, c-format
-msgid "no such repository"
-msgstr "nu există astfel de depozit"
+msgid "package architecture is not valid"
+msgstr "architectura pachetului este nevalidă"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "depozitul pentru țintă nu poate fi găsit"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -444,10 +437,6 @@ msgstr "se ignoră înlocuirea pachetului (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "nu poate fi înlocuit %s de %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "depozit '%s' negăsit\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s este actualizat -- se trece peste\n"
@@ -472,26 +461,6 @@ msgstr "se elimină '%s' din lista ţintă deoarece este în conflict cu '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "eşec în refacerea unor fişiere din %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "nu poate fi creată tranzacţia de eliminare\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "nu poate fi creată tranzacţia\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "nu poate fi iniţializată tranzacţia de eliminare\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "nu poate fi iniţializată tranzacţia\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "nu poate fi pregătită tranzacţia de eliminare\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nu poate fi efectuată tranzacţia de eliminare\n"
@@ -516,10 +485,6 @@ msgstr "nu se poate copia tempfile la %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "nu poate fi eliminat tmpdir %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "nu se poate deschide %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nu poate fi schimbat directorul la %s (%s)\n"
@@ -555,3 +520,42 @@ msgstr "nu există %s cache, se crează...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "nu se poate crea cache pachet, se foloseşte mai degrabă /tmp\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "s-au găsit pachete în conflict în lista ţintă\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "nu puteţi instala două pachete aflate în conflict în acelaşi timp\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "înlocuirea pachetelor cu -U nu este suportată încă\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "puteţi înlocui manual pachetele folosind -Rd şi -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "schemă URL nespecificată, se presupune HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "nu se poate scrie în fişierul '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "nu există astfel de depozit"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "depozit '%s' negăsit\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "nu poate fi creată tranzacţia de eliminare\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "nu poate fi creată tranzacţia\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "nu poate fi iniţializată tranzacţia de eliminare\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "nu poate fi iniţializată tranzacţia\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "nu poate fi pregătită tranzacţia de eliminare\n"

lib/libalpm/po/ru.po

@@ -1,5 +1,5 @@
 # Russian translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 #  <4rayven@gmail.com>, 2007. <serg.partizan@gmail.com> 2008
 #
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:10+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-06 10:07+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
+"Language: \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"
+"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"
 
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
@@ -25,24 +26,6 @@ msgstr "заменяется устаревшая версия %s-%s на %s в
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "пропускается %s-%s, поскольку новая версия %s в списке целей\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "в списке целей найдены конфликтующие пакеты\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
-"вы не можете одновременно установить конфликтующие между собой пакеты\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr ""
-"замещение пакетов с использованием параметров -A и -U еще не реализовано\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -107,6 +90,14 @@ msgstr "не удалось добавить запись '%s' в кэш\n"
 msgid "removing invalid database: %s\n"
 msgstr "удаление некорректной базы данных %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "не удалось открыть %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "не удалось удалить каталог базы данных %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "не удалось удалить базу данных %s\n"
@@ -115,6 +106,10 @@ msgstr "не удалось удалить базу данных %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "неправильное имя для записи в базе данных '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "повторяющаяся запись в базе данных '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "повреждённая запись в базе данных '%s'\n"
@@ -157,14 +152,14 @@ msgstr "ошибка при чтении пакета %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "отсутствуют метаданные пакета в %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "попытка перерегистрировать локальную БД\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "путь к базе данных не определён\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "попытка перерегистрировать локальную БД\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "обнаружена циклическая зависимость:\n"
@@ -189,29 +184,21 @@ msgstr "выбран пакет %s, предоставляющий %s\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "не удалось разрешить \"%s\", зависимость \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "ссылка '%s' некорректна\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "схема ссылки не определена, подразумевается HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "диск"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "ссылка '%s' некорректна\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "не удалось получить файл '%s' из %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "не удалось продолжить закачку, начинаю заново\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "не удалось записать в файл '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "не удалось продолжить закачку %s; начинаю заново\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -354,8 +341,12 @@ msgid "package filename is not valid"
 msgstr "неверное имя файла пакета"
 
 #, c-format
-msgid "no such repository"
-msgstr "нет такого репозитория"
+msgid "package architecture is not valid"
+msgstr "архитектура пакета недопустима"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "не удалось репозиторий для цели"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -445,10 +436,6 @@ msgstr "пропускается замена пакета (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "не удалось заменить %s на %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "репозиторий '%s' не найден\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s не устарел -- пропускается\n"
@@ -473,26 +460,6 @@ msgstr "удаление '%s' из списка целей, поскольку
 msgid "failed to retrieve some files from %s\n"
 msgstr "не удалось получить некоторые файлы с %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "не удалось создать запрос на удаление\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "не удалось создать запрос\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "не удалось инициализировать запрос на удаление\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "не удалось инициализировать запрос\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "не удалось подготовить запрос на удаление\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "не удалось совершить запрос на удаление\n"
@@ -517,10 +484,6 @@ msgstr "не удалось скопировать временный файл
 msgid "could not remove tmpdir %s\n"
 msgstr "не удалось удалить временный каталог %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "не удалось открыть %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "не удалось изменить каталог на %s (%s)\n"
@@ -557,6 +520,47 @@ msgstr "кэш %s не существует, создается...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "не удалось создать кэш пакетов, будет использован /tmp\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "в списке целей найдены конфликтующие пакеты\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr ""
+#~ "вы не можете одновременно установить конфликтующие между собой пакеты\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr ""
+#~ "замещение пакетов с использованием параметров -A и -U еще не реализовано\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "схема ссылки не определена, подразумевается HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "не удалось записать в файл '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "нет такого репозитория"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "репозиторий '%s' не найден\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "не удалось создать запрос на удаление\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "не удалось создать запрос\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "не удалось инициализировать запрос на удаление\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "не удалось инициализировать запрос\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "не удалось подготовить запрос на удаление\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "ошибка загрузки '%s': %s\n"
 

lib/libalpm/po/sk.po

@@ -0,0 +1,518 @@
+# translation of sk.po to Slovak
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Jose Riha <jose1711 gmail com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-07-27 22:56+0200\n"
+"Last-Translator: Jozef Říha <jose1711@gmail.com>\n"
+"Language-Team: Slovak\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "v zozname cieľov nahradená staršia verzia %s-%s za %s\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "vynechávam %s-%s, pretože v zozname cieľov je novšia verzia %s\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"prístupové práva adresára %s sa nezhodujú\n"
+"súborový systém: %o  balíček: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "rozbalenie: adresár nebol prepísaný súborom %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "rozbalenie: symbolický odkaz %s neodkazuje na adresár\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "nie je možné rozbaliť %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "nie je možné premenovať %s na %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s bol uložený ako %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "%s nie je možné nainštalovať ako %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s bol nainštalovaný ako %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "%s bol rozbalený ako %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "nie je možné zistiť aktuálny pracovný adresár\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "nastal problém pri aktualizácii %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "nastal problém pri inštalácii %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "nie je možné aktualizovať záznam databáze %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "nie je možné pridať položku '%s' do cache\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "odstraňujem neplatnú databázu: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nepodarilo sa otvoriť %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nie je možné odstrániť adresár databáze %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "nie je možné odstrániť záznam v databáze %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "neplatná názov záznamu v databáze '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicitný záznam v databáze '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "poškodený záznam v databáze '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "nie je možné otvoriť súbor %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "databáza %s je nekonzistentná: nesúhlasí meno balíčka %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "databáza %s je nekonzistentná: nesúhlasí verzia balíčka %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "nie je možné vytvoriť adresár %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nie je možné spracovať súbor s popisom balíčka v %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "chýba meno balíčka v %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "chýba verzia balíčka v %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "chyba pri čítaní balíčka %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "chýbaju metadáta balíčka v %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "cesta k databáze nie je definovaná\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "pokus o opätovné zaregistrovanie databáze 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "zistená cyklická závislosť:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s bude odstránený po %s, na ktorom závisí\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s bude nainštalovaný pred %s, na ktorom závisí\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorujem balíček %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "bol vybraný nahradzujúci balíček (%s poskytuje %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "nie je možné vyriešiť \"%s\", závislosť \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je neplatná\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "chyba pri získavaní súboru '%s' z %s: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nie je možné pokračovať v sťahovaní %s, začínam sťahovať od začiatku\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "chyba pri zápisu do súboru '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "zlyhalo získanie súboru '%s' z %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s vyzerá byť skrátený:  %jd/%jd bytov\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "chyba pri sťahovaní %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "nedostatok pamäte!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "neočakávaná systémová chyba"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "nedostatočné oprávnenia"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "nie je možné nájsť alebo prečítať súbor"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "nie je možné nájsť alebo prečítať adresár"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "odovzdaný chybný alebo NULL argument"
+
+#, c-format
+msgid "library not initialized"
+msgstr "knižnica nebola inicializovaná"
+
+#, c-format
+msgid "library already initialized"
+msgstr "knižnica je už inicializovaná"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "nie je možné zamknúť databázu"
+
+#, c-format
+msgid "could not open database"
+msgstr "nie je možné otvoriť databázu"
+
+#, c-format
+msgid "could not create database"
+msgstr "nie je možné vytvoriť databázu"
+
+#, c-format
+msgid "database not initialized"
+msgstr "databáza nebola inicializovaná"
+
+#, c-format
+msgid "database already registered"
+msgstr "databáza je už zaregistrovaná"
+
+#, c-format
+msgid "could not find database"
+msgstr "nemožno nájsť databázu"
+
+#, c-format
+msgid "could not update database"
+msgstr "nemožno aktualizovať databázu"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "nie je možné odstrániť záznam v databáze"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "neplatná URL pre server"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "pre repozitár nie sú nastavené žiadne servery"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "transakcia už bola inicializovaná"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "transakcia nebola inicializovaná"
+
+#, c-format
+msgid "duplicate target"
+msgstr "duplicitný cieľ"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "transakcia nie je pripravená"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "transakcia bola zrušená"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "operácia nie je kompatibilná s typom transakcie"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "pokus o uskutočnenie transakcie v čas, kedy nie je databáza uzamknutá"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "nie je možné nájsť alebo prečítať balíček"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operácia bola zrušená kvôli ignorovanému balíčku"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "neplatný alebo poškodený balíček"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "nie je možné otvoriť súbor balíčka"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "nie je možné odstrániť všetky súbory balíčka"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "méno súboru balíčka je neplatné"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "architektúra balíčka je neplatná"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "nie je možné nájsť repozitár cieľa"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "neplatný alebo poškodený delta rozdiel"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "aplikácia delta rozdielu zlyhala"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "nie je možné vyriešiť závislosti"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "konfliktné závislosti"
+
+#, c-format
+msgid "conflicting files"
+msgstr "konfliktné súbory"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "chyba pri získavaní niektorých súborov"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "neplatný regulárny výraz"
+
+#, c-format
+msgid "libarchive error"
+msgstr "chyba knižnice libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "chyba knižnice pre sťahovanie súborov"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "chyba volania externého programu pre sťahovanie súborov"
+
+#, c-format
+msgid "unexpected error"
+msgstr "neočakávaná chyba"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "nie je možné nájsť %s v databáze -- preskakujem\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "'%s' odstránený zo zoznamu cieľov\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "nie je možné odstrániť súbor '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "nie je možné odstrániť záznam databáze %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "nie je možné odstrániť položku '%s' z cache\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: ignorujem aktualizáciu balíčka (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorujem downgrade balíčka (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: downgradujem z verzie %s na verziu %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokálna verzia (%s) je novšia ako %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorujem náhradu balíčku (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "nedá sa nahradiť súbor %s súborom %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s je aktuálny -- preskakujem\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s je aktuálny -- preinštalovávam\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "downgradujem balíček %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "zistený konflikt nerozlíšiteľných balíčkov\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "'%s' odstránený zo zoznamu cieľov, pretože je v konflikte s '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "chyba pri získavaní niektorých súborov z %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "nie je možné uskutočniť transakciu pre odstránenie\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "nie je možné uskutočniť transakciu\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "nie je možné odstrániť zamykací súbor %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "nie je možné vytvoriť dočasný adresár\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nie je možné skopírovať dočasný súbor do %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nie je možné odstrániť dočasný adresár %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "nie je možné prepnúť sa do adresára %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "nie je možné spustiť nový proces (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "nie je možné zmeniť koreňový adresár (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "nie je možné prepnúť sa do adresára / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "volanie popen skončilo s chybou (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "volanie waitpid zlyhalo (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "príkaz sa nepodarilo spustiť správne\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "neexistuje cache %s, vytváram...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "nie je možné vytvoriť cache balíčkov, použijem /tmp\n"

lib/libalpm/po/sv.po

@@ -1,5 +1,5 @@
-# Northern Sami translations for Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Swedish translations for Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 #  <congacx@gmail.com>, 2009.
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-06 21:10+0200\n"
-"Last-Translator: Christian Larsson <congacx@gmail.com>\n"
-"Language-Team: Northern Sami\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-09-03 13:00+0200\n"
+"Last-Translator: Tobias Eriksson <tobier@tobier.se>\n"
+"Language-Team: Swedish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,22 +24,6 @@ msgstr "ersätter den äldre versionen %s-%s med %s i mållistan\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "hoppar över %s-%s för en nyare version %s finns i mållistan\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "motstridande paket hittades i mållistan\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "du kan inte installera två motstridiga paket på samma gång\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "erstätta paket med -U stödjs inte än\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "du kan ersätta paket manuellt genom att använda -Rd och -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -103,6 +88,14 @@ msgstr "kunde inte lägga till '%s' i cachen\n"
 msgid "removing invalid database: %s\n"
 msgstr "tar bort ogiltig databas: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "kunde inte öppna %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "kunde inte ta bort databaskatalogen %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "kunde inte ta bort databasen %s\n"
@@ -111,6 +104,10 @@ msgstr "kunde inte ta bort databasen %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "ogiltigt namn för databasinlägget '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "dubblerat databasinlägg '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "korrupt databasinlägg '%s'\n"
@@ -151,14 +148,14 @@ msgstr "fel vid läsning av paketet %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "saknar metadata för paketet i %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "försöker att återregistrera den 'lokala' DB\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "sökväg till databasen är odefinierad\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "försöker att återregistrera den 'lokala' DB\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "beroende cykel upptäckt:\n"
@@ -183,29 +180,21 @@ msgstr "föräldrapaket blev valt (%s tillhandahåller %s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "kan inte lösa \"%s\", beroende till \"%s\", \n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' är ogiltigt\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url schema inte specifierat, antar HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' är ogiltigt\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "misslyckades hämta filen '%s' från %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "kan inte återuppta nerladdning, börjar om\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "kan inte skriva till filen '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "kan inte återuppta nerladdning av %s, börjar om\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -348,8 +337,12 @@ msgid "package filename is not valid"
 msgstr "paketnamn är inte giltigt"
 
 #, c-format
-msgid "no such repository"
-msgstr "inget sådant förråd"
+msgid "package architecture is not valid"
+msgstr "paketets arkitektur är inte giltigt"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "givet förråd finns inte"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -439,10 +432,6 @@ msgstr "ignorerar ersättning av paket (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "kan inte ersätta %s med %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "förrådet '%s' hittades inte\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s är senaste versionen -- hoppar över\n"
@@ -467,26 +456,6 @@ msgstr "tar bort '%s' från mållistan då den står i konflikt med '%s'\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "misslyckades att hämta vissa filer från %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kunde inte skapa överföring för borttagning\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "kunde inte skapa överföring\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kunde inte påbörja överföring för borttagning\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "kunde inte påbörja överföring\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kunde inte förbereda överföring för borttagning\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "kunde inte skicka överföring för borttagning\n"
@@ -511,10 +480,6 @@ msgstr "kunde inte kopiera temporär fil till %s (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "kunde inte ta bort tmpdir %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "kunde inte öppna %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "kunde inte byta katalog till %s (%s)\n"
@@ -550,3 +515,42 @@ msgstr "ingen %s cache existerar, skapar...\n"
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "kunde inte skapa paket-cache, använder /tmp istället\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "motstridande paket hittades i mållistan\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "du kan inte installera två motstridiga paket på samma gång\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "erstätta paket med -U stödjs inte än\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "du kan ersätta paket manuellt genom att använda -Rd och -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url schema inte specifierat, antar HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "kan inte skriva till filen '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "inget sådant förråd"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "förrådet '%s' hittades inte\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kunde inte skapa överföring för borttagning\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "kunde inte skapa överföring\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kunde inte påbörja överföring för borttagning\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "kunde inte påbörja överföring\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kunde inte förbereda överföring för borttagning\n"

lib/libalpm/po/tr.po

@@ -1,5 +1,5 @@
 # Turkish translation for libalpm.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Samed BEYRİBEY <ras0ir@eventualis.org>, 2008.
 #
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 18:02+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 00:59+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
-"Language-Team: Turkish Arch Linux Users <tr@archlinuxtr.org>\n"
+"Language-Team: Turkish Arch Linux Users <archlinux@archlinux.org.tr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,22 +24,6 @@ msgstr "eski sürüm %s-%s hedef listesindeki %s ile değiştiriliyor\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "%s-%s yeni sürümü %s hedef listesinde olduğundan atlanıyor\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "hedef listesinde çakışan paketler bulundu\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "çakışan iki paketi aynı anda kuramazsınız\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "-U kullanarak paket değiştirme henüz desteklenmemektedir\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "paketleri -Rd ve -U kullanarak değiştirebilirsiniz\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -103,6 +88,14 @@ msgstr "'%s' kaydı tampona eklenemedi\n"
 msgid "removing invalid database: %s\n"
 msgstr "geçersiz veritabanı siliniyor: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "%s açılamadı: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "veritabanı dizini %s silinemedi\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "veritabanı kaldırılamıyor %s\n"
@@ -111,6 +104,10 @@ msgstr "veritabanı kaldırılamıyor %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "geçersiz bir veritabanı kaydı '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "kopya veritabanı kaydı '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "bozuk veritabanı kaydı '%s'\n"
@@ -151,14 +148,14 @@ msgstr "%s paketi okunurken hata meydana geldi: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "%s içerisinde eksik paket bilgisi\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "'yerel' veritabanı tekrar kaydedilmeye çalışılıyor\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "veritabanı yolu belirtilmemiş\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "'yerel' veritabanı tekrar kaydedilmeye çalışılıyor\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dolaylı bağımlılıklar bulundu:\n"
@@ -183,29 +180,21 @@ msgstr "sağlayan paket seçildi ( %s %s paketini sağlıyor)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "\"%s\" paketi \"%s\" paketinin bağımlılığı olarak çözümlenemiyor\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "'%s' adresi geçersiz\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "adres şeması belirtilmemiş, HTTP kullanılacak\n"
-
 #, c-format
 msgid "disk"
 msgstr "disk"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "'%s' adresi geçersiz\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "%3$s hatası nedeniyle '%1$s' dosyası %2$s adresinden alınamadı\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "indirme işlemine devam edilemiyor, baştan başlanıyor\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "'%s' dosyasına yazılamıyor\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "%s için indirme işlemine devam edilemiyor, baştan başlanıyor\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -348,8 +337,12 @@ msgid "package filename is not valid"
 msgstr "paket dosya adı geçerli değil"
 
 #, c-format
-msgid "no such repository"
-msgstr "depo bulunmuyor"
+msgid "package architecture is not valid"
+msgstr "paket mimarisi geçerli değil"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "hedef için depo bulunamadı"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -440,10 +433,6 @@ msgstr "paket değiştirme işlemi göz ardı ediliyor (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "%s ile %s değiştirilemiyor\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "'%s' deposu bulunamadı\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s güncel -- atlanıyor\n"
@@ -468,26 +457,6 @@ msgstr "'%s' hedef listesindeki '%s' ile çakıştığı için kaldırıldı\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "%s deposundan bazı dosyalar alınamadı\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "kaldırma işlemi oluşturulamadı\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "işlem oluşturulamadı\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "kaldırma işlemi başlatılamadı\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "işlem başlatılamadı\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "kaldırma işlemi hazırlanamadı\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "kaldırma işlemi teslim edilemedi\n"
@@ -512,10 +481,6 @@ msgstr "geçici dosya %s üzerine kopyalanamadı (%s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "geçici dizin %s kaldırılamadı\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "%s açılamadı: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "%s dizinine geçilemedi (%s)\n"
@@ -552,6 +517,45 @@ msgstr "%s önbelleği yok, oluşturuluyor...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "paket önbelleği oluşturulamadı, /tmp kullanılacak\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "hedef listesinde çakışan paketler bulundu\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "çakışan iki paketi aynı anda kuramazsınız\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "-U kullanarak paket değiştirme henüz desteklenmemektedir\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "paketleri -Rd ve -U kullanarak değiştirebilirsiniz\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "adres şeması belirtilmemiş, HTTP kullanılacak\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "'%s' dosyasına yazılamıyor\n"
+
+#~ msgid "no such repository"
+#~ msgstr "depo bulunmuyor"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "'%s' deposu bulunamadı\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "kaldırma işlemi oluşturulamadı\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "işlem oluşturulamadı\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "kaldırma işlemi başlatılamadı\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "işlem başlatılamadı\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "kaldırma işlemi hazırlanamadı\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "'%s' indirilirken hata oluştu: %s\n"
 

lib/libalpm/po/uk.po

@@ -1,16 +1,16 @@
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # Ivan Kovnatsky <sevenfourk@gmail.com>, 2008.
-# Roman Kyrylych <roman@archlinux.org>, 2008, 2009.
-#
+# Roman Kyrylych <roman@archlinux.org>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-04 17:15+0200\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-13 20:08+0300\n"
 "Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
-"Language-Team: http://archlinux.org.ua\n"
+"Language-Team: Ukrainian (archlinux.org.ua) <>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,22 +26,6 @@ msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr ""
 "%s-%s пропускається, бо в списку цільових пакунків є новіша версія %s\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "ви не можете одночасно встановити два пакунки, що конфліктують\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "заміна пакунків за допомогою -U поки-що не підтримується\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "ви можете власноруч замінити пакунки використавши -Rd та -U\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -106,6 +90,14 @@ msgstr "неможливо додати запис '%s' у кеш\n"
 msgid "removing invalid database: %s\n"
 msgstr "вилучення невірної бази даних: %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "неможливо відкрити %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "неможливо вилучити запис бази даних %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "неможливо вилучити базу даних %s\n"
@@ -114,6 +106,10 @@ msgstr "неможливо вилучити базу даних %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "невірне ім'я для запису бази даних '%s'\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "дублікат у базі даних '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "пошкоджений запис у базі даних '%s'\n"
@@ -154,14 +150,14 @@ msgstr "помилка при читанні пакунку %s: %s\n"
 msgid "missing package metadata in %s\n"
 msgstr "бракує метаданих пакунку в %s\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "спроба перереєструвати базу даних 'local'\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "шлях до бази даних не вказано\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "спроба перереєструвати базу даних 'local'\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "виявлено цикл залежностей:\n"
@@ -186,29 +182,21 @@ msgstr "був вибраний пакунок %s, що забезпечує %s\
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "неможливо розв'язати \"%s\", залежність \"%s\"\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "посилання '%s' невірне\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "протокол посилання не вказано, вважається HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "диск"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "посилання '%s' невірне\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "не вдалося отримати файл '%s' з %s : %s\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "неможливо продовжити завантаження, починається з початку\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "неможливо писати у файл '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "неможливо продовжити завантаження %s; починається з початку\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -351,8 +339,12 @@ msgid "package filename is not valid"
 msgstr "ім'я файлу пакунку невірне"
 
 #, c-format
-msgid "no such repository"
-msgstr "немає такого репозиторію"
+msgid "package architecture is not valid"
+msgstr "архітектура пакунку невірна"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "неможливо знайти репозиторій з пакунком"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -442,10 +434,6 @@ msgstr "ігнорування заміни пакунка (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "неможливо замінити %s на %s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "репозиторій '%s' не знайдено\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s не потребує оновлення -- пропущено\n"
@@ -470,26 +458,6 @@ msgstr "вилучення '%s' з списку пакунків, бо він к
 msgid "failed to retrieve some files from %s\n"
 msgstr "не вдалося отримати деякі файли з %s\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "неможливо створити транзакцію вилучення\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "неможливо створити транзакцію\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "неможливо почати транзакцію вилучення\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "неможливо почати транзакцію\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "неможливо підготувати транзакцію вилучення\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "неможливо здійснити транзакцію вилучення\n"
@@ -514,10 +482,6 @@ msgstr "неможливо скопіювати тимчасовий файл д
 msgid "could not remove tmpdir %s\n"
 msgstr "неможливо вилучити тимчасовий каталог %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "неможливо відкрити %s: %s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "неможливо змінити каталог на %s (%s)\n"
@@ -554,6 +518,45 @@ msgstr "кеш %s не існує, створюється...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "неможливо створити кеш пакунку, використовуватиметься /tmp\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "в списку цільових пакунків були знайдені конфліктуючі пакунки\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "ви не можете одночасно встановити два пакунки, що конфліктують\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "заміна пакунків за допомогою -U поки-що не підтримується\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "ви можете власноруч замінити пакунки використавши -Rd та -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "протокол посилання не вказано, вважається HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "неможливо писати у файл '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "немає такого репозиторію"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "репозиторій '%s' не знайдено\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "неможливо створити транзакцію вилучення\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "неможливо створити транзакцію\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "неможливо почати транзакцію вилучення\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "неможливо почати транзакцію\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "неможливо підготувати транзакцію вилучення\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "помилка при завантаженні '%s': %s\n"
 

lib/libalpm/po/zh_CN.po

@@ -1,5 +1,5 @@
 # Chinese/Simplified translation of Pacman package manager package.
-# Copyright (C) 2009 Pacman Development Team <pacman-dev@archlinux.org>
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the pacman package manager package.
 # 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
 #
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-08 20:48+0700\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-06-05 10:41+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,6 @@ msgstr "正在用目标清单中的 %3$s 替换老版本 %1$s-%2$s\n"
 msgid "skipping %s-%s because newer version %s is in target list\n"
 msgstr "正在跳过 %1$s-%2$s，因为较新版本的 %3$s 在目标清单中\n"
 
-#, c-format
-msgid "conflicting packages were found in target list\n"
-msgstr "目标清单中发现有冲突的软件包\n"
-
-#, c-format
-msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "你不能同时安装有冲突的两个软件包\n"
-
-#, c-format
-msgid "replacing packages with -U is not supported yet\n"
-msgstr "目前尚不支持用 -U 参数替换软件包\n"
-
-#, c-format
-msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "你可以使用 -Rd 及 -U 来手动替换软件包\n"
-
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -105,6 +90,14 @@ msgstr "无法在缓存中添加记录 '%s' \n"
 msgid "removing invalid database: %s\n"
 msgstr "正在删除无效的数据库： %s\n"
 
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "无法打开 %1$s: %2$s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "无法删除数据库目录 %s\n"
+
 #, c-format
 msgid "could not remove database %s\n"
 msgstr "无法删除数据库 %s\n"
@@ -113,6 +106,10 @@ msgstr "无法删除数据库 %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "数据库记录 '%s' 名字无效\n"
 
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "重复的数据库记录 '%s'\n"
+
 #, c-format
 msgid "corrupted database entry '%s'\n"
 msgstr "损坏的数据库记录 '%s'\n"
@@ -153,14 +150,14 @@ msgstr "读取软件包 %1$s 发生错误: %2$s\n"
 msgid "missing package metadata in %s\n"
 msgstr "%s 中缺少软件包元数据\n"
 
-#, c-format
-msgid "attempt to re-register the 'local' DB\n"
-msgstr "尝试重新登记“本地”数据库\n"
-
 #, c-format
 msgid "database path is undefined\n"
 msgstr "数据库路径未定义\n"
 
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "尝试重新登记“本地”数据库\n"
+
 #, c-format
 msgid "dependency cycle detected:\n"
 msgstr "检测到依赖关系环：\n"
@@ -185,29 +182,21 @@ msgstr "已选定提供软件包 (%1$s 提供 %2$s)\n"
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "无法解决 \"%1$s\"，\"%2$s\" 的一个依赖关系\n"
 
-#, c-format
-msgid "url '%s' is invalid\n"
-msgstr "url '%s' 无效\n"
-
-#, c-format
-msgid "url scheme not specified, assuming HTTP\n"
-msgstr "url scheme 未指定，假定为 HTTP\n"
-
 #, c-format
 msgid "disk"
 msgstr "硬盘"
 
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' 无效\n"
+
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
 
 #, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "无法恢复下载，重新开始\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "无法写入文件 '%s'\n"
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "无法恢复下载 %s；正在重新开始\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -295,7 +284,7 @@ msgstr "无效的服务器 url"
 
 #, c-format
 msgid "no servers configured for repository"
-msgstr "软件仓库没有配置服务器信息"
+msgstr "软件库没有配置服务器信息"
 
 #, c-format
 msgid "transaction already initialized"
@@ -350,8 +339,12 @@ msgid "package filename is not valid"
 msgstr "软件包文件名无效"
 
 #, c-format
-msgid "no such repository"
-msgstr "没有该软件库"
+msgid "package architecture is not valid"
+msgstr "无效的软件包架构"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "无法为目标找到软件库"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -441,10 +434,6 @@ msgstr "正在忽略软件包更新 (%s-%s => %s-%s)\n"
 msgid "cannot replace %s by %s\n"
 msgstr "无法用文件 '%2$s' 替代 %1$s\n"
 
-#, c-format
-msgid "repository '%s' not found\n"
-msgstr "没有找到软件库 '%s'\n"
-
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%1$s-%2$s 已经为最新 -- 跳过\n"
@@ -469,26 +458,6 @@ msgstr "正在从目标清单中删除 '%1$s' ，因为它和 '%2$s' 冲突\n"
 msgid "failed to retrieve some files from %s\n"
 msgstr "无法从 %s 获取某些文件\n"
 
-#, c-format
-msgid "could not create removal transaction\n"
-msgstr "无法生成可撤销处理\n"
-
-#, c-format
-msgid "could not create transaction\n"
-msgstr "无法创建处理\n"
-
-#, c-format
-msgid "could not initialize the removal transaction\n"
-msgstr "无法初始化可撤销处理\n"
-
-#, c-format
-msgid "could not initialize transaction\n"
-msgstr "无法初始化处理\n"
-
-#, c-format
-msgid "could not prepare removal transaction\n"
-msgstr "无法准备可撤销处理\n"
-
 #, c-format
 msgid "could not commit removal transaction\n"
 msgstr "无法交付可撤销处理\n"
@@ -513,10 +482,6 @@ msgstr "无法复制临时文件到 %1$s (%2$s)\n"
 msgid "could not remove tmpdir %s\n"
 msgstr "无法删除临时目录 %s\n"
 
-#, c-format
-msgid "could not open %s: %s\n"
-msgstr "无法打开 %1$s: %2$s\n"
-
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "无法更改目录到 %1$s (%2$s)\n"
@@ -553,6 +518,45 @@ msgstr "没有 %s 缓存存在，正在创建...\n"
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
 
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr "目标清单中发现有冲突的软件包\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "你不能同时安装有冲突的两个软件包\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "目前尚不支持用 -U 参数替换软件包\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr "你可以使用 -Rd 及 -U 来手动替换软件包\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "url scheme 未指定，假定为 HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "无法写入文件 '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "没有该软件库"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "没有找到软件库 '%s'\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "无法生成可撤销处理\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "无法创建处理\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "无法初始化可撤销处理\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "无法初始化处理\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "无法准备可撤销处理\n"
+
 #~ msgid "error downloading '%s': %s\n"
 #~ msgstr "下载 '%1$s' 时出错: %2$s\n"
 

lib/libalpm/remove.c

@@ -1,7 +1,7 @@
 /*
  *  remove.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -47,35 +47,45 @@
 #include "handle.h"
 #include "alpm.h"
 
-int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
+int SYMEXPORT alpm_remove_target(char *target)
 {
 	pmpkg_t *info;
-	const char *targ;
+	pmtrans_t *trans;
+	pmdb_t *db_local;
+	alpm_list_t *p;
 
 	ALPM_LOG_FUNC;
 
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+	/* Sanity checks */
+	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	trans = handle->trans;
+	db_local = handle->db_local;
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+	ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	targ = strchr(name, '/');
-	if(targ && strncmp(name, "local", 5) == 0) {
-		targ++;
-	} else {
-		targ = name;
-	}
 
-	if(_alpm_pkg_find(trans->packages, targ)) {
+	if(_alpm_pkg_find(trans->remove, target)) {
 		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}
 
-	if((info = _alpm_db_get_pkgfromcache(db, targ)) == NULL) {
-		_alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", targ);
-		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+	if((info = _alpm_db_get_pkgfromcache(db_local, target)) != NULL) {
+		_alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", info->name);
+		trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
+		return(0);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "adding %s in target list\n", info->name);
-	trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
+	_alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", target);
+	pmgrp_t *grp = alpm_db_readgrp(db_local, target);
+	if(grp == NULL) {
+		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+	}
+	for(p = alpm_grp_get_pkgs(grp); p; p = alpm_list_next(p)) {
+		pmpkg_t *pkg = alpm_list_getdata(p);
+		_alpm_log(PM_LOG_DEBUG, "adding %s in the target list\n", pkg->name);
+		trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(pkg));
+	}
 
 	return(0);
 }
@@ -91,10 +101,10 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
 			pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
 			pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target);
 			if(info) {
-				if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) {
+				if(!_alpm_pkg_find(trans->remove, alpm_pkg_get_name(info))) {
 					_alpm_log(PM_LOG_DEBUG, "pulling %s in target list\n",
 							alpm_pkg_get_name(info));
-					trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
+					trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(info));
 				}
 			} else {
 				_alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"),
@@ -103,7 +113,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
 		}
 		alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
 		alpm_list_free(lp);
-		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
 	}
 }
 
@@ -118,11 +128,11 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 		for(i = lp; i; i = i->next) {
 			pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
 			void *vpkg;
-			pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg);
+			pmpkg_t *pkg = _alpm_pkg_find(trans->remove, miss->causingpkg);
 			if(pkg == NULL) {
 				continue;
 			}
-			trans->packages = alpm_list_remove(trans->packages, pkg, _alpm_pkg_cmp,
+			trans->remove = alpm_list_remove(trans->remove, pkg, _alpm_pkg_cmp,
 					&vpkg);
 			pkg = vpkg;
 			if(pkg) {
@@ -133,7 +143,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 		}
 		alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
 		alpm_list_free(lp);
-		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
 	}
 }
 
@@ -146,21 +156,16 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 
-	/* skip all checks if we are doing this removal as part of an upgrade */
-	if(trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) {
-		return(0);
-	}
-
 	if((trans->flags & PM_TRANS_FLAG_RECURSE) && !(trans->flags & PM_TRANS_FLAG_CASCADE)) {
 		_alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n");
-		_alpm_recursedeps(db, trans->packages, trans->flags & PM_TRANS_FLAG_RECURSEALL);
+		_alpm_recursedeps(db, trans->remove, trans->flags & PM_TRANS_FLAG_RECURSEALL);
 	}
 
 	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
 		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
 
 		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
-		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->remove, NULL);
 		if(lp != NULL) {
 
 			if(trans->flags & PM_TRANS_FLAG_CASCADE) {
@@ -183,15 +188,15 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 
 	/* re-order w.r.t. dependencies */
 	_alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n");
-	lp = _alpm_sortbydeps(trans->packages, 1);
+	lp = _alpm_sortbydeps(trans->remove, 1);
 	/* free the old alltargs */
-	alpm_list_free(trans->packages);
-	trans->packages = lp;
+	alpm_list_free(trans->remove);
+	trans->remove = lp;
 
 	/* -Rcs == -Rc then -Rs */
 	if((trans->flags & PM_TRANS_FLAG_CASCADE) && (trans->flags & PM_TRANS_FLAG_RECURSE)) {
 		_alpm_log(PM_LOG_DEBUG, "finding removable dependencies\n");
-		_alpm_recursedeps(db, trans->packages, trans->flags & PM_TRANS_FLAG_RECURSEALL);
+		_alpm_recursedeps(db, trans->remove, trans->flags & PM_TRANS_FLAG_RECURSEALL);
 	}
 
 	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
@@ -201,13 +206,13 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 	return(0);
 }
 
-static int can_remove_file(pmtrans_t *trans, const char *path)
+static int can_remove_file(const char *path, alpm_list_t *skip)
 {
 	char file[PATH_MAX+1];
 
 	snprintf(file, PATH_MAX, "%s%s", handle->root, path);
 
-	if(alpm_list_find_str(trans->skip_remove, file)) {
+	if(alpm_list_find_str(skip, file)) {
 		/* return success because we will never actually remove this file */
 		return(1);
 	}
@@ -228,7 +233,7 @@ static int can_remove_file(pmtrans_t *trans, const char *path)
 
 /* Helper function for iterating through a package's file and deleting them
  * Used by _alpm_remove_commit. */
-static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
+static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove, int nosave)
 {
 	struct stat buf;
 	char file[PATH_MAX+1];
@@ -237,13 +242,13 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
 
 	snprintf(file, PATH_MAX, "%s%s", handle->root, filename);
 
-	if(trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) {
-		/* check noupgrade */
-		if(alpm_list_find_str(handle->noupgrade, filename)) {
-			_alpm_log(PM_LOG_DEBUG, "Skipping removal of '%s' due to NoUpgrade\n",
-					file);
-			return;
-		}
+	/* check the remove skip list before removing the file.
+	 * see the big comment block in db_find_fileconflicts() for an
+	 * explanation. */
+	if(alpm_list_find_str(skip_remove, filename)) {
+		_alpm_log(PM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n",
+				file);
+		return;
 	}
 
 	/* we want to do a lstat here, and not a _alpm_lstat.
@@ -263,19 +268,10 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
 			_alpm_log(PM_LOG_DEBUG, "removing directory %s\n", file);
 		}
 	} else {
-		/* check the remove skip list before removing the file.
-		 * see the big comment block in db_find_fileconflicts() for an
-		 * explanation. */
-		if(alpm_list_find_str(trans->skip_remove, file)) {
-			_alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_remove, skipping removal\n",
-					file);
-			return;
-		}
-
 		/* if the file needs backup and has been modified, back it up to .pacsave */
 		char *pkghash = _alpm_needbackup(filename, alpm_pkg_get_backup(info));
 		if(pkghash) {
-			if(trans->flags & PM_TRANS_FLAG_NOSAVE) {
+			if(nosave) {
 				_alpm_log(PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file);
 				FREE(pkghash);
 			} else {
@@ -303,7 +299,69 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans)
 	}
 }
 
-int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
+int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans)
+{
+	alpm_list_t *skip_remove, *b;
+	alpm_list_t *newfiles, *lp;
+	alpm_list_t *files = alpm_pkg_get_files(oldpkg);
+	const char *pkgname = alpm_pkg_get_name(oldpkg);
+
+	ALPM_LOG_FUNC;
+
+	_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
+			oldpkg->name, oldpkg->version);
+
+	/* copy the remove skiplist over */
+	skip_remove =
+		alpm_list_join(alpm_list_strdup(trans->skip_remove),alpm_list_strdup(handle->noupgrade));
+	/* Add files in the NEW backup array to the skip_remove array
+	 * so this removal operation doesn't kill them */
+	/* old package backup list */
+	alpm_list_t *filelist = alpm_pkg_get_files(newpkg);
+	for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) {
+		char *backup = _alpm_backup_file(b->data);
+		/* safety check (fix the upgrade026 pactest) */
+		if(!alpm_list_find_str(filelist, backup)) {
+			FREE(backup);
+			continue;
+		}
+		_alpm_log(PM_LOG_DEBUG, "adding %s to the skip_remove array\n", backup);
+		skip_remove = alpm_list_add(skip_remove, backup);
+	}
+
+	for(lp = files; lp; lp = lp->next) {
+		if(!can_remove_file(lp->data, skip_remove)) {
+			_alpm_log(PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n",
+					pkgname);
+			RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1);
+		}
+	}
+
+	/* iterate through the list backwards, unlinking files */
+	newfiles = alpm_list_reverse(files);
+	for(lp = newfiles; lp; lp = alpm_list_next(lp)) {
+		unlink_file(oldpkg, lp->data, skip_remove, 0);
+	}
+	alpm_list_free(newfiles);
+	FREELIST(skip_remove);
+
+	/* remove the package from the database */
+	_alpm_log(PM_LOG_DEBUG, "updating database\n");
+	_alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname);
+	if(_alpm_db_remove(handle->db_local, oldpkg) == -1) {
+		_alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"),
+				pkgname, alpm_pkg_get_version(oldpkg));
+	}
+	/* remove the package from the cache */
+	if(_alpm_db_remove_pkgfromcache(handle->db_local, oldpkg) == -1) {
+		_alpm_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache\n"),
+				pkgname);
+	}
+
+	return(0);
+}
+
+int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
 {
 	pmpkg_t *info;
 	alpm_list_t *targ, *lp;
@@ -314,14 +372,14 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 
-	pkg_count = alpm_list_count(trans->packages);
+	pkg_count = alpm_list_count(trans->remove);
 
-	for(targ = trans->packages; targ; targ = targ->next) {
+	for(targ = trans->remove; targ; targ = targ->next) {
 		int position = 0;
 		char scriptlet[PATH_MAX];
-		alpm_list_t *files;
 		info = (pmpkg_t*)targ->data;
 		const char *pkgname = NULL;
+		int targcount = alpm_list_count(targ);
 
 		if(handle->trans->state == STATE_INTERRUPTED) {
 			return(0);
@@ -329,26 +387,23 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 
 		/* get the name now so we can use it after package is removed */
 		pkgname = alpm_pkg_get_name(info);
-		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
-						 pkgname, alpm_pkg_get_version(info));
+		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
+				_alpm_db_path(db), pkgname, alpm_pkg_get_version(info));
 
-		if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) {
-			EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL);
-			_alpm_log(PM_LOG_DEBUG, "removing package %s-%s\n",
-								pkgname, alpm_pkg_get_version(info));
+		EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL);
+		_alpm_log(PM_LOG_DEBUG, "removing package %s-%s\n",
+				pkgname, alpm_pkg_get_version(info));
 
-			/* run the pre-remove scriptlet if it exists  */
-			if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-				_alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
-				                   alpm_pkg_get_version(info), NULL, trans);
-			}
+		/* run the pre-remove scriptlet if it exists  */
+		if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
+			_alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
+					alpm_pkg_get_version(info), NULL, trans);
 		}
 
-		files = alpm_pkg_get_files(info);
-
 		if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) {
+			alpm_list_t *files = alpm_pkg_get_files(info);
 			for(lp = files; lp; lp = lp->next) {
-				if(!can_remove_file(trans, lp->data)) {
+				if(!can_remove_file(lp->data, NULL)) {
 					_alpm_log(PM_LOG_DEBUG, "not removing package '%s', can't remove all files\n",
 					          pkgname);
 					RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1);
@@ -356,20 +411,24 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 			}
 
 			int filenum = alpm_list_count(files);
-			double percent = 0.0;
 			alpm_list_t *newfiles;
 			_alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum);
 
+			/* init progress bar */
+			PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
+					pkg_count, (pkg_count - targcount + 1));
+
 			/* iterate through the list backwards, unlinking files */
 			newfiles = alpm_list_reverse(files);
 			for(lp = newfiles; lp; lp = alpm_list_next(lp)) {
-				unlink_file(info, lp->data, trans);
+				double percent;
+				unlink_file(info, lp->data, NULL, trans->flags & PM_TRANS_FLAG_NOSAVE);
 
 				/* update progress bar after each file */
 				percent = (double)position / (double)filenum;
 				PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name,
 						(double)(percent * 100), pkg_count,
-						(pkg_count - alpm_list_count(targ) + 1));
+						(pkg_count - targcount + 1));
 				position++;
 			}
 			alpm_list_free(newfiles);
@@ -377,14 +436,12 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 
 		/* set progress to 100% after we finish unlinking files */
 		PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
-		         pkg_count, (pkg_count - alpm_list_count(targ) + 1));
+		         pkg_count, (pkg_count - targcount + 1));
 
-		if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) {
-			/* run the post-remove script if it exists  */
-			if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
-				_alpm_runscriptlet(handle->root, scriptlet, "post_remove",
-													 alpm_pkg_get_version(info), NULL, trans);
-			}
+		/* run the post-remove script if it exists  */
+		if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
+			_alpm_runscriptlet(handle->root, scriptlet, "post_remove",
+					alpm_pkg_get_version(info), NULL, trans);
 		}
 
 		/* remove the package from the database */
@@ -400,16 +457,11 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 			          pkgname);
 		}
 
-		/* call a done event if this isn't an upgrade */
-		if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) {
-			EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
-		}
+		EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL);
 	}
 
 	/* run ldconfig if it exists */
-	if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) {
-		_alpm_ldconfig(handle->root);
-	}
+	_alpm_ldconfig(handle->root);
 
 	return(0);
 }

lib/libalpm/remove.h

@@ -1,7 +1,7 @@
 /*
  *  remove.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,10 @@
 #include "alpm_list.h"
 #include "trans.h"
 
-int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name);
 int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data);
-int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db);
+int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db);
+
+int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans);
 
 #endif /* _ALPM_REMOVE_H */
 

lib/libalpm/sync.c

@@ -1,7 +1,7 @@
 /*
  *  sync.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -43,11 +43,13 @@
 #include "deps.h"
 #include "conflict.h"
 #include "trans.h"
+#include "add.h"
 #include "util.h"
 #include "handle.h"
 #include "alpm.h"
 #include "dload.h"
 #include "delta.h"
+#include "remove.h"
 
 /** Check for new version of pkg in sync repos
  * (only the first occurrence is considered in sync)
@@ -80,17 +82,30 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
 	return(NULL);
 }
 
-int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade)
+/** Search for packages to upgrade and add them to the transaction.
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
 {
 	alpm_list_t *i, *j, *k;
+	pmtrans_t *trans;
+	pmdb_t *db_local;
+	alpm_list_t *dbs_sync;
 
 	ALPM_LOG_FUNC;
 
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	trans = handle->trans;
+	db_local = handle->db_local;
+	dbs_sync = handle->dbs_sync;
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+
 	_alpm_log(PM_LOG_DEBUG, "checking for package upgrades\n");
 	for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) {
 		pmpkg_t *lpkg = i->data;
 
-		if(_alpm_pkg_find(trans->packages, lpkg->name)) {
+		if(_alpm_pkg_find(trans->add, lpkg->name)) {
 			_alpm_log(PM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name);
 			continue;
 		}
@@ -113,7 +128,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 					} else {
 						_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 												spkg->name, spkg->version);
-						trans->packages = alpm_list_add(trans->packages, spkg);
+						trans->add = alpm_list_add(trans->add, spkg);
 					}
 				} else if(cmp < 0) {
 					if(enable_downgrade) {
@@ -124,7 +139,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 						} else {
 							_alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"),
 											lpkg->name, lpkg->version, spkg->version);
-							trans->packages = alpm_list_add(trans->packages, spkg);
+							trans->add = alpm_list_add(trans->add, spkg);
 						}
 					} else {
 						_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
@@ -152,7 +167,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 						}
 
 						/* If spkg is already in the target list, we append lpkg to spkg's removes list */
-						pmpkg_t *tpkg = _alpm_pkg_find(trans->packages, spkg->name);
+						pmpkg_t *tpkg = _alpm_pkg_find(trans->add, spkg->name);
 						if(tpkg) {
 							/* sanity check, multiple repos can contain spkg->name */
 							if(tpkg->origin_data.db != sdb) {
@@ -173,7 +188,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 							spkg->removes = alpm_list_add(NULL, lpkg);
 							_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 													spkg->name, spkg->version);
-							trans->packages = alpm_list_add(trans->packages, spkg);
+							trans->add = alpm_list_add(trans->add, spkg);
 						}
 					}
 				}
@@ -187,57 +202,18 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 	return(0);
 }
 
-int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name)
+static int sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
 {
-	char *targline;
-	char *targ;
-	alpm_list_t *j;
-	pmpkg_t *local, *spkg;
-	pmdepend_t *dep; /* provisions and dependencies are also allowed */
+	pmtrans_t *trans;
+	pmdb_t *db_local;
+	pmpkg_t *local;
 
 	ALPM_LOG_FUNC;
 
-	ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	trans = handle->trans;
+	db_local = handle->db_local;
 
-	STRDUP(targline, name, RET_ERR(PM_ERR_MEMORY, -1));
-	targ = strchr(targline, '/');
-	if(targ) {
-		/* we are looking for a package in a specific database */
-		alpm_list_t *dbs = NULL;
-		*targ = '\0';
-		targ++;
-		_alpm_log(PM_LOG_DEBUG, "searching for target '%s' in repo '%s'\n", targ, targline);
-		for(j = dbs_sync; j; j = j->next) {
-			pmdb_t *db = j->data;
-			if(strcmp(db->treename, targline) == 0) {
-				dbs = alpm_list_add(NULL, db);
-				break;
-			}
-		}
-		if(dbs == NULL) {
-			_alpm_log(PM_LOG_ERROR, _("repository '%s' not found\n"), targline);
-			FREE(targline);
-			RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1);
-		}
-		dep = _alpm_splitdep(targ);
-		spkg = _alpm_resolvedep(dep, dbs, NULL, 1);
-		_alpm_dep_free(dep);
-		alpm_list_free(dbs);
-	} else {
-		dep = _alpm_splitdep(targline);
-		spkg = _alpm_resolvedep(dep, dbs_sync, NULL, 1);
-		_alpm_dep_free(dep);
-	}
-	FREE(targline);
-
-	if(spkg == NULL) {
-		/* pm_errno is set by _alpm_resolvedep */
-		return(-1);
-	}
-
-	if(_alpm_pkg_find(trans->packages, alpm_pkg_get_name(spkg))) {
+	if(_alpm_pkg_find(pkg_list, alpm_pkg_get_name(spkg))) {
 		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}
 
@@ -267,11 +243,118 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 	spkg->reason = PM_PKG_REASON_EXPLICIT;
 	_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 						alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
-	trans->packages = alpm_list_add(trans->packages, spkg);
+	trans->add = alpm_list_add(trans->add, spkg);
 
 	return(0);
 }
 
+static int sync_target(alpm_list_t *dbs_sync, char *target)
+{
+	alpm_list_t *i, *j;
+	alpm_list_t *known_pkgs = NULL;
+	pmpkg_t *spkg;
+	pmdepend_t *dep; /* provisions and dependencies are also allowed */
+	pmgrp_t *grp;
+	int found = 0;
+
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+
+	dep = _alpm_splitdep(target);
+	spkg = _alpm_resolvedep(dep, dbs_sync, NULL, 1);
+	_alpm_dep_free(dep);
+
+	if(spkg != NULL) {
+		return(sync_pkg(spkg, handle->trans->add));
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "%s package not found, searching for group...\n", target);
+	for(i = dbs_sync; i; i = i->next) {
+		pmdb_t *db = i->data;
+		grp = alpm_db_readgrp(db, target);
+		if(grp) {
+			found = 1;
+			for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
+				pmpkg_t *pkg = j->data;
+				if(sync_pkg(pkg, known_pkgs) == -1) {
+					if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) {
+						/* just skip duplicate or ignored targets */
+						continue;
+					} else {
+						alpm_list_free(known_pkgs);
+						return(-1);
+					}
+				}
+				known_pkgs = alpm_list_add(known_pkgs, pkg);
+			}
+		}
+	}
+	alpm_list_free(known_pkgs);
+
+	if(!found) {
+		/* pass through any 'found but ignored' errors */
+		if(pm_errno != PM_ERR_PKG_IGNORED) {
+			pm_errno = PM_ERR_PKG_NOT_FOUND;
+		}
+		return(-1);
+	}
+
+	return(0);
+}
+
+/** Add a sync target to the transaction.
+ * @param target the name of the sync target to add
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_sync_dbtarget(char *dbname, char *target)
+{
+	alpm_list_t *i;
+	alpm_list_t *dbs_sync;
+
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	dbs_sync = handle->dbs_sync;
+
+	/* we are looking for a package in a specific database */
+	alpm_list_t *dbs = NULL;
+	_alpm_log(PM_LOG_DEBUG, "searching for target '%s' in repo '%s'\n", target, dbname);
+	for(i = dbs_sync; i; i = i->next) {
+		pmdb_t *db = i->data;
+		if(strcmp(db->treename, dbname) == 0) {
+			dbs = alpm_list_add(NULL, db);
+			break;
+		}
+	}
+	if(dbs == NULL) {
+		RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1);
+	}
+	int ret = sync_target(dbs, target);
+	alpm_list_free(dbs);
+	return(ret);
+}
+
+/** Add a sync target to the transaction.
+ * @param target the name of the sync target to add
+ * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ */
+int SYMEXPORT alpm_sync_target(char *target)
+{
+	alpm_list_t *dbs_sync;
+
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	dbs_sync = handle->dbs_sync;
+
+	return(sync_target(dbs_sync,target));
+}
+
 /** Compute the size of the files that will be downloaded to install a
  * package.
  * @param newpkg the new package to upgrade to
@@ -282,6 +365,12 @@ static int compute_download_size(pmpkg_t *newpkg)
 	char *fpath;
 	off_t size = 0;
 
+	if(newpkg->origin == PKG_FROM_FILE) {
+		newpkg->infolevel |= INFRQ_DSIZE;
+		newpkg->download_size = 0;
+		return(0);
+	}
+
 	fname = alpm_pkg_get_filename(newpkg);
 	ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
 	fpath = _alpm_filecache_find(fname);
@@ -314,6 +403,7 @@ static int compute_download_size(pmpkg_t *newpkg)
 	_alpm_log(PM_LOG_DEBUG, "setting download size %jd for pkg %s\n",
 			(intmax_t)size, alpm_pkg_get_name(newpkg));
 
+	newpkg->infolevel |= INFRQ_DSIZE;
 	newpkg->download_size = size;
 	return(0);
 }
@@ -321,10 +411,9 @@ static int compute_download_size(pmpkg_t *newpkg)
 int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data)
 {
 	alpm_list_t *deps = NULL;
-	alpm_list_t *preferred = NULL;
 	alpm_list_t *unresolvable = NULL;
-	alpm_list_t *remove = NULL; /* allow checkdeps usage with trans->packages */
 	alpm_list_t *i, *j;
+	alpm_list_t *remove = NULL;
 	int ret = 0;
 
 	ALPM_LOG_FUNC;
@@ -344,32 +433,33 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
 		_alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n");
 
-		/* build remove list and preferred list for resolvedeps */
-		for(i = trans->packages; i; i = i->next) {
+		/* build remove list for resolvedeps */
+		for(i = trans->add; i; i = i->next) {
 			pmpkg_t *spkg = i->data;
 			for(j = spkg->removes; j; j = j->next) {
 				remove = alpm_list_add(remove, j->data);
 			}
-			preferred = alpm_list_add(preferred, spkg);
 		}
 
+		/* Compute the fake local database for resolvedeps (partial fix for the phonon/qt issue) */
+		alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(db_local), trans->add, _alpm_pkg_cmp);
+
 		/* Resolve packages in the transaction one at a time, in addtion
 		   building up a list of packages which could not be resolved. */
-		for(i = trans->packages; i; i = i->next) {
+		for(i = trans->add; i; i = i->next) {
 			pmpkg_t *pkg = i->data;
-			if(_alpm_resolvedeps(db_local, dbs_sync, pkg, preferred,
+			if(_alpm_resolvedeps(localpkgs, dbs_sync, pkg, trans->add,
 						&resolved, remove, data) == -1) {
 				unresolvable = alpm_list_add(unresolvable, pkg);
 			}
 			/* Else, [resolved] now additionally contains [pkg] and all of its
 			   dependencies not already on the list */
 		}
-		alpm_list_free(preferred);
+		alpm_list_free(localpkgs);
 
 		/* If there were unresolvable top-level packages, prompt the user to
 		   see if they'd like to ignore them rather than failing the sync */
 		if(unresolvable != NULL) {
-			unresolvable = alpm_list_remove_dupes(unresolvable);
 			int remove_unresolvable = 0;
 			QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable,
 					NULL, NULL, &remove_unresolvable);
@@ -392,21 +482,21 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			}
 		}
 
-		/* Unresolvable packages will be removed from the target list, so
-		   we free the transaction specific fields */
-		alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans);
-
 		/* Set DEPEND reason for pulled packages */
 		for(i = resolved; i; i = i->next) {
 			pmpkg_t *pkg = i->data;
-			if(!_alpm_pkg_find(trans->packages, pkg->name)) {
+			if(!_alpm_pkg_find(trans->add, pkg->name)) {
 				pkg->reason = PM_PKG_REASON_DEPEND;
 			}
 		}
 
+		/* Unresolvable packages will be removed from the target list, so
+		   we free the transaction specific fields */
+		alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans);
+
 		/* re-order w.r.t. dependencies */
-		alpm_list_free(trans->packages);
-		trans->packages = _alpm_sortbydeps(resolved, 0);
+		alpm_list_free(trans->add);
+		trans->add = _alpm_sortbydeps(resolved, 0);
 		alpm_list_free(resolved);
 
 		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
@@ -420,15 +510,15 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 
 		/* 1. check for conflicts in the target list */
 		_alpm_log(PM_LOG_DEBUG, "check targets vs targets\n");
-		deps = _alpm_innerconflicts(trans->packages);
+		deps = _alpm_innerconflicts(trans->add);
 
 		for(i = deps; i; i = i->next) {
 			pmconflict_t *conflict = i->data;
 			pmpkg_t *rsync, *sync, *sync1, *sync2;
 
 			/* have we already removed one of the conflicting targets? */
-			sync1 = _alpm_pkg_find(trans->packages, conflict->package1);
-			sync2 = _alpm_pkg_find(trans->packages, conflict->package2);
+			sync1 = _alpm_pkg_find(trans->add, conflict->package1);
+			sync2 = _alpm_pkg_find(trans->add, conflict->package2);
 			if(!sync1 || !sync2) {
 				continue;
 			}
@@ -468,8 +558,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			_alpm_log(PM_LOG_WARNING,
 					_("removing '%s' from target list because it conflicts with '%s'\n"),
 					rsync->name, sync->name);
+			trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
 			_alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */
-			trans->packages = alpm_list_remove(trans->packages, rsync, _alpm_pkg_cmp, NULL);
 			continue;
 		}
 
@@ -479,7 +569,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 
 		/* 2. we check for target vs db conflicts (and resolve)*/
 		_alpm_log(PM_LOG_DEBUG, "check targets vs db and db vs targets\n");
-		deps = _alpm_outerconflicts(db_local, trans->packages);
+		deps = _alpm_outerconflicts(db_local, trans->add);
 
 		for(i = deps; i; i = i->next) {
 			pmconflict_t *conflict = i->data;
@@ -487,7 +577,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			/* if conflict->package2 (the local package) is not elected for removal,
 			   we ask the user */
 			int found = 0;
-			for(j = trans->packages; j && !found; j = j->next) {
+			for(j = trans->add; j && !found; j = j->next) {
 				pmpkg_t *spkg = j->data;
 				if(_alpm_pkg_find(spkg->removes, conflict->package2)) {
 					found = 1;
@@ -500,11 +590,11 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
 					conflict->package1, conflict->package2);
 
-			pmpkg_t *sync = _alpm_pkg_find(trans->packages, conflict->package1);
+			pmpkg_t *sync = _alpm_pkg_find(trans->add, conflict->package1);
 			pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2);
 			int doremove = 0;
 			QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1,
-								conflict->package2, NULL, &doremove);
+							conflict->package2, conflict->reason, &doremove);
 			if(doremove) {
 				/* append to the removes list */
 				_alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);
@@ -529,19 +619,17 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		alpm_list_free(deps);
 	}
 
-	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
-		/* rebuild remove list */
-		alpm_list_free(remove);
-		remove = NULL;
-		for(i = trans->packages; i; i = i->next) {
-			pmpkg_t *spkg = i->data;
-			for(j = spkg->removes; j; j = j->next) {
-				remove = alpm_list_add(remove, j->data);
-			}
+	/* Build trans->remove list */
+	for(i = trans->add; i; i = i->next) {
+		pmpkg_t *spkg = i->data;
+		for(j = spkg->removes; j; j = j->next) {
+			trans->remove = alpm_list_add(trans->remove, _alpm_pkg_dup(j->data));
 		}
+	}
 
+	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
 		_alpm_log(PM_LOG_DEBUG, "checking dependencies\n");
-		deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, remove, trans->packages);
+		deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, trans->remove, trans->add);
 		if(deps) {
 			pm_errno = PM_ERR_UNSATISFIED_DEPS;
 			ret = -1;
@@ -554,7 +642,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			goto cleanup;
 		}
 	}
-	for(i = trans->packages; i; i = i->next) {
+	for(i = trans->add; i; i = i->next) {
 		/* update download size field */
 		pmpkg_t *spkg = i->data;
 		if(compute_download_size(spkg) != 0) {
@@ -564,8 +652,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 	}
 
 cleanup:
-	alpm_list_free(remove);
 	alpm_list_free(unresolvable);
+	alpm_list_free(remove);
 
 	return(ret);
 }
@@ -577,6 +665,9 @@ cleanup:
  */
 off_t SYMEXPORT alpm_pkg_download_size(pmpkg_t *newpkg)
 {
+	if(!(newpkg->infolevel & INFRQ_DSIZE)) {
+		compute_download_size(newpkg);
+	}
 	return(newpkg->download_size);
 }
 
@@ -601,7 +692,7 @@ static int apply_deltas(pmtrans_t *trans)
 	int ret = 0;
 	const char *cachedir = _alpm_filecache_setup();
 
-	for(i = trans->packages; i; i = i->next) {
+	for(i = trans->add; i; i = i->next) {
 		pmpkg_t *spkg = i->data;
 		alpm_list_t *delta_path = spkg->delta_path;
 		alpm_list_t *dlts = NULL;
@@ -614,7 +705,7 @@ static int apply_deltas(pmtrans_t *trans)
 			pmdelta_t *d = dlts->data;
 			char *delta, *from, *to;
 			char command[PATH_MAX];
-			int len = 0;
+			size_t len = 0;
 
 			delta = _alpm_filecache_find(d->delta);
 			/* the initial package might be in a different cachedir */
@@ -711,7 +802,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 {
 	alpm_list_t *i, *j, *files = NULL;
 	alpm_list_t *deltas = NULL;
-	pmtrans_t *tr_remove = NULL, *tr_upgrade = NULL;
 	int replaces = 0;
 	int errors = 0;
 	const char *cachedir = NULL;
@@ -730,7 +820,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	if(handle->totaldlcb) {
 		off_t total_size = (off_t)0;
 		/* sum up the download size for each package and store total */
-		for(i = trans->packages; i; i = i->next) {
+		for(i = trans->add; i; i = i->next) {
 			pmpkg_t *spkg = i->data;
 			total_size += spkg->download_size;
 		}
@@ -741,11 +831,10 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	for(i = handle->dbs_sync; i; i = i->next) {
 		pmdb_t *current = i->data;
 
-		for(j = trans->packages; j; j = j->next) {
+		for(j = trans->add; j; j = j->next) {
 			pmpkg_t *spkg = j->data;
-			pmdb_t *dbs = spkg->origin_data.db;
 
-			if(current == dbs) {
+			if(spkg->origin == PKG_FROM_CACHE && current == spkg->origin_data.db) {
 				const char *fname = NULL;
 
 				fname = alpm_pkg_get_filename(spkg);
@@ -780,7 +869,9 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 		if(files) {
 			EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL);
-			if(_alpm_download_files(files, current->servers, cachedir)) {
+			errors = _alpm_download_files(files, current->servers, cachedir);
+
+			if (errors) {
 				_alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"),
 						current->treename);
 				if(pm_errno == 0) {
@@ -792,6 +883,12 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 		}
 	}
 
+	for(j = trans->add; j; j = j->next) {
+		pmpkg_t *pkg = j->data;
+		pkg->infolevel &= ~INFRQ_DSIZE;
+		pkg->download_size = 0;
+	}
+
 	/* clear out value to let callback know we are done */
 	if(handle->totaldlcb) {
 		handle->totaldlcb(0);
@@ -835,15 +932,36 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	EVENT(trans, PM_TRANS_EVT_INTEGRITY_START, NULL, NULL);
 
 	errors = 0;
-	for(i = trans->packages; i; i = i->next) {
+	for(i = trans->add; i; i = i->next) {
 		pmpkg_t *spkg = i->data;
+		if(spkg->origin == PKG_FROM_FILE) {
+			continue; /* pkg_load() has been already called, this package is valid */
+		}
+
 		const char *filename = alpm_pkg_get_filename(spkg);
 		const char *md5sum = alpm_pkg_get_md5sum(spkg);
 
 		if(test_md5sum(trans, filename, md5sum) != 0) {
 			errors++;
 			*data = alpm_list_add(*data, strdup(filename));
+			continue;
 		}
+		/* load the package file and replace pkgcache entry with it in the target list */
+		/* TODO: alpm_pkg_get_db() will not work on this target anymore */
+		_alpm_log(PM_LOG_DEBUG, "replacing pkgcache entry with package file for target %s\n", spkg->name);
+		char *filepath = _alpm_filecache_find(filename);
+		pmpkg_t *pkgfile;
+		if(alpm_pkg_load(filepath, 1, &pkgfile) != 0) {
+			_alpm_pkg_free(pkgfile);
+			errors++;
+			*data = alpm_list_add(*data, strdup(filename));
+			FREE(filepath);
+			continue;
+		}
+		FREE(filepath);
+		pkgfile->reason = spkg->reason; /* copy over install reason */
+		i->data = pkgfile;
+		_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
 	}
 	if(errors) {
 		pm_errno = PM_ERR_PKG_INVALID;
@@ -851,76 +969,21 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	}
 	EVENT(trans, PM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL);
 	if(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY) {
-		return(0);
+		ret = 0;
+		goto error;
 	}
 
 	trans->state = STATE_COMMITING;
 
-	/* Create remove and upgrade transactions */
-	tr_remove = _alpm_trans_new();
-	if(tr_remove == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not create removal transaction\n"));
-		goto error;
-	}
-	tr_upgrade = _alpm_trans_new();
-	if(tr_upgrade == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not create transaction\n"));
-		goto error;
-	}
-
-	if(_alpm_trans_init(tr_remove, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, NULL, NULL, NULL) == -1) {
-		_alpm_log(PM_LOG_ERROR, _("could not initialize the removal transaction\n"));
-		goto error;
-	}
-	if(_alpm_trans_init(tr_upgrade, PM_TRANS_TYPE_UPGRADE, trans->flags, trans->cb_event, trans->cb_conv, trans->cb_progress) == -1) {
-		_alpm_log(PM_LOG_ERROR, _("could not initialize transaction\n"));
-		goto error;
-	}
-
-	/* adding targets */
-	for(i = trans->packages; i; i = i->next) {
-		pmpkg_t *spkg = i->data;
-		alpm_list_t *j;
-		/* remove transaction */
-		for(j = spkg->removes; j; j = j->next) {
-			pmpkg_t *pkg = j->data;
-			if(!_alpm_pkg_find(tr_remove->packages, pkg->name)) {
-				if(_alpm_trans_addtarget(tr_remove, pkg->name) == -1) {
-					goto error;
-				}
-				replaces++;
-			}
-		}
-		/* upgrade transaction */
-		const char *fname;
-		char *fpath;
-
-		fname = alpm_pkg_get_filename(spkg);
-		if(fname == NULL) {
-			goto error;
-		}
-		/* Loop through the cache dirs until we find a matching file */
-		fpath = _alpm_filecache_find(fname);
-
-		if(_alpm_trans_addtarget(tr_upgrade, fpath) == -1) {
-			FREE(fpath);
-			goto error;
-		}
-		FREE(fpath);
-
-		/* using alpm_list_last() is ok because addtarget() adds the new target at the
-		 * end of the tr->packages list */
-		pmpkg_t *ipkg = alpm_list_last(tr_upgrade->packages)->data;
-		ipkg->reason = spkg->reason;
-	}
+	replaces = alpm_list_count(trans->remove);
 
 	/* fileconflict check */
 	if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
 		EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
 
 		_alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n");
-		alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, tr_upgrade,
-								    tr_upgrade->packages, tr_remove->packages);
+		alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, trans,
+								    trans->add, trans->remove);
 		if(conflict) {
 			pm_errno = PM_ERR_FILE_CONFLICTS;
 			if(data) {
@@ -938,14 +1001,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	/* remove conflicting and to-be-replaced packages */
 	if(replaces) {
 		_alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n");
-		if(_alpm_trans_prepare(tr_remove, data) == -1) {
-			_alpm_log(PM_LOG_ERROR, _("could not prepare removal transaction\n"));
-			goto error;
-		}
 		/* we want the frontend to be aware of commit details */
-		tr_remove->cb_event = trans->cb_event;
-		tr_remove->cb_progress = trans->cb_progress;
-		if(_alpm_trans_commit(tr_remove, NULL) == -1) {
+		if(_alpm_remove_packages(trans, handle->db_local) == -1) {
 			_alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n"));
 			goto error;
 		}
@@ -953,8 +1010,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 	/* install targets */
 	_alpm_log(PM_LOG_DEBUG, "installing packages\n");
-	/* add_prepare is not needed */
-	if(_alpm_trans_commit(tr_upgrade, NULL) == -1) {
+	if(_alpm_upgrade_packages(trans, handle->db_local) == -1) {
 		_alpm_log(PM_LOG_ERROR, _("could not commit transaction\n"));
 		goto error;
 	}
@@ -963,8 +1019,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 error:
 	FREELIST(files);
 	alpm_list_free(deltas);
-	_alpm_trans_free(tr_remove);
-	_alpm_trans_free(tr_upgrade);
 	return(ret);
 }
 

lib/libalpm/sync.h

@@ -1,7 +1,7 @@
 /*
  *  sync.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
@@ -24,9 +24,6 @@
 
 #include "alpm.h"
 
-int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade);
-
-int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name);
 int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data);
 int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data);
 

lib/libalpm/trans.c

@@ -1,7 +1,7 @@
 /*
  *  trans.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -52,17 +52,18 @@
  */
 
 /** Initialize the transaction.
- * @param type type of the transaction
  * @param flags flags of the transaction (like nodeps, etc)
  * @param event event callback function pointer
  * @param conv question callback function pointer
  * @param progress progress callback function pointer
  * @return 0 on success, -1 on error (pm_errno is set accordingly)
  */
-int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
+int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
                               alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                               alpm_trans_cb_progress progress)
 {
+	pmtrans_t *trans;
+
 	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
@@ -78,52 +79,45 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags,
 		}
 	}
 
-	handle->trans = _alpm_trans_new();
-	if(handle->trans == NULL) {
+	trans = _alpm_trans_new();
+	if(trans == NULL) {
 		RET_ERR(PM_ERR_MEMORY, -1);
 	}
 
-	return(_alpm_trans_init(handle->trans, type, flags, event, conv, progress));
+	trans->flags = flags;
+	trans->cb_event = event;
+	trans->cb_conv = conv;
+	trans->cb_progress = progress;
+	trans->state = STATE_INITIALIZED;
+
+	handle->trans = trans;
+
+	return(0);
 }
 
-/** Search for packages to upgrade and add them to the transaction.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int SYMEXPORT alpm_trans_sysupgrade(int enable_downgrade)
+static alpm_list_t *check_arch(alpm_list_t *pkgs)
 {
-	pmtrans_t *trans;
+	alpm_list_t *i;
+	alpm_list_t *invalid = NULL;
 
-	ALPM_LOG_FUNC;
-
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-
-	trans = handle->trans;
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
-	ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
-
-	return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync, enable_downgrade));
-}
-
-/** Add a target to the transaction.
- * @param target the name of the target to add
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int SYMEXPORT alpm_trans_addtarget(char *target)
-{
-	pmtrans_t *trans;
-
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(target != NULL && strlen(target) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-
-	trans = handle->trans;
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
-
-	return(_alpm_trans_addtarget(trans, target));
+	const char *arch = alpm_option_get_arch();
+	if(!arch) {
+		return(NULL);
+	}
+	for(i = pkgs; i; i = i->next) {
+		pmpkg_t *pkg = i->data;
+		const char *pkgarch = alpm_pkg_get_arch(pkg);
+		if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) {
+			char *string;
+			const char *pkgname = alpm_pkg_get_name(pkg);
+			const char *pkgver = alpm_pkg_get_version(pkg);
+			size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3;
+			MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid));
+			sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch);
+			invalid = alpm_list_add(invalid, string);
+		}
+	}
+	return(invalid);
 }
 
 /** Prepare a transaction.
@@ -133,16 +127,47 @@ int SYMEXPORT alpm_trans_addtarget(char *target)
  */
 int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
 {
+	pmtrans_t *trans;
+
 	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 
-	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+	trans = handle->trans;
 
-	return(_alpm_trans_prepare(handle->trans, data));
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+
+	/* If there's nothing to do, return without complaining */
+	if(trans->add == NULL && trans->remove == NULL) {
+		return(0);
+	}
+
+	alpm_list_t *invalid = check_arch(trans->add);
+	if(invalid) {
+		if(data) {
+			*data = invalid;
+		}
+		RET_ERR(PM_ERR_PKG_INVALID_ARCH, -1);
+	}
+
+	if(trans->add == NULL) {
+		if(_alpm_remove_prepare(trans, handle->db_local, data) == -1) {
+			/* pm_errno is set by _alpm_remove_prepare() */
+			return(-1);
+		}
+	}	else {
+		if(_alpm_sync_prepare(trans, handle->db_local, handle->dbs_sync, data) == -1) {
+			/* pm_errno is set by _alpm_sync_prepare() */
+			return(-1);
+		}
+	}
+
+	trans->state = STATE_PREPARED;
+
+	return(0);
 }
 
 /** Commit a transaction.
@@ -152,17 +177,42 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
  */
 int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
 {
+	pmtrans_t *trans;
+
 	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 
-	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(handle->trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1));
+	trans = handle->trans;
 
-	ASSERT(!(handle->trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1));
+	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1));
 
-	return(_alpm_trans_commit(handle->trans, data));
+	ASSERT(!(trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1));
+
+	/* If there's nothing to do, return without complaining */
+	if(trans->add == NULL && trans->remove == NULL) {
+		return(0);
+	}
+
+	trans->state = STATE_COMMITING;
+
+	if(trans->add == NULL) {
+		if(_alpm_remove_packages(trans, handle->db_local) == -1) {
+			/* pm_errno is set by _alpm_remove_commit() */
+			return(-1);
+		}
+	} else {
+		if(_alpm_sync_commit(trans, handle->db_local, data) == -1) {
+			/* pm_errno is set by _alpm_sync_commit() */
+			return(-1);
+		}
+	}
+
+	trans->state = STATE_COMMITED;
+
+	return(0);
 }
 
 /** Interrupt a transaction.
@@ -203,7 +253,7 @@ int SYMEXPORT alpm_trans_release()
 	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
 	ASSERT(trans->state != STATE_IDLE, RET_ERR(PM_ERR_TRANS_NULL, -1));
 
-	unsigned int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK;
+	int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK;
 
 	_alpm_trans_free(trans);
 	handle->trans = NULL;
@@ -211,7 +261,10 @@ int SYMEXPORT alpm_trans_release()
 	/* unlock db */
 	if(!nolock_flag) {
 		if(handle->lckfd != -1) {
-			while(close(handle->lckfd) == -1 && errno == EINTR);
+			int fd;
+			do {
+				fd = close(handle->lckfd);
+			} while(fd == -1 && errno == EINTR);
 			handle->lckfd = -1;
 		}
 		if(_alpm_lckrm()) {
@@ -247,12 +300,10 @@ void _alpm_trans_free(pmtrans_t *trans)
 		return;
 	}
 
-	if(trans->type == PM_TRANS_TYPE_SYNC) {
-		alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free_trans);
-	} else {
-		alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free);
-	}
-	alpm_list_free(trans->packages);
+	alpm_list_free_inner(trans->add, (alpm_list_fn_free)_alpm_pkg_free_trans);
+	alpm_list_free(trans->add);
+	alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free);
+	alpm_list_free(trans->remove);
 
 	FREELIST(trans->skip_add);
 	FREELIST(trans->skip_remove);
@@ -260,150 +311,6 @@ void _alpm_trans_free(pmtrans_t *trans)
 	FREE(trans);
 }
 
-int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
-                     alpm_trans_cb_event event, alpm_trans_cb_conv conv,
-                     alpm_trans_cb_progress progress)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-
-	trans->type = type;
-	trans->flags = flags;
-	trans->cb_event = event;
-	trans->cb_conv = conv;
-	trans->cb_progress = progress;
-	trans->state = STATE_INITIALIZED;
-
-	return(0);
-}
-
-/** Add a target to the transaction.
- * @param trans the current transaction
- * @param target the name of the target to add
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
- */
-int _alpm_trans_addtarget(pmtrans_t *trans, char *target)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-
-	switch(trans->type) {
-		case PM_TRANS_TYPE_UPGRADE:
-			if(_alpm_add_loadtarget(trans, handle->db_local, target) == -1) {
-				/* pm_errno is set by _alpm_add_loadtarget() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_REMOVE:
-		case PM_TRANS_TYPE_REMOVEUPGRADE:
-			if(_alpm_remove_loadtarget(trans, handle->db_local, target) == -1) {
-				/* pm_errno is set by _alpm_remove_loadtarget() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_SYNC:
-			if(_alpm_sync_addtarget(trans, handle->db_local, handle->dbs_sync, target) == -1) {
-				/* pm_errno is set by _alpm_sync_loadtarget() */
-				return(-1);
-			}
-		break;
-	}
-
-	return(0);
-}
-
-int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data)
-{
-	if(data) {
-		*data = NULL;
-	}
-
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-
-	/* If there's nothing to do, return without complaining */
-	if(trans->packages == NULL) {
-		return(0);
-	}
-
-	switch(trans->type) {
-		case PM_TRANS_TYPE_UPGRADE:
-			if(_alpm_add_prepare(trans, handle->db_local, data) == -1) {
-				/* pm_errno is set by _alpm_add_prepare() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_REMOVE:
-		case PM_TRANS_TYPE_REMOVEUPGRADE:
-			if(_alpm_remove_prepare(trans, handle->db_local, data) == -1) {
-				/* pm_errno is set by _alpm_remove_prepare() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_SYNC:
-			if(_alpm_sync_prepare(trans, handle->db_local, handle->dbs_sync, data) == -1) {
-				/* pm_errno is set by _alpm_sync_prepare() */
-				return(-1);
-			}
-		break;
-	}
-
-	trans->state = STATE_PREPARED;
-
-	return(0);
-}
-
-int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data)
-{
-	ALPM_LOG_FUNC;
-
-	if(data!=NULL)
-		*data = NULL;
-
-	/* Sanity checks */
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-
-	/* If there's nothing to do, return without complaining */
-	if(trans->packages == NULL) {
-		return(0);
-	}
-
-	trans->state = STATE_COMMITING;
-
-	switch(trans->type) {
-		case PM_TRANS_TYPE_UPGRADE:
-			if(_alpm_add_commit(trans, handle->db_local) == -1) {
-				/* pm_errno is set by _alpm_add_commit() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_REMOVE:
-		case PM_TRANS_TYPE_REMOVEUPGRADE:
-			if(_alpm_remove_commit(trans, handle->db_local) == -1) {
-				/* pm_errno is set by _alpm_remove_commit() */
-				return(-1);
-			}
-		break;
-		case PM_TRANS_TYPE_SYNC:
-			if(_alpm_sync_commit(trans, handle->db_local, data) == -1) {
-				/* pm_errno is set by _alpm_sync_commit() */
-				return(-1);
-			}
-		break;
-	}
-
-	trans->state = STATE_COMMITED;
-
-	return(0);
-}
-
 /* A cheap grep for text files, returns 1 if a substring
  * was found in the text file fn, 0 if it wasn't
  */
@@ -416,7 +323,8 @@ static int grep(const char *fn, const char *needle)
 	}
 	while(!feof(fp)) {
 		char line[1024];
-		fgets(line, 1024, fp);
+		int sline = sizeof(line)-1;
+		fgets(line, sline, fp);
 		if(feof(fp)) {
 			continue;
 		}
@@ -464,7 +372,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	/* either extract or copy the scriptlet */
 	snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir);
 	if(!strcmp(script, "pre_upgrade") || !strcmp(script, "pre_install")) {
-		if(_alpm_unpack(installfn, tmpdir, ".INSTALL")) {
+		if(_alpm_unpack_single(installfn, tmpdir, ".INSTALL")) {
 			retval = 1;
 		}
 	} else {
@@ -503,16 +411,7 @@ cleanup:
 	return(retval);
 }
 
-pmtranstype_t SYMEXPORT alpm_trans_get_type()
-{
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(-1));
-	ASSERT(handle->trans != NULL, return(-1));
-
-	return handle->trans->type;
-}
-
-unsigned int SYMEXPORT alpm_trans_get_flags()
+int SYMEXPORT alpm_trans_get_flags()
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, return(-1));
@@ -521,12 +420,21 @@ unsigned int SYMEXPORT alpm_trans_get_flags()
 	return handle->trans->flags;
 }
 
-alpm_list_t SYMEXPORT * alpm_trans_get_pkgs()
+alpm_list_t SYMEXPORT * alpm_trans_get_add()
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, return(NULL));
 	ASSERT(handle->trans != NULL, return(NULL));
 
-	return handle->trans->packages;
+	return handle->trans->add;
+}
+
+alpm_list_t SYMEXPORT * alpm_trans_get_remove()
+{
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(NULL));
+	ASSERT(handle->trans != NULL, return(NULL));
+
+	return handle->trans->remove;
 }
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/trans.h

@@ -1,7 +1,7 @@
 /*
  *  trans.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -37,10 +37,10 @@ typedef enum _pmtransstate_t {
 
 /* Transaction */
 struct __pmtrans_t {
-	pmtranstype_t type;
 	pmtransflag_t flags;
 	pmtransstate_t state;
-	alpm_list_t *packages;      /* list of (pmpkg_t *) */
+	alpm_list_t *add;      /* list of (pmpkg_t *) */
+	alpm_list_t *remove;      /* list of (pmpkg_t *) */
 	alpm_list_t *skip_add;      /* list of (char *) */
 	alpm_list_t *skip_remove;   /* list of (char *) */
 	alpm_trans_cb_event cb_event;
@@ -69,12 +69,9 @@ do { \
 
 pmtrans_t *_alpm_trans_new(void);
 void _alpm_trans_free(pmtrans_t *trans);
-int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
+int _alpm_trans_init(pmtrans_t *trans, pmtransflag_t flags,
                      alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                      alpm_trans_cb_progress progress);
-int _alpm_trans_addtarget(pmtrans_t *trans, char *target);
-int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data);
-int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data);
 int _alpm_runscriptlet(const char *root, const char *installfn,
                        const char *script, const char *ver,
                        const char *oldver, pmtrans_t *trans);

lib/libalpm/util.c

@@ -1,7 +1,7 @@
 /*
  *  util.c
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -175,7 +175,7 @@ char *_alpm_strtrim(char *str)
 		return(str);
 	}
 
-	while(isspace((int)*pch)) {
+	while(isspace((unsigned char)*pch)) {
 		pch++;
 	}
 	if(pch != str) {
@@ -188,7 +188,7 @@ char *_alpm_strtrim(char *str)
 	}
 
 	pch = (str + (strlen(str) - 1));
-	while(isspace((int)*pch)) {
+	while(isspace((unsigned char)*pch)) {
 		pch--;
 	}
 	*++pch = '\0';
@@ -196,57 +196,11 @@ char *_alpm_strtrim(char *str)
 	return(str);
 }
 
-/* Helper function for _alpm_strreplace */
-static void _strnadd(char **str, const char *append, unsigned int count)
-{
-	if(*str) {
-		*str = realloc(*str, strlen(*str) + count + 1);
-	} else {
-		*str = calloc(count + 1, sizeof(char));
-	}
-
-	strncat(*str, append, count);
-}
-
-/* Replace all occurances of 'needle' with 'replace' in 'str', returning
- * a new string (must be free'd) */
-char *_alpm_strreplace(const char *str, const char *needle, const char *replace)
-{
-	const char *p, *q;
-	p = q = str;
-
-	char *newstr = NULL;
-	unsigned int needlesz = strlen(needle),
-							 replacesz = strlen(replace);
-
-	while (1) {
-		q = strstr(p, needle);
-		if(!q) { /* not found */
-			if(*p) {
-				/* add the rest of 'p' */
-				_strnadd(&newstr, p, strlen(p));
-			}
-			break;
-		} else { /* found match */
-			if(q > p){
-				/* add chars between this occurance and last occurance, if any */
-				_strnadd(&newstr, p, q - p);
-			}
-			_strnadd(&newstr, replace, replacesz);
-			p = q + needlesz;
-		}
-	}
-
-	return newstr;
-}
-
-
 /* Create a lock file */
 int _alpm_lckmk()
 {
 	int fd;
-	pid_t pid;
-	char *dir, *ptr, *spid = NULL;
+	char *dir, *ptr;
 	const char *file = alpm_option_get_lockfile();
 
 	/* create the dir of the lockfile first */
@@ -258,16 +212,15 @@ int _alpm_lckmk()
 	_alpm_makepath(dir);
 	FREE(dir);
 
-	while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1
-			&& errno == EINTR);
+	do {
+		fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000);
+	} while (fd == -1 && errno == EINTR);
 	if(fd > 0) {
-		pid = getpid();
-		size_t len = snprintf(spid, 0, "%ld\n", (long)pid) + 1;
-		spid = malloc(len);
-		snprintf(spid, len, "%ld\n", (long)pid);
-		while(write(fd, (void *)spid, len) == -1 && errno == EINTR);
+		FILE *f = fdopen(fd, "w");
+		fprintf(f, "%ld\n", (long)getpid());
+		fflush(f);
 		fsync(fd);
-		free(spid);
+		fclose(f);
 		return(fd);
 	}
 	return(-1);
@@ -286,14 +239,38 @@ int _alpm_lckrm()
 /* Compression functions */
 
 /**
- * @brief Unpack a specific file or all files in an archive.
+ * @brief Unpack a specific file in an archive.
  *
  * @param archive  the archive to unpack
  * @param prefix   where to extract the files
- * @param fn       a file within the archive to unpack or NULL for all
+ * @param fn       a file within the archive to unpack
  * @return 0 on success, 1 on failure
  */
-int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
+int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn)
+{
+	alpm_list_t *list = NULL;
+	int ret = 0;
+	if(fn == NULL) {
+		return(1);
+	}
+	list = alpm_list_add(list, (void *)fn);
+	ret = _alpm_unpack(archive, prefix, list, 1);
+	alpm_list_free(list);
+	return(ret);
+}
+
+/**
+ * @brief Unpack a list of files in an archive.
+ *
+ * @param archive  the archive to unpack
+ * @param prefix   where to extract the files
+ * @param list     a list of files within the archive to unpack or
+ * NULL for all
+ * @param breakfirst break after the first entry found
+ *
+ * @return 0 on success, 1 on failure
+ */
+int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst)
 {
 	int ret = 0;
 	mode_t oldmask;
@@ -339,21 +316,31 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
 
 		st = archive_entry_stat(entry);
 		entryname = archive_entry_pathname(entry);
-		
+
 		if(S_ISREG(st->st_mode)) {
 			archive_entry_set_perm(entry, 0644);
 		} else if(S_ISDIR(st->st_mode)) {
 			archive_entry_set_perm(entry, 0755);
 		}
 
-		/* If a specific file was requested skip entries that don't match. */
-		if (fn && strcmp(fn, entryname)) {
-			_alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname);
-			if (archive_read_data_skip(_archive) != ARCHIVE_OK) {
-				ret = 1;
-				goto cleanup;
+		/* If specific files were requested, skip entries that don't match. */
+		if(list) {
+			char *prefix = strdup(entryname);
+			char *p = strstr(prefix,"/");
+			if(p) {
+				*(p+1) = '\0';
+			}
+			char *found = alpm_list_find_str(list, prefix);
+			free(prefix);
+			if(!found) {
+				if (archive_read_data_skip(_archive) != ARCHIVE_OK) {
+					ret = 1;
+					goto cleanup;
+				}
+				continue;
+			} else {
+				_alpm_log(PM_LOG_DEBUG, "extracting: %s\n", entryname);
 			}
-			continue;
 		}
 
 		/* Extract the archive entry. */
@@ -369,7 +356,7 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
 			goto cleanup;
 		}
 
-		if(fn) {
+		if(breakfirst) {
 			break;
 		}
 	}
@@ -426,8 +413,7 @@ int _alpm_rmrf(const char *path)
 	return(0);
 }
 
-int _alpm_logaction(unsigned short usesyslog, FILE *f,
-		const char *fmt, va_list args)
+int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args)
 {
 	int ret = 0;
 
@@ -527,7 +513,9 @@ int _alpm_run_chroot(const char *root, const char *cmd)
 		/* this code runs for the parent only (wait on the child) */
 		pid_t retpid;
 		int status;
-		while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR);
+		do {
+			retpid = waitpid(pid, &status, 0);
+		} while(retpid == -1 && errno == EINTR);
 		if(retpid == -1) {
 			_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"),
 			          strerror(errno));

lib/libalpm/util.h

@@ -1,7 +1,7 @@
 /*
  *  util.h
  *
- *  Copyright (c) 2006-2009 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
  *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
  *  Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
@@ -26,6 +26,8 @@
 
 #include "config.h"
 
+#include "alpm_list.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -60,12 +62,12 @@ int _alpm_makepath(const char *path);
 int _alpm_makepath_mode(const char *path, mode_t mode);
 int _alpm_copyfile(const char *src, const char *dest);
 char *_alpm_strtrim(char *str);
-char *_alpm_strreplace(const char *str, const char *needle, const char *replace);
 int _alpm_lckmk();
 int _alpm_lckrm();
-int _alpm_unpack(const char *archive, const char *prefix, const char *fn);
+int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn);
+int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst);
 int _alpm_rmrf(const char *path);
-int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list args);
+int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args);
 int _alpm_run_chroot(const char *root, const char *cmd);
 int _alpm_ldconfig(const char *root);
 int _alpm_str_cmp(const void *s1, const void *s2);

lib/libalpm/version.c

@@ -0,0 +1,195 @@
+/*
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <ctype.h>
+
+/* libalpm */
+#include "util.h"
+
+/** Compare two version strings and determine which one is 'newer'.
+ * Returns a value comparable to the way strcmp works. Returns 1
+ * if a is newer than b, 0 if a and b are the same version, or -1
+ * if b is newer than a.
+ *
+ * This function has been adopted from the rpmvercmp function located
+ * at lib/rpmvercmp.c, and was most recently updated against rpm
+ * version 4.4.2.3. Small modifications have been made to make it more
+ * consistent with the libalpm coding style.
+ *
+ * Keep in mind that the pkgrel is only compared if it is available
+ * on both versions handed to this function. For example, comparing
+ * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield
+ * -1 as expected. This is mainly for supporting versioned dependencies
+ * that do not include the pkgrel.
+ */
+int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b)
+{
+	char oldch1, oldch2;
+	char *str1, *str2;
+	char *ptr1, *ptr2;
+	char *one, *two;
+	int rc;
+	int isnum;
+	int ret = 0;
+
+	/* libalpm added code. ensure our strings are not null */
+	if(!a) {
+		if(!b) return(0);
+		return(-1);
+	}
+	if(!b) return(1);
+
+	/* easy comparison to see if versions are identical */
+	if(strcmp(a, b) == 0) return(0);
+
+	str1 = strdup(a);
+	str2 = strdup(b);
+
+	one = str1;
+	two = str2;
+
+	/* loop through each version segment of str1 and str2 and compare them */
+	while(*one && *two) {
+		while(*one && !isalnum((int)*one)) one++;
+		while(*two && !isalnum((int)*two)) two++;
+
+		/* If we ran to the end of either, we are finished with the loop */
+		if(!(*one && *two)) break;
+
+		ptr1 = one;
+		ptr2 = two;
+
+		/* grab first completely alpha or completely numeric segment */
+		/* leave one and two pointing to the start of the alpha or numeric */
+		/* segment and walk ptr1 and ptr2 to end of segment */
+		if(isdigit((int)*ptr1)) {
+			while(*ptr1 && isdigit((int)*ptr1)) ptr1++;
+			while(*ptr2 && isdigit((int)*ptr2)) ptr2++;
+			isnum = 1;
+		} else {
+			while(*ptr1 && isalpha((int)*ptr1)) ptr1++;
+			while(*ptr2 && isalpha((int)*ptr2)) ptr2++;
+			isnum = 0;
+		}
+
+		/* save character at the end of the alpha or numeric segment */
+		/* so that they can be restored after the comparison */
+		oldch1 = *ptr1;
+		*ptr1 = '\0';
+		oldch2 = *ptr2;
+		*ptr2 = '\0';
+
+		/* this cannot happen, as we previously tested to make sure that */
+		/* the first string has a non-null segment */
+		if (one == ptr1) {
+			ret = -1;	/* arbitrary */
+			goto cleanup;
+		}
+
+		/* take care of the case where the two version segments are */
+		/* different types: one numeric, the other alpha (i.e. empty) */
+		/* numeric segments are always newer than alpha segments */
+		/* XXX See patch #60884 (and details) from bugzilla #50977. */
+		if (two == ptr2) {
+			ret = isnum ? 1 : -1;
+			goto cleanup;
+		}
+
+		if (isnum) {
+			/* this used to be done by converting the digit segments */
+			/* to ints using atoi() - it's changed because long  */
+			/* digit segments can overflow an int - this should fix that. */
+
+			/* throw away any leading zeros - it's a number, right? */
+			while (*one == '0') one++;
+			while (*two == '0') two++;
+
+			/* whichever number has more digits wins */
+			if (strlen(one) > strlen(two)) {
+				ret = 1;
+				goto cleanup;
+			}
+			if (strlen(two) > strlen(one)) {
+				ret = -1;
+				goto cleanup;
+			}
+		}
+
+		/* strcmp will return which one is greater - even if the two */
+		/* segments are alpha or if they are numeric.  don't return  */
+		/* if they are equal because there might be more segments to */
+		/* compare */
+		rc = strcmp(one, two);
+		if (rc) {
+			ret = rc < 1 ? -1 : 1;
+			goto cleanup;
+		}
+
+		/* restore character that was replaced by null above */
+		*ptr1 = oldch1;
+		one = ptr1;
+		*ptr2 = oldch2;
+		two = ptr2;
+
+		/* libalpm added code. check if version strings have hit the pkgrel
+		 * portion. depending on which strings have hit, take correct action.
+		 * this is all based on the premise that we only have one dash in
+		 * the version string, and it separates pkgver from pkgrel. */
+		if(*ptr1 == '-' && *ptr2 == '-') {
+			/* no-op, continue comparing since we are equivalent throughout */
+		} else if(*ptr1 == '-') {
+			/* ptr1 has hit the pkgrel and ptr2 has not. continue version
+			 * comparison after stripping the pkgrel from ptr1. */
+			*ptr1 = '\0';
+		} else if(*ptr2 == '-') {
+			/* ptr2 has hit the pkgrel and ptr1 has not. continue version
+			 * comparison after stripping the pkgrel from ptr2. */
+			*ptr2 = '\0';
+		}
+	}
+
+	/* this catches the case where all numeric and alpha segments have */
+	/* compared identically but the segment separating characters were */
+	/* different */
+	if ((!*one) && (!*two)) {
+		ret = 0;
+		goto cleanup;
+	}
+
+	/* the final showdown. we never want a remaining alpha string to
+	 * beat an empty string. the logic is a bit weird, but:
+	 * - if one is empty and two is not an alpha, two is newer.
+	 * - if one is an alpha, two is newer.
+	 * - otherwise one is newer.
+	 * */
+	if ( ( !*one && !isalpha((int)*two) )
+			|| isalpha((int)*one) ) {
+		ret = -1;
+	} else {
+		ret = 1;
+	}
+
+cleanup:
+	free(str1);
+	free(str2);
+	return(ret);
+}
+
+/* vim: set ts=2 sw=2 noet: */

po/LINGUAS

@@ -1,4 +1,5 @@
 # Set of available languages.
+ca
 cs
 de
 el
@@ -8,12 +9,14 @@ fr
 hu
 it
 kk
-nb_NO
+nb
 pl
+pt
 pt_BR
 ro
 ru
-sv_SE
+sk
+sv
 tr
 uk
 zh_CN