- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] zsh_completion: Add proper completion for --ignore and --ignoregroup
by Nezmer 15 Dec '09

15 Dec '09

This patch provides proper comma-separated completions for --ignore and --ignoregroup Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- contrib/zsh_completion | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..b27261f 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -86,9 +86,9 @@ _pacman_opts_sync_modifiers=( '-w[Download packages only]' '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package: - _pacman_completions_all_packages' - '*--ignoregroup[Ignore a group upgrade]:package group: - _pacman_completions_all_groups' + _pacman_completions_ignore_packages' + '*--ignoregroup[Ignore a group upgrade]:group: + _pacman_completions_ignore_groups' '--asdeps[Install packages as non-explicitly installed]' '--asexplicit[Install packages as explicitly installed]' ) @@ -240,6 +240,29 @@ _pacman_completions_all_packages() { fi } +# provides comma-separated completions for packages available from repositories +# to be used with --ignore +_pacman_completions_ignore_packages() { + local -a cmd packages repositories packages_long + + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted packages expl "packages" _values -s "," compadd - "${(@)packages}" +} + +# provides comma-separated completions for package groups to be used +# with --ignoregroup +_pacman_completions_ignore_groups() { + local -a cmd groups + _pacman_get_command + groups=($(pacman -Sg)) + typeset -U groups + _wanted groups expl "groups" _values -s "," compadd - "${(@)groups}" +} + # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups -- 1.6.5.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.3-1-g335627d
by dan＠archlinux.org 15 Dec '09

15 Dec '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, maint has been updated via 335627d72dd5e51201b4cd53d84b70954946c013 (commit) from e09253d15b879f3375d57efd656e687a984ebc36 (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 335627d72dd5e51201b4cd53d84b70954946c013 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 16:06:42 2009 +0200 makepkg: check for non-empty pkgbase instead of pkgname pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: move pacman calls to a function
by Cedric Staniewski 14 Dec '09

14 Dec '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- I'm not sure about that part pmout=$(run_pacman -T "$@") for two reasons. First, we have to work around sudo in run_pacman, and second, most of the pacman wrappers does not support -T or do not return the same codes as pacman does. For this second reason, the following patch would be (currently) useless for the majority of pacman wrapper users. scripts/makepkg.sh.in | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fbcdc70..cfc5736 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -328,10 +328,21 @@ download_file() { fi } +run_pacman() { + local ret=0 + if (( ! ASROOT )) && [[ $1 != -T ]]; then + sudo pacman $PACMAN_OPTS "$@" || ret=$? + else + pacman $PACMAN_OPTS "$@" || ret=$? + fi + return $ret +} + check_deps() { [ $# -gt 0 ] || return - pmout=$(pacman $PACMAN_OPTS -T "$@") + local ret=0 + pmout=$(run_pacman -T "$@") ret=$? if [ $ret -eq 127 ]; then #unresolved deps echo "$pmout" @@ -356,15 +367,8 @@ handle_deps() { if [ "$DEP_BIN" -eq 1 ]; then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" - local ret=0 - - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - else - pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - fi - if [ $ret -ne 0 ]; then + if ! run_pacman -S --asdeps $deplist; then error "$(gettext "Pacman failed to install missing dependencies.")" exit 1 # TODO: error code fi @@ -422,15 +426,9 @@ remove_deps() { done msg "Removing installed dependencies..." - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? - else - pacman $PACMAN_OPTS -Rns $deplist || ret=$? - fi # Fixes FS#10039 - exit cleanly as package has built successfully - if [ $ret -ne 0 ]; then + if ! run_pacman -Rns $deplist; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -1113,14 +1111,7 @@ install_package() { fi done - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - else - pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - fi - - if [ $ret -ne 0 ]; then + if ! run_pacman -U $pkglist; then warning "$(gettext "Failed to install built package(s).")" return 0 fi -- 1.6.5.2

4 41

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-114-ga6cca6e
by dan＠archlinux.org 14 Dec '09

14 Dec '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 a6cca6e456e9b84362e00b5e5209059a20df965c (commit) via 9fe27b068ae40a407fd5dd12f974d84499d41ef0 (commit) via 05ff276eefc51eeeee58832accd8398eac047037 (commit) via 66c6d288fd44b2f148860c7abbd1ed56b31a9238 (commit) via b805fe58ae8e762f2d663cb6416005521b76e182 (commit) via a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec (commit) via b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 (commit) via 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d (commit) via 444ff9564195223e31d445459009fceb2ae79002 (commit) via e612eb6ba227104761b9c6fafe375c74267bba09 (commit) via 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 (commit) via 03f35b1432675f5b10ec53945e48c2bbd7c628e9 (commit) from f2c9e51eb00edb2f3123bd150fd9944c765426e0 (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 a6cca6e456e9b84362e00b5e5209059a20df965c Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:05:39 2009 +0100 makepkg: remove srclinks directory on error exit When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9fe27b068ae40a407fd5dd12f974d84499d41ef0 Author: Nezmer <Nezmer(a)allurelinux.org> Date: Sat Dec 12 01:25:32 2009 +0200 makepkg: skip devel_check() when repackaging Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> [Allan: adjusted comment] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05ff276eefc51eeeee58832accd8398eac047037 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:33 2009 +0100 makepkg: limit sudo usage to allowed pacman commands This is particularly useful when using pacman wrappers which call sudo by themselves and therefore should not be run as root. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 66c6d288fd44b2f148860c7abbd1ed56b31a9238 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:32 2009 +0100 makepkg: allow to specify an alternative pacman command If PACMAN environment variable is set, makepkg will try to use this command to check for installed dependencies and to install or remove packages. Otherwise, makepkg will fall back to pacman. Implements FS#13028. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: move envvar section in manpage] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b805fe58ae8e762f2d663cb6416005521b76e182 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 25 13:57:20 2009 +1000 makepkg: check for references to build root in package Add a check that the package does not contain references to the folder it was built in. Fixes FS#14751 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 9 23:20:29 2009 +0100 improve download_internal error messages download_internal is supposed to always set pm_errno but did not in many cases. The most important (and tested) change is the one concerning fetchStat. This is typically where the code will fail when the network is down for example. Before commit d2dbb04a9af7a18da, this fetchStat call did not exist and the same kind of errors would be encountered in the fetchXGet call that follows. I just copied the error printing to restore the old behavior. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:45:34 2009 +0100 add some more sanity check for optarg getopt should already ensure that optarg is not NULL when an argument is required, but just be extra safe and double check it before using optarg. To be honest, I only did that to make clang shut up and eliminate the last warnings it reported. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:20:53 2009 +0100 refactor _parseoptions This function was quite huge (~230 lines) and difficult to parse, now it is slightly better. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 444ff9564195223e31d445459009fceb2ae79002 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 13 16:42:42 2009 +0100 Print error on duplicated database entries Some users reported duplicated database entries in /var/lib/pacman/local/, for example, both foo-1.0-1 and foo-2.0-1 subdirectories existed. (Bogus 3rd-party scripts, backup?) In this case pacman reported no error and its behaviour was mysterious. From now on, pacman detects this situation and prints an error message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e612eb6ba227104761b9c6fafe375c74267bba09 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 13 23:12:44 2009 -0600 Remove trailing whitespace on all lines in list_display This ensures we never have trailing whitespace. Take the following text, with line numbers added for clarity: 1. Title : item1 item2 item3 item4 2. item5 item6 item7 item8 3. item9 itemA itemB itemC Laszlo Papp helpfully pointed out we would have two trailing spaces on line three after the last item. However, we also had these trailing spaces on lines one and two, which the initial patch didn't take care of. This can be seen on something like `pacman -Qi glibc`. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 7 22:48:59 2009 -0600 Fix requiredby output This is a bit embarrassing. For example: $ pacman -Qi mesa ... Required By : mesa mesa mesa mesa mesa mesa Something is clearly not right, and the problem was introduced in commit 0bc961. Fix the issue by getting the package name off the correct variable. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03f35b1432675f5b10ec53945e48c2bbd7c628e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 30 22:56:44 2009 -0600 bash_completion: use absolute paths to utilities Fixes issues noted in FS#16630. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 28 ++-- doc/makepkg.8.txt | 9 ++ lib/libalpm/be_files.c | 7 + lib/libalpm/dload.c | 10 +- lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 33 +++-- src/pacman/pacman.c | 324 +++++++++++++++++++++++++++-------------------- src/pacman/util.c | 10 +- 8 files changed, 251 insertions(+), 172 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove trailing whitespaces in the output for -Qi/-Si
by Laszlo Papp 14 Dec '09

14 Dec '09

--- src/pacman/util.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 115b367..e23d96d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -446,8 +446,11 @@ void list_display(const char *title, const alpm_list_t *list) for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = string_length(str); - /* two additional spaces are added to the length */ - s += 2; + /* two additional spaces are added to the length, if this is not the + * last element in the list */ + if (alpm_list_next(i)) { + s += 2; + } int maxcols = getcols(); if(s + cols > maxcols && maxcols > 0) { int j; @@ -457,7 +460,11 @@ void list_display(const char *title, const alpm_list_t *list) printf(" "); } } - printf("%s ", str); + if (alpm_list_next(i)) { + printf("%s ", str); + } else { + printf("%s", str); + } cols += s; } printf("\n"); -- 1.6.5.5

4 3

[pacman-dev] [PATCH] makepkg: improve removal of installed dependencies
by Allan McRae 14 Dec '09

14 Dec '09

Compare a list of packages on the system before and after dependency resolution in order to get a complete list of packages to remove. This allows makepkg to remove packages installed due to provides. Bail in cases where packages that were on the system originally have been removed as there is a risk of breaking the system when removing the new packages Fixes FS#15144 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This moves the generation of the installed package list to directly after the installation of deps to prevent issues if the user installs packages while the build is occurring: http://bugs.archlinux.org/task/15144#comment53938 Rebased on Cedric's run_pacman and $PACMAN patches. doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 39 +++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ad27bca..168b369 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -166,9 +166,9 @@ Environment Variables --------------------- *PACMAN*:: The command that will be used to check for missing dependencies and to - install and remove packages. Pacman's -U, -T, -S and -Rns operations - must be supported by this command. If the variable is not set or - empty, makepkg will fall back to `pacman'. + 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'. Additional Features diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c730150..5743ea4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,8 +27,10 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed, tput (ncurses) +# bsdtar (libarchive), bzip2, coreutils, diff (diffutils), fakeroot, +# find (findutils), getopt (util-linux), gettext, grep, gzip, openssl, +# sed, tput (ncurses) + # gettext initialization export TEXTDOMAIN='pacman' @@ -343,7 +345,7 @@ download_file() { run_pacman() { local ret=0 - if (( ! ASROOT )) && [[ $1 != "-T" ]] && sudo -l $PACMAN &>/dev/null; then + if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]] && sudo -l $PACMAN &>/dev/null; then sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? else $PACMAN $PACMAN_OPTS "$@" || ret=$? @@ -398,7 +400,6 @@ handle_deps() { } resolve_deps() { - # $pkgdeps is a GLOBAL variable, used by remove_deps() local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 @@ -408,7 +409,6 @@ resolve_deps() { fi if handle_deps $deplist; then - pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" [[ -z $deplist ]] && return $R_DEPS_SATISFIED @@ -425,23 +425,25 @@ resolve_deps() { return $R_DEPS_MISSING } -# fix flyspray bug #5923 remove_deps() { - # $pkgdeps is a GLOBAL variable, set by resolve_deps() (( ! RMDEPS )) && return - [[ -z $pkgdeps ]] && return - local dep depstrip deplist - deplist="" - for dep in $pkgdeps; do - depstrip="${dep%%[<=>]*}" - deplist="$deplist $depstrip" - done + # check for packages removed during dependency install (e.g. due to conflicts) + # removing all installed packages is risky in this case + if (( $(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | grep "<" | wc -l) > 0 )); then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 + fi - msg "Removing installed dependencies..." + local deplist=($(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | grep ">")) + deplist=(${deplist[@]#>}) + [ ${#deplist[@]} -eq 0 ] && return + msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully - if ! run_pacman -Rns $deplist; then + if ! run_pacman -Rn ${deplist[@]}; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -1874,14 +1876,13 @@ if (( SOURCEONLY )); then exit 0 fi -# fix flyspray bug #5973 if (( NODEPS || NOBUILD || REPKG )); then # no warning message needed for nobuild, repkg if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p "${PACMAN%% *}") ]; then - unset pkgdeps # Set by resolve_deps() and used by remove_deps() + original_pkglist=($(run_pacman -Qq)) # required by remove_deps deperr=0 msg "$(gettext "Checking Runtime Dependencies...")" @@ -1890,6 +1891,8 @@ elif [ $(type -p "${PACMAN%% *}") ]; then msg "$(gettext "Checking Buildtime Dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + current_pkglist=($(run_pacman -Qq)) # required by remove_deps + if (( deperr )); then error "$(gettext "Could not resolve all dependencies.")" exit 1 -- 1.6.5.3

2 3

[pacman-dev] pacman cold caches performance, too much stat()ing
by Dimitrios Apostolou 13 Dec '09

13 Dec '09

Hello list, I have been investigating the slow performance of pacman regarding the cold caches scenario and I'm trying to write some proof of concept code that improves things a lot for some cases. However I need your help regarding some facts I might have misunderstood, and any pointers to the source code you also give me would also help a lot. I wouldn't like to lose time changing stuff that would break current functionality. So here are some first questions that come to mind, just by using strace: When doing "pacman -Q blah" I can see that besides the getdents() syscalls in /var/lib/pacman/local (probably caused by readdir()), there are also stat() and access() calls for every single subdirectory. Why are the last ones necessary? Isn't readdir enough? The same goes when doing "pacman -S blah". But in that case it stat()'s both 'local' and 'sync' directories, so worst case is really bad, it will stat() all contents of local, core, extra and community... In the case of "pacman -S" I measured that a great deal of time goes also to reading the "depends" files of all packages in local, please enlighten me what this is for. I have thought of a new way to store dependencies that should improve things, but I should first be sure it doesn't break anything and get some measurements myself. Thanks in advance, Dimitris P.S. Is there some option --pretend I might have missed? What I need is to get exactly the same actions of "pacman -S blah" or "pacman -Su" until the Y/N prompt, as non-root user.

5 18

[pacman-dev] [RFC] Package parser in python
by Allan McRae 13 Dec '09

13 Dec '09

Hi, This is one part of the makepkg test suite I am working on. It is fairly a simple class that takes a pacman package filename and does some parsing. Currently that involves getting the file list and the info from the .PKGINFO file. I am still fairly new to python so I am looking for comments on how this could be improved. One idea I have had is to not initialize all the fields in the pkginfo dict and add a test if an array exists before appending. It would make the code tidier but that would mean the need to test if the field exists when comparing it later. --- #!/usr/bin/env python3 import os, tarfile class package: ''' parse information from a pacman package member variables: file (string) - name of package file file_list (array) - list of files in the package archive pkginfo (dict) - package information parsed from .PKGINFO ''' def __init__ (self, file): self.file = file if not os.path.exists(file): raise IOError('{} does not exist'.format(file)) if not tarfile.is_tarfile(file): raise TypeError('{} is not a tar file'.format(file)) pkg = tarfile.open(file) self.file_list = pkg.getnames() if not ".PKGINFO" in self.file_list: raise TypeError('{} is not a package file'.format(file)) self.__parse_pkginfo(pkg) pkg.close() def __parse_pkginfo(self, pkg): self.pkginfo = {} self.pkginfo['pkgname'] = "" self.pkginfo['pkgbase'] = "" self.pkginfo['pkgver'] = "" self.pkginfo['pkgdesc'] = "" self.pkginfo['url'] = "" self.pkginfo['builddate'] = "" self.pkginfo['packager'] = "" self.pkginfo['size'] = "" self.pkginfo['arch'] = "" self.pkginfo['force'] = "" self.pkginfo['license'] = [] self.pkginfo['replaces'] = [] self.pkginfo['group'] = [] self.pkginfo['depend'] = [] self.pkginfo['optdepend'] = [] self.pkginfo['conflict'] = [] self.pkginfo['provides'] = [] self.pkginfo['backup'] = [] self.pkginfo['makepkgopt'] = [] arrays = ['license', 'replaces', 'group', 'depend', 'optdepend', 'conflict', 'provides', 'backup', 'makepkgopt'] pkginfo = pkg.extractfile(".PKGINFO") for line in pkginfo: if (line[0] == '#'.encode('utf-8')[0]): continue (key, value) = line.decode('utf-8').split(" = ") if key in arrays: self.pkginfo[key].append(value.strip()) else: self.pkginfo[key] = value.strip() pkginfo.close() if __name__ == '__main__': pkg = package('/var/cache/pacman/pkg/pacman-3.3.1-1-i686.pkg.tar.gz') print('Package file: \n\t{}\n'.format(pkg.file)) print('Package info: \n\t{}\n'.format(pkg.pkginfo)) print('File list: \n\t{}\n'.format(pkg.file_list)) --- Example output: > python3 package.py Package file: /var/cache/pacman/pkg/pacman-3.3.1-1-i686.pkg.tar.gz Package info: {'license': ['GPL'], 'backup': ['etc/pacman.conf', 'etc/makepkg.conf'], 'replaces': [], 'pkgname': 'pacman', 'builddate': '1253674558', 'pkgdesc': 'A library-based package manager with dependency support', 'makepkgopt': ['strip', '!docs', '!libtool', 'emptydirs', 'zipman', 'purge'], 'url': 'http://www.archlinux.org/pacman/', 'optdepend': ['fakeroot: for makepkg usage as normal user', 'python: for rankmirrors script usage'], 'depend': ['bash', 'libarchive>=2.7.0-2', 'libfetch>=2.20', 'pacman-mirrorlist'], 'group': ['base'], 'pkgbase': '', 'provides': [], 'force': '', 'packager': 'Dan McGee <dan(a)archlinux.org>', 'size': '2093056', 'arch': 'i686', 'conflict': [], 'pkgver': '3.3.1-1'} File list: ['.PKGINFO', '.INSTALL', 'etc', 'etc/makepkg.conf', 'etc/pacman.conf', 'etc/bash_completion.d', 'etc/bash_completion.d/pacman', 'usr', 'usr/include', 'usr/share', 'usr/bin', 'usr/lib', 'usr/lib/libalpm.so.4', 'usr/lib/libalpm.so.4.0.1', 'usr/lib/libalpm.so', 'usr/lib/libalpm.a', ....

5 13

[pacman-dev] [PATCH] makepkg: remove srclinks directory on error exit
by Cedric Staniewski 12 Dec '09

12 Dec '09

When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..b618881 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -118,6 +118,7 @@ trap_exit() { echo error "$@" fi + [[ -n $srclinks ]] && rm -rf "$srclinks" exit 1 } -- 1.6.5.3

3 5

[pacman-dev] [PATCH] Skip devel_check() when repackaging
by Nezmer 12 Dec '09

12 Dec '09

Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..0e18e3f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1265,7 +1265,7 @@ devel_check() { # Do not update pkgver if --holdver is set, when building a source package, # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if (( HOLDVER || SOURCEONLY )) \ + if (( HOLDVER || SOURCEONLY || REPKG )) \ || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi -- 1.6.5.5

2 1