March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] HELP! - plurals in translation files
by Allan McRae 15 Mar '13

15 Mar '13

It looks like "make update-po" is not adding the plural translations to the po files. e.g. Looking at the removed strings that are stored at the bottom of theses files I see: src/pacman/po/en_GB.po: #~ msgid "%s: %jd total file, " #~ msgid_plural "%s: %jd total files, " #~ msgstr[0] "%s: %jd total file, " #~ msgstr[1] "%s: %jd total files, " #~ msgid "%jd missing file\n" #~ msgid_plural "%jd missing files\n" #~ msgstr[0] "%jd missing file\n" #~ msgstr[1] "%jd missing files\n" Those strings are still needed (all the rest are genuinely removed). Does anyone have any idea why these are not being added to the translation files? Allan

3 4

[pacman-dev] [PATCH] Update POTFILES.in for libalpm and pacman
by Allan McRae 15 Mar '13

15 Mar '13

Be complete with files listed. Comment out files where code is used or heavily based on other projects so will never have translatable strings. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- BAH! The change of importance here is the addition of src/pacman/check.c which has a few strings in it... Sorry translators, I will be uploading po file with these strings tomorrow. lib/libalpm/po/POTFILES.in | 5 +++++ src/pacman/po/POTFILES.in | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lib/libalpm/po/POTFILES.in b/lib/libalpm/po/POTFILES.in index 49e9da1..7f4c297 100644 --- a/lib/libalpm/po/POTFILES.in +++ b/lib/libalpm/po/POTFILES.in @@ -6,6 +6,7 @@ lib/libalpm/add.c lib/libalpm/alpm.c #lib/libalpm/alpm_list.c lib/libalpm/backup.c +#lib/libaplm/base64.c lib/libalpm/be_local.c lib/libalpm/be_package.c lib/libalpm/be_sync.c @@ -16,6 +17,7 @@ lib/libalpm/deps.c lib/libalpm/diskspace.c lib/libalpm/dload.c lib/libalpm/error.c +lib/libalpm/graph.c lib/libalpm/group.c lib/libalpm/handle.c lib/libalpm/log.c @@ -23,6 +25,9 @@ lib/libalpm/log.c lib/libalpm/package.c lib/libalpm/pkghash.c lib/libalpm/remove.c +#lib/libalpm/sha2.c lib/libalpm/sync.c lib/libalpm/trans.c lib/libalpm/util.c +#lib/libalpm/util-common.c +#lib/libalpm/version.c diff --git a/src/pacman/po/POTFILES.in b/src/pacman/po/POTFILES.in index 37abd6c..4c3b358 100644 --- a/src/pacman/po/POTFILES.in +++ b/src/pacman/po/POTFILES.in @@ -1,7 +1,10 @@ # List of source files with translatable strings +# If a file is commented out, it is because it shouldn't have any +# translatable strings # pacman frontend source files src/pacman/callback.c +src/pacman/check.c src/pacman/conf.c src/pacman/database.c src/pacman/deptest.c @@ -12,3 +15,4 @@ src/pacman/remove.c src/pacman/sync.c src/pacman/upgrade.c src/pacman/util.c +#src/pacman/util-common.c -- 1.8.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-27-g66fe80f
by allan＠archlinux.org 15 Mar '13

15 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 66fe80f39bdd30273336d1b9f0ab401d9e49bd25 (commit) via a554e1a46005fc58a40a9f8eb3df48dc5307fdde (commit) via aa550a85f1089ce3f8576dfb39a7a1831ea6fc4f (commit) via a97f792d3c94bcd7d22d8a6b7c7a06c1c623c095 (commit) via 9cd344fb0d9b51125e6e18fb90d6d818c5952b0d (commit) from b2ea5f6860dda8267cc7468e975b073be5321228 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 66fe80f39bdd30273336d1b9f0ab401d9e49bd25 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 15 13:01:45 2013 +1000 repo-add: Update copyright year Also adjust translations. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a554e1a46005fc58a40a9f8eb3df48dc5307fdde Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 15 12:57:02 2013 +1000 Fix typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa550a85f1089ce3f8576dfb39a7a1831ea6fc4f Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 15 12:55:21 2013 +1000 Merge updates from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a97f792d3c94bcd7d22d8a6b7c7a06c1c623c095 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 15 12:17:16 2013 +1000 Remove Indonesian translation I imported this translation from transifex without realising that there was no strings translated despite being "acitve" on transifex for quite some time. Remove it until translation begins... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9cd344fb0d9b51125e6e18fb90d6d818c5952b0d Author: Jason St. John <jstjohn(a)purdue.edu> Date: Wed Mar 13 22:18:59 2013 -0400 Update documentation to use https links for sites that support it The Arch web site now redirects to https links for all subdomains, so it makes sense to use these links in the docs for pacman. Links were changed to use https for a couple other sites that support it as well, such as gnu.org and kernel.org. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD-example.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 24 +- doc/submitting-patches.txt | 4 +- doc/translation-help.txt | 4 +- lib/libalpm/po/LINGUAS | 1 - lib/libalpm/po/el.po | 55 +- lib/libalpm/po/hr.po | 65 +-- lib/libalpm/po/id.po | 609 ---------------------- lib/libalpm/po/sk.po | 49 +- lib/libalpm/po/sr.po | 40 +- lib/libalpm/po/sr(a)latin.po | 40 +- lib/libalpm/po/uk.po | 48 +- scripts/po/LINGUAS | 1 - scripts/po/ar.po | 2 +- scripts/po/ca.po | 6 +- scripts/po/cs.po | 2 +- scripts/po/da.po | 2 +- scripts/po/de.po | 280 ++++------ scripts/po/el.po | 313 ++++-------- scripts/po/en_GB.po | 6 +- scripts/po/eo.po | 2 +- scripts/po/es.po | 233 ++------- scripts/po/fa.po | 2 +- scripts/po/fi.po | 2 +- scripts/po/fr.po | 6 +- scripts/po/gl.po | 2 +- scripts/po/hr.po | 103 ++-- scripts/po/hu.po | 6 +- scripts/po/id.po | 1196 ------------------------------------------- scripts/po/it.po | 6 +- scripts/po/ja.po | 6 +- scripts/po/kk.po | 2 +- scripts/po/ko.po | 2 +- scripts/po/lt.po | 2 +- scripts/po/nb.po | 6 +- scripts/po/nl.po | 2 +- scripts/po/pl.po | 2 +- scripts/po/pt.po | 2 +- scripts/po/pt_BR.po | 2 +- scripts/po/ro.po | 2 +- scripts/po/ru.po | 2 +- scripts/po/sk.po | 246 +++------ scripts/po/sl.po | 2 +- scripts/po/sr.po | 2 +- scripts/po/sr(a)latin.po | 2 +- scripts/po/sv.po | 2 +- scripts/po/tr.po | 6 +- scripts/po/uk.po | 2 +- scripts/po/zh_CN.po | 2 +- scripts/po/zh_TW.po | 2 +- scripts/repo-add.sh.in | 4 +- src/pacman/pacman.c | 2 +- src/pacman/po/LINGUAS | 1 - src/pacman/po/ar.po | 8 +- src/pacman/po/ca.po | 8 +- src/pacman/po/cs.po | 8 +- src/pacman/po/da.po | 8 +- src/pacman/po/de.po | 8 +- src/pacman/po/el.po | 174 +++---- src/pacman/po/en_GB.po | 8 +- src/pacman/po/eo.po | 8 +- src/pacman/po/es.po | 8 +- src/pacman/po/fa.po | 8 +- src/pacman/po/fi.po | 8 +- src/pacman/po/fr.po | 8 +- src/pacman/po/gl.po | 8 +- src/pacman/po/hr.po | 240 ++++----- src/pacman/po/hu.po | 176 +++---- src/pacman/po/id.po | 1206 -------------------------------------------- src/pacman/po/it.po | 8 +- src/pacman/po/ja.po | 178 +++---- src/pacman/po/kk.po | 8 +- src/pacman/po/ko.po | 8 +- src/pacman/po/lt.po | 8 +- src/pacman/po/nb.po | 8 +- src/pacman/po/nl.po | 8 +- src/pacman/po/pacman.pot | 6 +- src/pacman/po/pl.po | 8 +- src/pacman/po/pt.po | 8 +- src/pacman/po/pt_BR.po | 8 +- src/pacman/po/ro.po | 195 +++---- src/pacman/po/ru.po | 8 +- src/pacman/po/sk.po | 164 +++--- src/pacman/po/sl.po | 8 +- src/pacman/po/sr.po | 8 +- src/pacman/po/sr(a)latin.po | 8 +- src/pacman/po/sv.po | 8 +- src/pacman/po/tr.po | 8 +- src/pacman/po/uk.po | 172 +++---- src/pacman/po/zh_CN.po | 8 +- src/pacman/po/zh_TW.po | 8 +- 92 files changed, 1312 insertions(+), 4847 deletions(-) delete mode 100644 lib/libalpm/po/id.po delete mode 100644 scripts/po/id.po delete mode 100644 src/pacman/po/id.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] Treat packages to be printed as non-ignored
by Connor Behan 14 Mar '13

14 Mar '13

Calling pacman -Sp is guaranteed not to install a package. So the user's IgnorePkg pref is still respected regardless of whether or not we print the mirror location. Therefore we might as well do so to give as much information as possible. Also fixes an edge case with devtools. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3f1b1c3..c982df5 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1010,6 +1010,13 @@ int parseconfig(const char *file) if((ret = _parseconfig(file, &section, 1, 0))) { return ret; } + + /* #FS#34066 - Querying URLs for packages (even ignored ones) should succeed */ + if(config->print) { + config->ignorepkg = NULL; + config->ignoregrp = NULL; + } + if((ret = setup_libalpm())) { return ret; } -- 1.8.1.5

2 3

[pacman-dev] [PATCH] Update documentation to use https links for sites that support it
by Jason St. John 14 Mar '13

14 Mar '13

From: "Jason St. John" <jstjohn(a)purdue.edu> The Arch web site now redirects to https links for all subdomains, so it makes sense to use these links in the docs for pacman. Links were changed to use https for a couple other sites that support it as well, such as gnu.org and kernel.org. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- doc/PKGBUILD-example.txt | 2 +- doc/footer.txt | 2 +- doc/index.txt | 24 ++++++++++++------------ doc/submitting-patches.txt | 4 ++-- doc/translation-help.txt | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 238c0f4..9ab5dff 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -5,7 +5,7 @@ pkgver=2.5.4 pkgrel=3 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') -url="http://www.gnu.org/software/patch/patch.html" +url="https://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc' 'ed') diff --git a/doc/footer.txt b/doc/footer.txt index 10ef067..ccb931c 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -2,7 +2,7 @@ vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: ///// -See the pacman website at http://www.archlinux.org/pacman/[] for current +See the pacman website at https://www.archlinux.org/pacman/[] for current information on pacman and its related tools. diff --git a/doc/index.txt b/doc/index.txt index a7a82d4..8f1e17d 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -53,11 +53,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/pacman.git/[Git summary page] for the +link:https://projects.archlinux.org/pacman.git/[Git summary page] for the project. See the most recent -link:http://projects.archlinux.org/pacman.git/tree/NEWS[NEWS] +link:https://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. @@ -185,8 +185,8 @@ Development Mailing List ~~~~~~~~~~~~ There is a mailing list devoted to pacman development, hosted by Arch Linux. -link:http://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or -link:http://mailman.archlinux.org/pipermail/pacman-dev/[view the archives]. +link:https://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or +link:https://mailman.archlinux.org/pipermail/pacman-dev/[view the archives]. Source Code ~~~~~~~~~~~ @@ -201,7 +201,7 @@ 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/pacman.git/[cgit]. HTTP/HTTPS URLs are also +link:https://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 @@ -218,17 +218,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://www.archlinux.org/[Arch Linux]. Most of these utilities +extensively in link:https://www.archlinux.org/[Arch Linux]. Most of these utilities are available in the Arch Linux projects -link:http://projects.archlinux.org/[code browser]. +link:https://projects.archlinux.org/[code browser]. Utilities available: -* 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 +* link:https://projects.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download & use the Arch Linux PKGBUILD tree +* link:https://projects.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories +* link:https://projects.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking +* link:https://projects.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python +* link:https://projects.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper Bugs ---- diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt index 3428768..d542265 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -15,8 +15,8 @@ Patches need to be submitted in GIT format and are best if they are against the latest version of the code. There are several helpful tutorials for getting started with GIT if you have not worked with it before. -* http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html -* http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide +* https://www.kernel.org/pub/software/scm/git/docs/gittutorial.html +* https://wiki.archlinux.org/index.php/Super_Quick_Git_Guide The pacman code can be fetched using the following command: diff --git a/doc/translation-help.txt b/doc/translation-help.txt index ef86dbf..7b8134e 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -12,7 +12,7 @@ http://www.transifex.net/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation work, as it describes many of the commands in more detail than I will here: -http://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. In +https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. In addition, this site presents a small tutorial that I found useful: http://oriya.sarovar.org/docs/gettext/[]. @@ -155,7 +155,7 @@ source, please contact the pacman-dev mailing list at mailto:pacman-dev@archlinux.org[]. Some community efforts have been made to translate manpages, and these can be -found in the link:http://aur.archlinux.org[AUR] (Arch User Repository). Please +found in the link:https://aur.archlinux.org[AUR] (Arch User Repository). Please check there first before undergoing a translation effort to ensure you are not duplicating efforts. -- 1.8.1.5

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-22-gb2ea5f6
by allan＠archlinux.org 14 Mar '13

14 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via b2ea5f6860dda8267cc7468e975b073be5321228 (commit) via e42e9ab8733b4bfa4e5a201202a92332f36ba564 (commit) via 0ba9b262abcf5910ccdfe2a2e63878816d4d440d (commit) via 342924f796aa4776f46d5eba181a17b04cef1c13 (commit) via fa620685fac4c209045bee42073cd360b10f465d (commit) via 8c33d7f1efb321652a9f22521df32357487548ba (commit) via f3f257405b6e325317422a73be5ee5710271de00 (commit) via d5a06e964c2b127f192f756f6fef1be76bb0bff8 (commit) via 9ec049f518613315b12ba7ff7a57c81f526e8560 (commit) via 0d99b54ba2957d73c21f761471e54679ba719449 (commit) via 163c36bdcde6aa324060bafe5674ea83cf556fd8 (commit) via 62f828014f17596cf8fb5cd2ea0c34cb754f75cb (commit) via d35a7fb6f36509a53e8b36d4eca03cef9d2c20db (commit) via 6c870953c563c69c7e833637fec292e291511b45 (commit) via 63f04177c3987b5e4562d04ea05c867e56dabb9b (commit) from 1e21aa589d66c56db1c37078c3f1f6ed4095487b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b2ea5f6860dda8267cc7468e975b073be5321228 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 13 14:34:08 2013 +1000 update util-common.h copyright year Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e42e9ab8733b4bfa4e5a201202a92332f36ba564 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 14:48:02 2013 +1000 Make "[removal]" translatable Fixes FS#34241 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0ba9b262abcf5910ccdfe2a2e63878816d4d440d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 14:05:18 2013 +1000 Revert "makepkg: Use a recursive git clone." This reverts commit 8b03b1a8776043978aeac31682f94d65b4f3e514. It is much better to download the submodules using separate source entries and adjust the submodule configs to point at these versions in the prepare() function. See https://mailman.archlinux.org/pipermail/pacman-dev/2013-March/016771.html for an example. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 342924f796aa4776f46d5eba181a17b04cef1c13 Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 22:10:59 2013 -0500 doc: consistent formatting for pacman.conf options Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fa620685fac4c209045bee42073cd360b10f465d Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 22:10:58 2013 -0500 doc: Fix pacman-key title formatting Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8c33d7f1efb321652a9f22521df32357487548ba Author: William Giokas <1007380(a)gmail.com> Date: Mon Mar 11 21:37:38 2013 -0500 doc: Fix pacman.conf formatting Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f3f257405b6e325317422a73be5ee5710271de00 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 12:16:24 2013 +1000 Add compression defaults for lrzip and lzo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5a06e964c2b127f192f756f6fef1be76bb0bff8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Mar 12 12:15:53 2013 +1000 Add Local/RemoteFileSigLevel to example config Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9ec049f518613315b12ba7ff7a57c81f526e8560 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Mar 11 01:40:50 2013 -0400 pacman.conf: Remove empty line at end of file Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d99b54ba2957d73c21f761471e54679ba719449 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Mar 11 01:36:33 2013 -0400 makepkg.conf: Add staticlibs to default OPTIONS array in comments Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 163c36bdcde6aa324060bafe5674ea83cf556fd8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 10 23:01:55 2013 -0500 Save and restore old locale when manipulating via setlocale We shouldn't assume a frontend program didn't explicitly set the LC_TIME setting to a value not in the environment, which is what we previously assumed. Save the old locale before forcing the 'C' locale and restore it when we are done. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62f828014f17596cf8fb5cd2ea0c34cb754f75cb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 10 22:51:11 2013 -0500 Use C locale when parsing UseDelta floating point values We should save the current locale, use the 'C' locale during parsing, then restore the original locale. Config files should always parse regardless of the current user's locale setting. Fixes FS#34253. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d35a7fb6f36509a53e8b36d4eca03cef9d2c20db Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Mar 10 16:42:58 2013 -0400 alpm/remove.c: add newlines to debug output Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c870953c563c69c7e833637fec292e291511b45 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 9 22:45:00 2013 -0500 pkgdelta: fix improper passing of file argument Looks like I hosed this pretty hard in 5a5e712c749edb8. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63f04177c3987b5e4562d04ea05c867e56dabb9b Author: William Giokas <1007380(a)gmail.com> Date: Sat Mar 9 19:01:53 2013 -0600 zsh completion: Add new makepkg opts Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 2 ++ doc/pacman-key.8.txt | 2 +- doc/pacman.conf.5.txt | 4 ++-- etc/makepkg.conf.in | 5 +++-- etc/pacman.conf.in | 3 ++- lib/libalpm/remove.c | 4 ++-- lib/libalpm/util.c | 6 +++++- scripts/makepkg.sh.in | 2 +- scripts/pkgdelta.sh.in | 5 +++-- src/common/util-common.c | 2 +- src/pacman/conf.c | 9 +++++++++ src/pacman/util.c | 4 ++-- 12 files changed, 33 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Treat packages to be printed as non-ignored
by Connor Behan 13 Mar '13

13 Mar '13

Calling pacman -Sp is guaranteed not to install a package. So the user's IgnorePkg pref is still respected regardless of whether or not we print the mirror location. Therefore we might as well do so to give as much information as possible. Also fixes an edge case with devtools. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 7 +++++++ lib/libalpm/handle.h | 1 + lib/libalpm/package.c | 8 +++++++- src/pacman/conf.c | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ccbdd1c..ec5716a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -587,6 +587,7 @@ int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); double alpm_option_get_deltaratio(alpm_handle_t *handle); int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); +int alpm_option_set_print(alpm_handle_t *handle, int print); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..2d914ca 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -594,6 +594,13 @@ int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) return 0; } +int SYMEXPORT alpm_option_set_print(alpm_handle_t *handle, int print) +{ + CHECK_HANDLE(handle, return -1); + handle->print = print; + return 0; +} + alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..413e19a 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -89,6 +89,7 @@ struct __alpm_handle_t { /* options */ char *arch; /* Architecture of packages we should allow */ double deltaratio; /* Download deltas if possible; a ratio value */ + int print; /* Treat pkgs as if they will not be installed anyway */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 098c867..ea82148 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -762,7 +762,8 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) /** Test if a package should be ignored. * * Checks if the package is ignored via IgnorePkg, or if the package is - * in a group ignored via IgnoreGroup. + * in a group ignored via IgnoreGroup. Packages only being printed are + * immune from this. * * @param handle the context handle * @param pkg the package to test @@ -772,6 +773,11 @@ alpm_pkg_t SYMEXPORT *alpm_pkg_find(alpm_list_t *haystack, const char *needle) int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg) { alpm_list_t *groups = NULL; + + /* #FS#34066 - Querying URLs for packages (even ignored ones) should succeed */ + if (handle->print) { + return 0; + } /* first see if the package is ignored */ if(alpm_list_find(handle->ignorepkg, pkg->name, _alpm_fnmatch)) { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..07255cb 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -721,6 +721,7 @@ static int setup_libalpm(void) alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); + alpm_option_set_print(handle, config->print); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); -- 1.8.1.5

3 2

[pacman-dev] [PATCH] Make "[removal]" translatable
by Allan McRae 13 Mar '13

13 Mar '13

Fixes FS#34241 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index cce1a18..238e328 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -903,8 +903,8 @@ static void _display_targets(alpm_list_t *targets, int verbose) pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); } else { - pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove)); + pm_asprintf(&str, "%s-%s [%s]", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove), _("removal")); } names = alpm_list_add(names, str); } -- 1.8.1.5

2 3

[pacman-dev] [PATCH] makepkg: Use a recursive git clone.
by Neer Sighted 12 Mar '13

12 Mar '13

Make makepkg use a recursive clone when creating the working directory. This will initialize submodules --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..9399aa5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -490,7 +490,7 @@ download_git() { pushd "$srcdir" &>/dev/null rm -rf "${dir##*/}" - if ! git clone "$dir"; then + if ! git clone --recursive "$dir"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 1.8.1.4

4 9

[pacman-dev] [PATCH 1/2] doc: Fix pacman-key title formatting
by William Giokas 12 Mar '13

12 Mar '13

Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/pacman-key.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index ceedf83..f454074 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -119,7 +119,7 @@ Options Providing a Keyring for Import[[PK]] ------------------------------- +------------------------------------ A distribution or other repository provided may want to provide a set of PGP keys used in the signing of its packages and repository databases that can be readily imported into the pacman keyring. This is achieved by providing a -- 1.8.2.rc1.24.g06d67b8

2 2