November 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] [PATCH] remove: use strcmp for files in skip_remove
by Andrew Gregory 03 Mar '15

03 Mar '15

Paths from noupgrade, the transaction skip_remove, and package backup lists were combined into a single list matched using fnmatch causing paths with glob characters to match unrelated files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 82 ++++++++++-------------- test/pacman/tests/skip-remove-with-glob-chars.py | 19 ++++++ 2 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 test/pacman/tests/skip-remove-with-glob-chars.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index f9b24ef..42978ae 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -317,20 +317,13 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, * * @param handle the context handle * @param file file to be removed - * @param skip_remove list of files that will not be removed * * @return 1 if the file can be deleted, 0 if it cannot be deleted */ -static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, - alpm_list_t *skip_remove) +static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file) { char filepath[PATH_MAX]; - if(_alpm_fnmatch_patterns(skip_remove, file->name) == 0) { - /* return success because we will never actually remove this file */ - return 1; - } - snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); if(file->name[strlen(file->name) - 1] == '/' && @@ -433,30 +426,19 @@ cleanup: * @param oldpkg the package being removed * @param newpkg the package replacing \a oldpkg * @param fileobj file to remove - * @param skip_remove list of files that shouldn't be removed * @param nosave whether files should be backed up * * @return 0 on success, -1 if there was an error unlinking the file, 1 if the * file was skipped or did not exist */ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, - alpm_pkg_t *newpkg, const alpm_file_t *fileobj, alpm_list_t *skip_remove, - int nosave) + alpm_pkg_t *newpkg, const alpm_file_t *fileobj, int nosave) { struct stat buf; char file[PATH_MAX]; snprintf(file, PATH_MAX, "%s%s", handle->root, fileobj->name); - /* check the remove skip list before removing the file. - * see the big comment block in db_find_fileconflicts() for an - * explanation. */ - if(_alpm_fnmatch_patterns(skip_remove, fileobj->name) == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "%s is in skip_remove, skipping removal\n", file); - return 1; - } - if(llstat(file, &buf)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file); return 1; @@ -564,6 +546,24 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, } /** + * @brief Check if a package file should be removed. + * + * @param handle the context handle + * @param newpkg the package replacing the current owner of \a path + * @param path file to be removed + * + * @return 1 if the file should be skipped, 0 if it should be removed + */ +static int _should_skip_file(alpm_handle_t *handle, + alpm_pkg_t *newpkg, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noupgrade, path) == 0 + || alpm_list_find_str(handle->trans->skip_remove, path) + || (newpkg && _alpm_needbackup(path, newpkg) + && alpm_filelist_contains(alpm_pkg_get_files(newpkg), path)); +} + +/** * @brief Remove a package's files, optionally skipping its replacement's * files. * @@ -580,44 +580,19 @@ static int remove_package_files(alpm_handle_t *handle, alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg, size_t targ_count, size_t pkg_count) { - alpm_list_t *skip_remove; alpm_filelist_t *filelist; size_t i; int err = 0; int nosave = handle->trans->flags & ALPM_TRANS_FLAG_NOSAVE; - if(newpkg) { - alpm_filelist_t *newfiles; - alpm_list_t *b; - skip_remove = alpm_list_join( - alpm_list_strdup(handle->trans->skip_remove), - alpm_list_strdup(handle->noupgrade)); - /* Add files in the NEW backup array to the skip_remove array - * so this removal operation doesn't kill them */ - /* old package backup list */ - newfiles = alpm_pkg_get_files(newpkg); - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - const alpm_backup_t *backup = b->data; - /* safety check (fix the upgrade026 pactest) */ - if(!alpm_filelist_contains(newfiles, backup->name)) { - continue; - } - _alpm_log(handle, ALPM_LOG_DEBUG, "adding %s to the skip_remove array\n", - backup->name); - skip_remove = alpm_list_add(skip_remove, strdup(backup->name)); - } - } else { - skip_remove = alpm_list_strdup(handle->trans->skip_remove); - } - filelist = alpm_pkg_get_files(oldpkg); for(i = 0; i < filelist->count; i++) { alpm_file_t *file = filelist->files + i; - if(!can_remove_file(handle, file, skip_remove)) { + if(!_should_skip_file(handle, newpkg, file->name) + && !can_remove_file(handle, file)) { _alpm_log(handle, ALPM_LOG_DEBUG, "not removing package '%s', can't remove all files\n", oldpkg->name); - FREELIST(skip_remove); RET_ERR(handle, ALPM_ERR_PKG_CANT_REMOVE, -1); } } @@ -633,7 +608,17 @@ static int remove_package_files(alpm_handle_t *handle, /* iterate through the list backwards, unlinking files */ for(i = filelist->count; i > 0; i--) { alpm_file_t *file = filelist->files + i - 1; - if(unlink_file(handle, oldpkg, newpkg, file, skip_remove, nosave) < 0) { + + /* check the remove skip list before removing the file. + * see the big comment block in db_find_fileconflicts() for an + * explanation. */ + if(_should_skip_file(handle, newpkg, file->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s is in skip_remove, skipping removal\n", file->name); + continue; + } + + if(unlink_file(handle, oldpkg, newpkg, file, nosave) < 0) { err++; } @@ -644,7 +629,6 @@ static int remove_package_files(alpm_handle_t *handle, percent, pkg_count, targ_count); } } - FREELIST(skip_remove); if(!newpkg) { /* set progress to 100% after we finish unlinking files */ diff --git a/test/pacman/tests/skip-remove-with-glob-chars.py b/test/pacman/tests/skip-remove-with-glob-chars.py new file mode 100644 index 0000000..039e150 --- /dev/null +++ b/test/pacman/tests/skip-remove-with-glob-chars.py @@ -0,0 +1,19 @@ +self.description = "transferred file with glob characters that match a removed file" + +lp = pmpkg("foo") +lp.files = ["foo/b*r", "foo/bar"] +self.addpkg2db("local", lp) + +sp1 = pmpkg("foo", "1.0-2") +self.addpkg(sp1) + +sp2 = pmpkg("bar", "1.0-2") +sp2.files = ["foo/b*r"] +self.addpkg(sp2) + +self.args = "-U %s %s" % (sp1.filename(), sp2.filename()) + +self.addrule("PKG_VERSION=foo|1.0-2") +self.addrule("PKG_VERSION=bar|1.0-2") +self.addrule("FILE_EXIST=foo/b*r") +self.addrule("!FILE_EXIST=foo/bar") -- 2.1.3

2 3

[pacman-dev] [PATCH] trans_release: do not error on STATE_IDLE
by Andrew Gregory 03 Mar '15

03 Mar '15

If a transaction were actually in STATE_IDLE, which it should never be, the handle would be stuck with a useless transaction and lock file that it can't remove. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/trans.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e5328c5..0c84bb0 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -222,7 +222,6 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) trans = handle->trans; ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); - ASSERT(trans->state != STATE_IDLE, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1)); int nolock_flag = trans->flags & ALPM_TRANS_FLAG_NOLOCK; -- 1.9.1

2 1

[pacman-dev] [PATCH] sync_prepare: exclude removals from resolvedeps
by Andrew Gregory 03 Mar '15

03 Mar '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 44a0ba8..cf7f0a8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -402,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { alpm_list_t *resolved = NULL; - alpm_list_t *remove = NULL; + alpm_list_t *remove = alpm_list_copy(trans->remove); alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ -- 1.9.0

2 1

[pacman-dev] [PATCH 0/7] [RFC] extract_single_file cleanup
by Andrew Gregory 11 Jan '15

11 Jan '15

This is my attempt to clean up the behemoth extract_single_file function. In order to do this I have made the following user-visible changes that I would like feedback on: * skip mtree, noupgrade, noextract checks for db files * remove .pacorig support, use .pacnew instead * extract backup files directly to .pacnew instead of .paccheck This takes extract_single_file down from 340 lines to 225 and considerably reduces the number of nested conditionals Andrew Gregory (7): extract_single_file: consolidate needbackup checks extract_single_file: reduce indentation extract_single_file: factor out db file extraction extract_single_file: use full path in messages remove support for .pacorig files extract_single_file: use .pacnew for check files extract_single_file: consolidate extraction logic contrib/README | 2 +- contrib/pacdiff.sh.in | 9 +- doc/pacman.8.txt | 5 +- lib/libalpm/add.c | 413 ++++++++++++++++------------------------ lib/libalpm/alpm.h | 15 +- src/pacman/callback.c | 16 -- test/pacman/README | 1 - test/pacman/pmrule.py | 3 - test/pacman/tests/upgrade015.py | 1 - test/pacman/tests/upgrade016.py | 5 +- test/pacman/tests/upgrade027.py | 1 - test/pacman/tests/upgrade028.py | 1 - test/pacman/tests/upgrade029.py | 1 - 13 files changed, 171 insertions(+), 302 deletions(-) -- 2.1.1

3 16

[pacman-dev] [PATCH] makepkg: do not eval dlcmd
by lolilolicon 07 Jan '15

07 Jan '15

Something like `source=('$pkgname-$pkgver.tar.gz')` in the PKGBUILD would "just work" with this eval. This could be a security issue since URLs are arbitrary external data. Instead, expand the dlagent command line into an array, replace the %o, %u place holders, and run the resultant command line as is. A shortcoming of this is the dlagent command line cannot have embedded spaces. If this turns out to be a problem, we can do an early eval before substituting %o and %u. --- scripts/makepkg.sh.in | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8e8a64c..a134453 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -288,12 +288,12 @@ get_protocol() { get_downloadclient() { local proto=$1 - # loop through DOWNLOAD_AGENTS variable looking for protocol + # loop through DLAGENTS variable looking for protocol local i for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" if [[ $proto = "$handler" ]]; then - local agent="${i##*::}" + local agent="${i#*::}" break fi done @@ -308,8 +308,7 @@ get_downloadclient() { # ensure specified program is installed local program="${agent%% *}" if [[ ! -x $program ]]; then - local baseprog="${program##*/}" - error "$(gettext "The download program %s is not installed.")" "$baseprog" + error "$(gettext "The download program '%s' is not installed.")" "$program" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PROGRAM fi @@ -342,15 +341,16 @@ download_file() { local proto=$(get_protocol "$netfile") # find the client we should use for this URL - local dlcmd - dlcmd=$(get_downloadclient "$proto") || exit $? + local -a cmdline + local IFS=' ' + cmdline=($(get_downloadclient "$proto")) || exit local filename=$(get_filename "$netfile") local url=$(get_url "$netfile") if [[ $proto = "scp" ]]; then # scp downloads should not pass the protocol in the url - url="${url##*://}" + url="${url#*://}" fi msg2 "$(gettext "Downloading %s...")" "$filename" @@ -359,20 +359,18 @@ download_file() { local dlfile="${url##*/}" # replace %o by the temporary dlfile if it exists - if [[ $dlcmd = *%o* ]]; then - dlcmd=${dlcmd//\%o/\"$filename.part\"} - dlfile="$filename.part" + if [[ ${cmdline[*]} = *%o* ]]; then + dlfile=$filename.part + cmdline=("${cmdline[@]//%o/"$dlfile"}") fi # add the URL, either in place of %u or at the end - if [[ $dlcmd = *%u* ]]; then - dlcmd=${dlcmd//\%u/\"$url\"} + if [[ ${cmdline[*]} = *%u* ]]; then + cmdline=("${cmdline[@]//%u/"$url"}") else - dlcmd="$dlcmd \"$url\"" + cmdline+=("$url") fi - local ret=0 - eval "$dlcmd >&2 || ret=\$?" - if (( ret )); then + if ! command -- "${cmdline[@]}" >&2; then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" plain "$(gettext "Aborting...")" -- 2.1.0

4 8

[pacman-dev] [PATCH 0/9] refactor ini/config parser
by Andrew Gregory 29 Dec '14

29 Dec '14

As the first step to back-end hook support, this patchset makes the ini parser suitable for sharing between alpm and pacman by moving all error handling from the ini parser to the _parse_directive callback. This involves: * moving debug output to the callback * allowing empty section names (alpm already rejects empty db names) * moving Include handling to the callback * notifying the callback of read errors In order to do that I also refactored the config callback to use only a single pass by storing repo information until alpm is initialized and using bitmasks instead of the ALPM_SIG_*_SET enums to handle siglevel inheritance. apg Andrew Gregory (9): conf.c: store repo settings in dedicated struct conf.c: use masks for siglevel inheritance conf.c: parse config in a single pass ini.c: remove final callback call ini.c: move Include parsing to conf.c ini.c: remove unnecessary helper function ini.c: remove empty section name restriction ini.c: remove useless key check ini.c: move error output into conf.c lib/libalpm/alpm.h | 3 - lib/libalpm/be_sync.c | 2 +- src/pacman/conf.c | 304 ++++++++++++++++++++++++++++---------------------- src/pacman/conf.h | 16 +++ src/pacman/ini.c | 147 ++++-------------------- 5 files changed, 208 insertions(+), 264 deletions(-) -- 1.9.2

3 22

[pacman-dev] [PATCH] doc/translation-help.txt: Transifex example usage
by Miguel de Val-Borro 30 Nov '14

30 Nov '14

Replace harcoded language code in example Signed-off-by: Miguel de Val-Borro <miguel(a)archlinux.net> --- doc/translation-help.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/translation-help.txt b/doc/translation-help.txt index 9b7def0..99ce3d8 100644 --- a/doc/translation-help.txt +++ b/doc/translation-help.txt @@ -46,8 +46,8 @@ resources (See `tx status` output for a quick overview). Or to just push one of the two available resources: - tx push -r archlinux-pacman.pacman-pot -t -l fi - tx push -r archlinux-pacman.libalpm-pot -t -l fi + tx push -r archlinux-pacman.pacman-pot -t -l <mylang> + tx push -r archlinux-pacman.libalpm-pot -t -l <mylang> See the <<Notes,Notes>> section for additional hints on translating. -- 2.1.3

1 0

[pacman-dev] [PATCH] remove.c: honor inverted patterns in noupgrade
by Andrew Gregory 29 Nov '14

29 Nov '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 4 ++-- test/pacman/tests/TESTS | 1 + test/pacman/tests/noupgrade-inverted.py | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 test/pacman/tests/noupgrade-inverted.py diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dd061e5..f9b24ef 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -326,7 +326,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - if(alpm_list_find(skip_remove, file->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, file->name) == 0) { /* return success because we will never actually remove this file */ return 1; } @@ -451,7 +451,7 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, /* check the remove skip list before removing the file. * see the big comment block in db_find_fileconflicts() for an * explanation. */ - if(alpm_list_find(skip_remove, fileobj->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, fileobj->name) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", file); return 1; diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 052cf4b..12adf6d 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -63,6 +63,7 @@ TESTS += test/pacman/tests/ldconfig003.py TESTS += test/pacman/tests/mode001.py TESTS += test/pacman/tests/mode002.py TESTS += test/pacman/tests/mode003.py +TESTS += test/pacman/tests/noupgrade-inverted.py TESTS += test/pacman/tests/pacman001.py TESTS += test/pacman/tests/pacman002.py TESTS += test/pacman/tests/pacman003.py diff --git a/test/pacman/tests/noupgrade-inverted.py b/test/pacman/tests/noupgrade-inverted.py new file mode 100644 index 0000000..8e7f1ea --- /dev/null +++ b/test/pacman/tests/noupgrade-inverted.py @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with files that match negated NoUpgrade patterns" + +lp = pmpkg("foobar") +lp.files = ["foo/bar", "foo/baz"] +self.addpkg2db("local", lp) + +p = pmpkg("foobar", "1.0-2") +p.files = ["foo/bar"] +self.addpkg(p) + +self.option["NoUpgrade"] = ["foo/*", "!foo/bar", "!foo/baz"] + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=foobar|1.0-2") +self.addrule("!FILE_EXIST=foo/baz") +self.addrule("FILE_MODIFIED=foo/bar") +self.addrule("!FILE_PACNEW=foo/bar") +self.addrule("!FILE_PACSAVE=foo/bar") -- 2.1.3

1 0

[pacman-dev] [PATCH] add alpm_option_match_noupgrade
by Andrew Gregory 29 Nov '14

29 Nov '14

For parity with alpm_option_match_noextract. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/handle.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 234bd6b..e6ef3ae 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -815,6 +815,7 @@ alpm_list_t *alpm_option_get_noupgrades(alpm_handle_t *handle); int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *path); int alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *path); +int alpm_option_match_noupgrade(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of no-extract files. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5ef619e..fa99948 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -527,6 +527,11 @@ int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pk return _alpm_option_strlist_rem(handle, &(handle->noupgrade), pkg); } +int SYMEXPORT alpm_option_match_noupgrade(alpm_handle_t *handle, const char *path) +{ + return _alpm_fnmatch_patterns(handle->noupgrade, path); +} + int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *path) { return _alpm_option_strlist_add(handle, &(handle->noextract), path); -- 2.1.3

1 0