Update 3.4.3 release date

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

NEWS

@@ -1,7 +1,12 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.4.3         - fix attempted double remove of all files issue during upgrades
+              - respect IgnorePkg/IgnoreGroup for group members (FS#19854)
+              - back out epoch changes; 3.5.X will handle them differently
 3.4.2         - fix progress bar display with empty packages
               - make pactest testsuite Python 2.7 compatible
+              - write epoch values in preparation for 3.5.X releases
+              - fix null pointer dereference in architecture check (FS#21668)
               - documentation: remove unnecessary "|| return 1"
               - contrib/bacman: update package compression selection
               - contrib/PKGBUILD.vim: add a few more license options

configure.ac

@@ -42,12 +42,12 @@ AC_PREREQ(2.60)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [5])
-m4_define([lib_revision], [2])
+m4_define([lib_revision], [3])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [4])
-m4_define([pacman_version_micro], [2])
+m4_define([pacman_version_micro], [3])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 

doc/Makefile.am

@@ -52,7 +52,7 @@ EXTRA_DIST = \
 	$(DOXYGEN_MANS)
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8
+MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 website.tar.gz
 
 # Ensure manpages are fresh when building a dist tarball
 dist-hook:

doc/index.txt

@@ -47,11 +47,11 @@ configuration files dealing with pacman.
 Changelog
 ~~~~~~~~~
 For a good idea of what is going on in pacman development, take a look at the
-link:http://projects.archlinux.org/?p=pacman.git[Gitweb] summary
-page for the project.
+link:http://projects.archlinux.org/pacman.git/[Git summary page] for the
+project.
 
 See the most recent
-link:http://projects.archlinux.org/?p=pacman.git;a=blob_plain;f=NEWS;hb=HEAD[NEWS]
+link:http://projects.archlinux.org/pacman.git/tree/NEWS[NEWS]
 file for a not-as-frequently-updated list of changes. However, this should
 contain the biggest changes in a format more concise than the commit log.
 
@@ -62,6 +62,9 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2011-01-22   v3.4.3
+2010-12-29   v3.4.2
+2010-09-03   v3.4.1
 2010-06-16   v3.4.0
 2009-11-10   v3.3.3
 2009-10-05   v3.3.2
@@ -111,8 +114,8 @@ Development
 Mailing List
 ~~~~~~~~~~~~
 There is a mailing list devoted to pacman development, hosted by Arch Linux.
-link:http://www.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or
-link:http://www.archlinux.org/pipermail/pacman-dev/[view the archives].
+link:http://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or
+link:http://mailman.archlinux.org/pipermail/pacman-dev/[view the archives].
 
 Source Code
 ~~~~~~~~~~~
@@ -127,7 +130,8 @@ The current development tree can be fetched with the following command:
 
 which will fetch the full development history into a directory named pacman.
 You can browse the source as well using
-link:http://projects.archlinux.org/?p=pacman.git[Gitweb].
+link:http://projects.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also
+available for cloning purposes; these URLs are listed at the above page.
 
 If you are interested in hacking on pacman, it is highly recommended you join
 the mailing list mentioned above, as well as take a quick glance at our
@@ -143,17 +147,17 @@ Other Utilities
 ~~~~~~~~~~~~~~~
 Although the package manager itself is quite simple, many scripts have been
 developed that help automate building and installing packages. These are used
-extensively in link:http://archlinux.org[Arch Linux]. Most of these utilities
+extensively in link:http://archlinux.org/[Arch Linux]. Most of these utilities
 are available in the Arch Linux projects
-link:http://projects.archlinux.org/[Gitweb browser].
+link:http://projects.archlinux.org/[code browser].
 
 Utilities available:
 
-* link:http://projects.archlinux.org/?p=abs.git[abs] - ABS (Arch Build System), scripts to download  & use the Arch Linux PKGBUILD tree
-* link:http://projects.archlinux.org/?p=devtools.git[devtools] - tools to assist in packaging and dependency checking
-* link:http://projects.archlinux.org/?p=namcap.git[namcap] - a package analysis utility written in python
-* link:http://projects.archlinux.org/?p=pacbuild.git[pacbuild] - a package building system utilizing a daemon
-* link:http://projects.archlinux.org/?p=srcpac.git[srcpac] - a bash build-from-source pacman wrapper
+* link:http://projects.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download  & use the Arch Linux PKGBUILD tree
+* link:http://projects.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories
+* link:http://projects.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking
+* link:http://projects.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python
+* link:http://projects.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper
 
 Bugs
 ----
@@ -162,7 +166,7 @@ mailing last at mailto:pacman-dev@archlinux.org[] with specific information
 such as your commandline, the nature of the bug, and even the package database
 if it helps.
 
-You can also post a bug to the Archlinux bug tracker
+You can also post a bug to the Arch Linux bug tracker
 link:http://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
 bugs under the Pacman project.
 

lib/libalpm/be_files.c

@@ -396,14 +396,16 @@ int _alpm_db_populate(pmdb_t *db)
 			continue;
 		}
 
+		pkg->origin = PKG_FROM_CACHE;
+		pkg->origin_data.db = db;
+
 		/* 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);
 			_alpm_pkg_free(pkg);
 			continue;
 		}
-		pkg->origin = PKG_FROM_CACHE;
-		pkg->origin_data.db = db;
+
 		/* add to the collection */
 		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
 				pkg->name, db->treename);
@@ -460,7 +462,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	 * & result:  00000100
 	 * == to inforeq? nope, we need to load more info. */
 	if((info->infolevel & inforeq) == inforeq) {
-		/* already loaded this info, do nothing */
+		/* already loaded all of this info, do nothing */
 		return(0);
 	}
 	_alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
@@ -479,7 +481,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	}
 
 	/* DESC */
-	if(inforeq & INFRQ_DESC) {
+	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
 		snprintf(path, PATH_MAX, "%sdesc", pkgpath);
 		if((fp = fopen(path, "r")) == NULL) {
 			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
@@ -623,7 +625,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	}
 
 	/* FILES */
-	if(inforeq & INFRQ_FILES) {
+	if(inforeq & INFRQ_FILES && !(info->infolevel & INFRQ_FILES)) {
 		snprintf(path, PATH_MAX, "%sfiles", pkgpath);
 		if((fp = fopen(path, "r")) == NULL) {
 			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
@@ -650,7 +652,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	}
 
 	/* DEPENDS */
-	if(inforeq & INFRQ_DEPENDS) {
+	if(inforeq & INFRQ_DEPENDS && !(info->infolevel & INFRQ_DEPENDS)) {
 		snprintf(path, PATH_MAX, "%sdepends", pkgpath);
 		if((fp = fopen(path, "r")) == NULL) {
 			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
@@ -689,7 +691,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	}
 
 	/* DELTAS */
-	if(inforeq & INFRQ_DELTAS) {
+	if(inforeq & INFRQ_DELTAS && !(info->infolevel & INFRQ_DELTAS)) {
 		snprintf(path, PATH_MAX, "%sdeltas", pkgpath);
 		if((fp = fopen(path, "r"))) {
 			while(!feof(fp)) {
@@ -710,7 +712,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	}
 
 	/* INSTALL */
-	if(inforeq & INFRQ_SCRIPTLET) {
+	if(inforeq & INFRQ_SCRIPTLET && !(info->infolevel & INFRQ_SCRIPTLET)) {
 		snprintf(path, PATH_MAX, "%sinstall", pkgpath);
 		if(access(path, F_OK) == 0) {
 			info->scriptlet = 1;
@@ -811,10 +813,6 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			fprintf(fp, "\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);

lib/libalpm/po/ca.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -449,6 +449,10 @@ msgstr "%s-%s és al dia -- es reinstal·larà\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "desactualitzant paquet %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "s'ometrà l'objectiu: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n"

lib/libalpm/po/cs.po

@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -445,6 +445,10 @@ msgstr "%s-%s je aktuální -- přeinstalovat\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "ponížení verze balíčku %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "přeskakuje se cíl: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zjištěn konflikt nerozlišitelných balíčků\n"

lib/libalpm/po/de.po

@@ -11,7 +11,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -456,6 +456,10 @@ msgstr "%s-%s ist aktuell -- Reinstalliere\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "Downgrade des Paketes %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "Überspringe das Ziel: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"

lib/libalpm/po/el.po

@@ -8,7 +8,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-06-09 23:02+0300\n"
 "Last-Translator: Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>\n"
 "Language-Team: Greek <>\n"
@@ -449,6 +449,10 @@ msgstr "%s-%s ενημερωμένο -- επανεγκατάσταση\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "υποβάθμιση πακέτου %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "παράλειψη στόχου: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτων\n"

lib/libalpm/po/en_GB.po

@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -444,6 +444,10 @@ msgstr "%s-%s is up to date -- reinstalling\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "downgrading package %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "skipping target: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"

lib/libalpm/po/es.po

@@ -5,7 +5,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -458,6 +458,10 @@ msgstr "%s-%s esta al día -- re-instalando\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "decrementando la versión del paquete %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "saltando el objetivo: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "se han detectado paquetes con conflictos no resueltos\n"

lib/libalpm/po/fr.po

@@ -5,7 +5,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -450,6 +450,10 @@ msgstr "%s-%s est à jour -- réinstalle\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "retourne à la version antérieure du paquet %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "omission de la cible: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"

lib/libalpm/po/hu.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -446,6 +446,10 @@ msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "visszatérés egy régebbi %s verzióhoz (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "cél kihagyása: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "feloldhatatlan csomagütközéseket találtam\n"

lib/libalpm/po/it.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.4.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -455,6 +455,10 @@ msgstr ""
 "installazione in corso di una versione meno recente del pacchetto %s (%s => "
 "%s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "sto ignorando il pacchetto: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"

lib/libalpm/po/kk.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-06-07 09:22+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh\n"
@@ -446,6 +446,10 @@ msgstr "%s-%s ескірмеді --  қайта орнатылады\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "дестенің нұсқасын төмендету %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "мақсатты аттап өту: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "дестелердің шешілмейтін ерегісі табылды\n"

lib/libalpm/po/libalpm.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -443,6 +443,10 @@ msgstr ""
 msgid "downgrading package %s (%s => %s)\n"
 msgstr ""
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr ""
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""

lib/libalpm/po/nb.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2009-10-04 17:09+0200\n"
 "Last-Translator:  <maister@archlinux.us>\n"
 "Language-Team: Language libalpm\n"
@@ -444,6 +444,10 @@ msgstr "%s-%s er allerede oppdatert -- installerer på nytt\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "nedgraderer pakke %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "hopper over mål: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "uløselige pakkekonflikter oppdaget\n"

lib/libalpm/po/pl.po

@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -449,6 +449,10 @@ msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "dezaktualizowanie pakietu %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "Pomijam cel: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "odkryto nierozwiązywalne konflikty pakietów\n"

lib/libalpm/po/pt.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-08-31 18:25+0100\n"
 "Last-Translator: \n"
 "Language-Team: Gaspar Santos aka ArchGalileu <omeuviolino@gmail.com>\n"
@@ -453,6 +453,10 @@ msgstr "%s-%s está actualizado -- a reinstalar\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "a fazer downgrade do pacote %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "ignorar alvo: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "detectado conflito entre pacotes sem solução\n"

lib/libalpm/po/pt_BR.po

@@ -12,7 +12,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -455,6 +455,10 @@ msgstr "%s-%s está atualizado -- reinstalando\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "fazendo downgrade do pacote %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "pulando alvo: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "conflito de pacotes não solucionável detectado\n"

lib/libalpm/po/ro.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -449,6 +449,10 @@ msgstr "%s-%s este actualizat -- se reinstalează\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "se declasează pachetul %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "se sare peste ținta: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "au fost detectate conflicte nerezolvabile în pachet\n"

lib/libalpm/po/ru.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-06-06 10:07+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -448,6 +448,10 @@ msgstr "%s-%s не устарел -- переустанавливается\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "откат версии пакета %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "пропуск цели: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "обнаружен неразрешимый конфликт пакетов\n"

lib/libalpm/po/sk.po

@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-07-27 22:56+0200\n"
 "Last-Translator: Jozef Říha <jose1711@gmail.com>\n"
 "Language-Team: Slovak\n"
@@ -445,6 +445,10 @@ msgstr "%s-%s je aktuálny -- preinštalovávam\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "downgradujem balíček %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "preskakujem cieľ: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "zistený konflikt nerozlíšiteľných balíčkov\n"

lib/libalpm/po/sv.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-09-03 13:00+0200\n"
 "Last-Translator: Tobias Eriksson <tobier@tobier.se>\n"
 "Language-Team: Swedish\n"
@@ -444,6 +444,10 @@ msgstr "%s-%s är senaste versionen -- återinstallerar\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "nedgraderar paketet %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "hoppar över målet: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "olösliga paketkonflikter upptäckta\n"

lib/libalpm/po/tr.po

@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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 <archlinux@archlinux.org.tr>\n"
@@ -445,6 +445,10 @@ msgstr "%s-%s güncel -- yeniden kuruluyor\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "%s paketi eski sürümüne çevriliyor (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "hedef atlanıyor: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "çözülemeyen paket çakışmaları bulundu\n"

lib/libalpm/po/uk.po

@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\n"
 "PO-Revision-Date: 2010-06-13 20:08+0300\n"
 "Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
 "Language-Team: Ukrainian (archlinux.org.ua) <>\n"
@@ -446,6 +446,10 @@ msgstr "%s-%s не потребує оновлення -- перевстанов
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "пониження версії пакунку %s (%s => %s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "пропуск пакунка: %s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "виявлені нерозв'язні конфлікти пакунків\n"

lib/libalpm/po/zh_CN.po

@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2011-01-21 10:47-0600\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"
@@ -446,6 +446,10 @@ msgstr "%1$s-%2$s 已经为最新 -- 重新安装\n"
 msgid "downgrading package %s (%s => %s)\n"
 msgstr "正在降级软件包 %1$s (%2$s => %3$s)\n"
 
+#, c-format
+msgid "skipping target: %s\n"
+msgstr "正在跳过软件包：%s\n"
+
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "检测到未解决的软件包冲突\n"

lib/libalpm/sync.c

@@ -248,29 +248,15 @@ static int sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
 	return(0);
 }
 
-static int sync_target(alpm_list_t *dbs_sync, char *target)
+static int sync_group(alpm_list_t *dbs_sync, const 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;
@@ -279,6 +265,18 @@ static int sync_target(alpm_list_t *dbs_sync, char *target)
 			found = 1;
 			for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
 				pmpkg_t *pkg = j->data;
+
+				/* check if group member is ignored */
+				if(_alpm_pkg_should_ignore(pkg)) {
+					int install = 0;
+					QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg,
+							NULL, NULL, &install);
+					if(install == 0) {
+						_alpm_log(PM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg));
+						continue;
+					}
+				}
+
 				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 */
@@ -305,6 +303,28 @@ static int sync_target(alpm_list_t *dbs_sync, char *target)
 	return(0);
 }
 
+static int sync_target(alpm_list_t *dbs_sync, const char *target)
+{
+	pmpkg_t *spkg;
+	pmdepend_t *dep; /* provisions and dependencies are also allowed */
+
+	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));
+	}
+
+	return(sync_group(dbs_sync, target));
+}
+
 /** 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)

src/pacman/pacman.c

@@ -176,7 +176,7 @@ static void version(void)
 {
 	printf("\n");
 	printf(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
-	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2006-2010 Pacman Development Team\n");
+	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2006-2011 Pacman Development Team\n");
 	printf("\\  '-. '-'  '-'  '-'   Copyright (C) 2002-2006 Judd Vinet\n");
 	printf(" '--'\n");
 	printf(_("                       This program may be freely redistributed under\n"
@@ -218,10 +218,10 @@ static void setarch(const char *arch)
 	if (strcmp(arch, "auto") == 0) {
 		struct utsname un;
 		uname(&un);
-		pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", un.machine);
+		pm_printf(PM_LOG_DEBUG, "config: Architecture: %s\n", un.machine);
 		alpm_option_set_arch(un.machine);
 	} else {
-		pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", arch);
+		pm_printf(PM_LOG_DEBUG, "config: Architecture: %s\n", arch);
 		alpm_option_set_arch(arch);
 	}
 }

test/pacman/pmdb.py

@@ -38,16 +38,14 @@ def _mkfilelist(files):
         usr/local/bin/
         usr/local/bin/dummy
     """
-    i = []
+    file_list = set()
     for f in files:
         dir = getfilename(f)
-        i.append(dir)
+        file_list.add(dir)
         while "/" in dir:
             [dir, tmp] = dir.rsplit("/", 1)
-            if not dir + "/" in files:
-                i.append(dir + "/")
-    i.sort()
-    return i
+            file_list.add(dir + "/")
+    return sorted(file_list)
 
 def _mkbackuplist(backup):
     """

test/pacman/tests/ignore007.py

@@ -0,0 +1,21 @@
+self.description = "Sync group with ignored packages"
+
+pkg1 = pmpkg("package1")
+pkg1.groups = ["grp"]
+self.addpkg2db("sync", pkg1)
+
+pkg2 = pmpkg("package2")
+pkg2.groups = ["grp"]
+self.addpkg2db("sync", pkg2)
+
+pkg3 = pmpkg("package3")
+pkg3.groups = ["grp"]
+self.addpkg2db("sync", pkg3)
+
+self.option["IgnorePkg"] = ["package1"]
+self.args = "--ask=1 -S grp"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=%s" % pkg1.name)
+self.addrule("PKG_EXIST=%s" % pkg2.name)
+self.addrule("PACMAN_OUTPUT=IgnorePkg")