- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/1] dload: use better error message on exceeded file size
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c5a56b5..16bb896 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -493,11 +493,9 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, - _("failed retrieving file '%s' from %s : %s\n"), - payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + _("failed retrieving file '%s' from %s : expected download size exceeded\n"), + payload->remote_name, hostname); } goto cleanup; default: -- 2.1.2

1 0

[pacman-dev] [PATCH 1/1] dload: use better error message on exceeded file size
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> --- lib/libalpm/dload.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c5a56b5..42a71d9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -493,11 +493,10 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + _("expected download size exceeded")); } goto cleanup; default: -- 2.1.2

1 0

[pacman-dev] [PATCH 1/1] dload: use 'partial file' instead of 'filesize exceeded' message
by Christian Hesse 10 Oct '14

10 Oct '14

From: Christian Hesse <mail(a)eworm.de> If the server has a package file that is too big (does not match the recorded file size in repository db file) pacman fails with a 'filesize exceeded' message. This is misleading as it looks like pacman is suffering a local problem, for example ulimit on filesize or the like. This changes the message to 'partial file', which describes the problem a lot better IMHO. --- lib/libalpm/dload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 01fe57e..c819d73 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -491,14 +491,14 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_ABORTED_BY_CALLBACK: /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { - payload->curlerr = CURLE_FILESIZE_EXCEEDED; + payload->curlerr = CURLE_PARTIAL_FILE; payload->unlink_on_fail = 1; handle->pm_errno = ALPM_ERR_LIBCURL; - /* use the 'size exceeded' message from libcurl */ + /* use the 'partial file' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), payload->remote_name, hostname, - curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); + curl_easy_strerror(CURLE_PARTIAL_FILE)); } goto cleanup; default: -- 2.1.2

2 2

[pacman-dev] [PATCH] There are not hooks!
by Allan McRae 10 Oct '14

10 Oct '14

Refer to install scripts as scripts and not hooks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 45741b4..eacf1b3 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -18,7 +18,7 @@ Description ----------- Pacman is a package management utility that tracks installed packages on a Linux system. It features dependency support, package groups, install and uninstall -hooks, and the ability to sync your local machine with a remote repository to +scripts, and the ability to sync your local machine with a remote repository to automatically upgrade packages. Pacman packages are a zipped tar format. Since version 3.0.0, pacman has been the front-end to linkman:libalpm[3], the -- 2.1.2

1 0

[pacman-dev] Help with naming new option for paccache
by Maxim Andersson 09 Oct '14

09 Oct '14

Hi, Been looking into adding a new option for paccache that would remove all uninstalled packages (and at the same time keep the default number of the others). So, paccache -r --removeuninstalled would be the same as running paccache -r && paccache -ruk0 But before sending in my patch/option-proposal, I would like to hear what you think a good option name would be? I think "removeuninstalled" is pretty descriptive, but it's a bit long.. and I wasn't able come up with any good shorter names. Regards, Maxim

3 3

[pacman-dev] [PATCH 1/1] dload: unlink file on filesize exceeded error
by Christian Hesse 09 Oct '14

09 Oct '14

From: Christian Hesse <mail(a)eworm.de> On filesize exceeded error pacman leaves a .part file in cache dir, resulting in this error on next try: error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. Unlink the file on error to avoid this. --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index c5a56b5..01fe57e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -492,6 +492,7 @@ static int curl_download_internal(struct dload_payload *payload, /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; + payload->unlink_on_fail = 1; handle->pm_errno = ALPM_ERR_LIBCURL; /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, -- 2.1.2

1 0

[pacman-dev] [PATCH] pacman-db-upgrade: do not mangle file lists
by Andrew Gregory 06 Oct '14

06 Oct '14

grep'ing out blank lines and sorting output thoroughly breaks any file lists with %BACKUP% entries which must be separated from the file list by a blank line. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Anybody who has replaced an owned directory with a symlink and run pacman-db-upgrade has mangled the file list for all packages with backup files. To check for broken file lists run: `grep -xA1 %BACKUP% /var/lib/pacman/local/*/files | grep -B1 %FILES%` Any file lists with output are broken. Broken file lists can be repaired by reinstalling the affected packages with --dbonly. After repairing, users should remove /var/lib/pacman/local/ALPM_DB_VERSION and run the fixed version of pacman-db-upgrade. scripts/pacman-db-upgrade.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index d2d317b..d7e34bd 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -211,9 +211,9 @@ if [[ -z "$db_version" ]]; then { if ($0 == olddir) { # replace symlink with its target, including parents - printf("%s", parents) - printf("%s\n", newdir) - } else if ($0 == file) { + if (parents) printf("%s", parents) + if (newdir) printf("%s\n", newdir) + } else if (file && $0 == file) { # newdir already existed as a file, skip it } else if (index($0, olddir) == 1) { # update paths that were under olddir @@ -222,7 +222,7 @@ if [[ -z "$db_version" ]]; then # print everything else as-is print } - }' "$f" | grep . | LC_ALL=C sort -u > "$f.tmp" + }' "$f" > "$f.tmp" mv "$f.tmp" "$f" done done -- 2.1.1

3 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-445-g7ee01c8
by allan＠archlinux.org 02 Oct '14

02 Oct '14

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 7ee01c86669327b2af63c8ed9390bcbf071cdac5 (commit) via aec4241af24a1c68dacadb31ae38f05bdccfe799 (commit) via e123e04741e1644ff1aa3e602beed6cb664ecace (commit) via 04e8048725441465788a6c76a326ff252c2fd815 (commit) via 4e263f24c6ed1cc710b7873b9ea37534117247ea (commit) via 13c9745302b11dcee7b1b894d95789a2caf11c9d (commit) via b275e5184ef1acc3f8dd4a02131149a9b58a5828 (commit) via dc339faf6ad0dc07ab33c9f5bbdeecad5a927b6b (commit) via 50296576d006d433fbfd4a6c57d5f95a942f7833 (commit) from 60c1f2857bad53deed4a8849c1d733dc7d526379 (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 7ee01c86669327b2af63c8ed9390bcbf071cdac5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 30 15:00:03 2014 -0400 _alpm_key_in_keychain: cache known keys Implements FS#38042 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit aec4241af24a1c68dacadb31ae38f05bdccfe799 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 30 15:00:32 2014 -0400 check_keyring: skip keys known to be missing Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit e123e04741e1644ff1aa3e602beed6cb664ecace Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Sep 30 14:44:42 2014 -0400 remove retry check from signature validation The retry path was removed by 4ccf16dff589ce9f369d377bb5d3f490bd27c624 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 04e8048725441465788a6c76a326ff252c2fd815 Author: Florian Pritz <bluewind(a)xinu.at> Date: Fri Jul 4 23:12:01 2014 +0200 Add --assume-installed option This allows to ignore specific dependencies. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 4e263f24c6ed1cc710b7873b9ea37534117247ea Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Sep 15 18:06:47 2014 +0200 libalpm: export alpm_splitdep as alpm_dep_from_depstring and alpm_dep_free Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 13c9745302b11dcee7b1b894d95789a2caf11c9d Author: Florian Pritz <bluewind(a)xinu.at> Date: Wed Aug 6 11:36:51 2014 +0200 deps.c: split _alpm_depcmp into _alpm_depcmp_provides This allows to reuse the provision checker for a simple list of provisions without a package. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit b275e5184ef1acc3f8dd4a02131149a9b58a5828 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 8 10:25:51 2014 -0500 table_display: only check width when non-zero A width of 0 indicates that either pacman is not attached to a tty or the user does not want line wrapping. Either way pacman should not fall back to the basic display. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit dc339faf6ad0dc07ab33c9f5bbdeecad5a927b6b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Aug 11 09:43:12 2014 -0400 avoid line wrapping if not in a tty or COLUMNS=0 Scripts that parse pacman's output (like pacsearch) generally do not want wrapped lines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 50296576d006d433fbfd4a6c57d5f95a942f7833 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Sep 25 13:29:13 2014 -0400 makepkg: allow less than the full fingerprint in validpgpkeys I found this feature confusing, and the documentation wasn't any help. It was pointed out to me on IRC that validpgpkeys expects full fingerprints, and won't accept shorter forms. This makes the documentation insufficient, and the variable name itself misleading. This patch bolsters the documentation to explain more about what the contents should be, and implements suffix matching to allow matching on shorters fingerprint suffices. Now, when makepkg tells you that a key ID isn't valid, it's sufficient to manually check the key ID against the known good ID, and add it as is to validpgpkeys. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 4 +- doc/pacman.8.txt | 6 +++ lib/libalpm/alpm.h | 22 +++++++++ lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 10 ++-- lib/libalpm/be_sync.c | 2 +- lib/libalpm/deps.c | 43 ++++++++++------ lib/libalpm/deps.h | 3 +- lib/libalpm/handle.c | 60 +++++++++++++++++++++++ lib/libalpm/handle.h | 5 ++ lib/libalpm/package.c | 2 +- lib/libalpm/signing.c | 6 +++ lib/libalpm/sync.c | 29 +++++------ scripts/makepkg.sh.in | 21 +++++++- src/pacman/conf.c | 18 +++++++ src/pacman/conf.h | 4 +- src/pacman/pacman.c | 4 ++ src/pacman/util.c | 26 ++++++---- test/pacman/tests/TESTS | 3 ++ test/pacman/tests/remove-assumeinstalled.py | 14 ++++++ test/pacman/tests/sync-install-assumeinstalled.py | 11 +++++ test/pacman/tests/sync-update-assumeinstalled.py | 19 +++++++ 22 files changed, 258 insertions(+), 56 deletions(-) create mode 100644 test/pacman/tests/remove-assumeinstalled.py create mode 100644 test/pacman/tests/sync-install-assumeinstalled.py create mode 100644 test/pacman/tests/sync-update-assumeinstalled.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [RFC] git and svn adding --depth option
by Timofey Titovets 01 Oct '14

01 Oct '14

Good time of day, I thinking about adding to makepkg --depth option for speed up git clone and svn checkout command, what used for building packages. I add small patch and i like to hear your opinions, people. From d7195baef241ba8411e834665842c3686a05a6d2 Mon Sep 17 00:00:00 2001 From: Timofey Titovets <nefelim4ag(a)gmail.com> Date: Wed, 1 Oct 2014 01:14:51 +0300 Subject: [PATCH] git/svn source download: added --depth option Signed-off-by: Timofey Titovets <nefelim4ag(a)gmail.com> --- scripts/makepkg.sh.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f949403..0142ba8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -540,9 +540,12 @@ download_git() { url=${url##*git+} url=${url%%#*} + if [[ $FASTGIT != 0 ]]; then + depth="--depth 5" + fi if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --mirror $depth "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -705,10 +708,14 @@ download_svn() { fi url=${url%%#*} + if [[ $FASTSVN != 0 ]]; then + depth="--depth 5" + fi + if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" mkdir -p "$dir/.makepkg" - if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then + if ! svn checkout $depth --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" exit 1 -- 2.1.1

3 2

[pacman-dev] [PATCH] doc/translation-help.txt: Remove link to tutorial on sarovar.org
by Miguel de Val-Borro 30 Sep '14

30 Sep '14

The website sarovar.org has been shut down and the tutorial is not relevant any more. Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 1fdb6e0..52c1e89 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -12,9 +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: -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/[]. +https://www.gnu.org/software/gettext/manual/html_node/gettext.html[]. Translating Messages -- 2.1.1

1 0