- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] makepkg: Move .PKGINFO creation into a function.
by Loui Chang 21 Jun '09

21 Jun '09

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- scripts/makepkg.sh.in | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 433fe34..d396480 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,22 +871,13 @@ tidy_install() { fi } -create_package() { +write_pkginfo() { if [ -z "$1" ]; then nameofpkg="$pkgname" else nameofpkg="$1" fi - if [ ! -d "$pkgdir" ]; then - error "$(gettext "Missing pkg/ directory.")" - plain "$(gettext "Aborting...")" - exit 1 # $E_MISSING_PKGDIR - fi - - cd "$pkgdir" - msg "$(gettext "Creating package...")" - local builddate=$(date -u "+%s") if [ -n "$PACKAGER" ]; then local packager="$PACKAGER" @@ -951,6 +942,19 @@ create_package() { fi fi done +} + +create_package() { + if [ ! -d "$pkgdir" ]; then + error "$(gettext "Missing pkg/ directory.")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_PKGDIR + fi + + write_pkginfo $@ + + cd "$pkgdir" + msg "$(gettext "Creating package...")" # TODO maybe remove this at some point # warn if license array is not present or empty -- 1.6.3.2

2 3

[pacman-dev] [PATCH] add makedepends to package and database
by Pierre Schmitz 17 Jun '09

17 Jun '09

Hi, I think it would be nice to have information about makedepnds available in each pacakge and the pacakge database. Think about rebuilds (statically linked) or the question if a certain package can be (re)moved. -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

4 20

[pacman-dev] [PATCH] Document the .pacnew extension with NoUpgrade
by Nagy Gabor 17 Jun '09

17 Jun '09

>From c62951e21bd61982be4bae2dc5bdbd0651ab53f9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 16 Jun 2009 12:34:16 +0200 Subject: [PATCH] Document the .pacnew extension with NoUpgrade See FS#13832. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.conf.5.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 2f1fe3d..a1c1f2a 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -113,7 +113,8 @@ Options *NoUpgrade =* file ...:: All files listed with a `NoUpgrade` directive will never be touched during - a package install/upgrade. + a package install/upgrade, and the new files will be installed with a + '.pacnew' extension. These files refer to files in the package archive, so do not include the leading slash (the RootDir) when specifying them. -- 1.6.0.3

1 0

[pacman-dev] [PATCH] repo-add: use bsdtar optimization for better performance
by Dan McGee 17 Jun '09

17 Jun '09

When unzipping packages and the database archives, we don't need to look through the entire archive to do what we need to do. For packages, .PKGINFO should only be found once and should be the first file in the package. For the database check, we only really need to look for one desc file. The bsdtar -q option is very similar to the GNU tar --occurrence=1 option. Example of speedup: $ time repo-add junkdb.db.tar.gz *.pkg.tar.gz >/dev/null real 0m16.159s user 0m14.836s sys 0m2.277s $ time ./scripts/repo-add junkdb.db.tar.gz *.pkg.tar.gz >/dev/null real 0m4.949s user 0m3.730s sys 0m2.093s Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7c12aaf..5454fb0 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -193,7 +193,7 @@ db_write_entry() # read info from the zipped package local line var val - for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | + for line in $(bsdtar -xOqf "$pkgfile" .PKGINFO | grep -v '^#' | sed 's|$\w*$\s*=\s*$.*$|\1 \2|'); do # bash awesomeness here- var is always one word, val is everything else var=${line%% *} @@ -305,7 +305,7 @@ check_repo_db() fi if [ -f "$REPO_DB_FILE" ]; then - if ! (bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"); then + if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' 2>&1 >/dev/null; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi @@ -351,7 +351,7 @@ add() fi pkgfile=$1 - if ! bsdtar -tf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then + if ! bsdtar -tqf "$pkgfile" .PKGINFO 2>&1 >/dev/null; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" return 1 fi -- 1.6.3.2

3 2

[pacman-dev] wanted: script to list uninstalled optdepends and packages that need them
by Allan McRae 16 Jun '09

16 Jun '09

Hi all, I had a thought today that a script to list package that are optdepends but not installed could be quite useful... I have not written one, but thought it would be good for pacman-contrib if someone wanted to contribute. Example output: tk - optional for: ruby - for Ruby/TK python - for IDLE, pynche and modulator fakeroot - optional for: pacman - for makepkg usage as normal user So get script writing! Preferably in bash or perl (which the current scripts use). Allan

6 15

[pacman-dev] [PATCH] Update the documentation of -Qs and -Ss
by Nagy Gabor 14 Jun '09

14 Jun '09

>From 26a3d52910e8c04794789bf2da7855a056a5886f Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 14 Jun 2009 21:00:07 +0200 Subject: [PATCH] Update the documentation of -Qs and -Ss It was undocumented that multiple regexps are interpreted using logical AND. Thanks to Recursive@#archlinux for his help. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index ca674ea..c8bedd2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -233,7 +233,9 @@ Query Options[[QO]] *-s, \--search* <'regexp'>:: This will search each locally-installed package for names or - descriptions that match `regexp`. + descriptions that match `regexp`. When you include multiple search + terms, only packages with descriptions matching ALL of those terms will + be returned. *-t, \--unrequired*:: Restrict or filter output to packages not required by any currently @@ -317,7 +319,9 @@ linkman:pacman.conf[5]. *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or - descriptions that match `regexp`. + descriptions that match `regexp`. When you include multiple search + terms, only packages with descriptions matching ALL of those terms will + be returned. *-u, \--sysupgrade*:: Upgrades all packages that are out of date. Each currently-installed -- 1.6.0.3

1 0

[pacman-dev] [PATCH] Search package groups when searching a DB
by Dan McGee 13 Jun '09

13 Jun '09

See FS#13099. This makes sense especially for the pacman frontend, as we show groups in the search output. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/db.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..4bd55d2 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -397,10 +397,10 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) else if (desc && regexec(&reg, desc, 0, 0, 0) == 0) { matched = desc; } - /* check provides */ /* TODO: should we be doing this, and should we print something * differently when we do match it since it isn't currently printed? */ - else { + if(!matched) { + /* check provides */ for(k = alpm_pkg_get_provides(pkg); k; k = k->next) { if (regexec(&reg, k->data, 0, 0, 0) == 0) { matched = k->data; @@ -408,6 +408,15 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) } } } + if(!matched) { + /* check groups */ + for(k = alpm_pkg_get_groups(pkg); k; k = k->next) { + if (regexec(&reg, k->data, 0, 0, 0) == 0) { + matched = k->data; + break; + } + } + } if(matched != NULL) { _alpm_log(PM_LOG_DEBUG, " search target '%s' matched '%s'\n", -- 1.6.3.2

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-178-gf250b03
by dan＠archlinux.org 13 Jun '09

13 Jun '09

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 f250b034b407d45bb08c7b713b01d25e0bb2b6ee (commit) via ef500b44ce45255da16e18b8e9aa4d43fab359b8 (commit) via 04d5c4294ab5d35cceb149d7c94a4bf3aa6d7a85 (commit) from aa579b843899ccba093f83faa942599ce1110c24 (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 f250b034b407d45bb08c7b713b01d25e0bb2b6ee Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Jun 10 20:22:04 2009 +0200 Enable remove progressbar with -S (conflict resolving) $ sudo pacman -S mc Old output: *********** :: mc conflicts with mc-mp. Remove mc-mp? [Y/n] y ... (1/1) checking for file conflicts [################] 100% (1/1) installing mc [################] 100% New output: *********** :: mc conflicts with mc-mp. Remove mc-mp? [Y/n] y ... (1/1) checking for file conflicts [################] 100% (1/1) removing mc-mp [################] 100% (1/1) installing mc [################] 100% Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef500b44ce45255da16e18b8e9aa4d43fab359b8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 9 14:11:15 2009 +1000 makepkg: fix variable backup/restore for splitpkg The backup and restore of variables that can be overridden while making split packages only dealt with the first element, not the whole array (FS#15010). Adjust the bash voodoo to fix it... Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 04d5c4294ab5d35cceb149d7c94a4bf3aa6d7a85 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 13 23:54:23 2009 +1000 makepkg: fix PKGBUILD sanity check If PKGBUILD was good, the "insane" variable was not defined and so the if statement failed. Simplify and fix this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 1 + scripts/makepkg.sh.in | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix PKGBUILD sanity check
by Allan McRae 13 Jun '09

13 Jun '09

If PKGBUILD was good, the "insane" variable was not defined and so the if statement failed. Simplify and fix this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e2e1604..433fe34 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1630,10 +1630,7 @@ if [ "$(type -t package)" = "function" ]; then fi # check the PKGBUILD for some basic requirements -check_sanity || insane=1 -if [ $insane -eq 1 ]; then - exit 1 -fi +check_sanity || exit 1 # We need to run devel_update regardless of whether we are in the fakeroot # build process so that if the user runs makepkg --forcever manually, we -- 1.6.3.2

2 1

Re: [pacman-dev] [arch-general] Package groups
by Xavier 13 Jun '09

13 Jun '09

On Fri, Jun 12, 2009 at 9:44 PM, Aaron Griffin<aaronmgriffin(a)gmail.com> wrote: > On Fri, Jun 12, 2009 at 2:32 PM, Grigorios Bouzakis<grbzks(a)gmail.com> wrote: >> Is it OK for a package in [community] to be part of a package group? >> AFAIK package groups dont exist in [community] or if they do they are >> not the same >> as the ones in extra. >> eg. http://bugs.archlinux.org/task/15053 >> http://repos.archlinux.org/viewvc.cgi/community/gnome/empathy/PKGBUILD?view… >> empathy gets to be part of gnome-extra > > Yeah, as far as I know, this shouldn't happen, as it breaks "pacman -S > gnome-extra" in a way > I don't think it is a problem. pacman will just ask for each repo if you want to install the packages of the group, but it is fine.

1 0