- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] db.c: require unique database names
by Andrew Gregory 11 Dec '13

11 Dec '13

Allowing multiple databases with the same name causes conflicts as they both point to the same database file but may use different servers, usages, or siglevels. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.conf.5.txt | 9 +++++---- lib/libalpm/db.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 8cd2d0e..9c3dffe 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -202,10 +202,11 @@ Repository Sections ------------------- Each repository section defines a section name and at least one location where the packages can be found. The section name is defined by the string within -square brackets (the two above are 'current' and 'custom'). Locations are -defined with the 'Server' directive and follow a URL naming structure. If you -want to use a local directory, you can specify the full path with a ``file://'' -prefix, as shown above. +square brackets (the two above are 'core' and 'custom'). Repository names +must be unique and the name 'local' is reserved for the database of installed +packages. Locations are defined with the 'Server' directive and follow a URL +naming structure. If you want to use a local directory, you can specify the +full path with a ``file://'' prefix, as shown above. A common way to define DB locations utilizes the 'Include' directive. For each repository defined in the configuration file, a single 'Include' directive can diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 528b04b..2069a7b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -46,6 +46,8 @@ alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle, const char *treename, alpm_siglevel_t level) { + alpm_list_t *i; + /* Sanity checks */ CHECK_HANDLE(handle, return NULL); ASSERT(treename != NULL && strlen(treename) != 0, @@ -53,6 +55,17 @@ alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle, /* Do not register a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, NULL)); + /* ensure database name is unique */ + if(strcmp(treename, "local") == 0) { + RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); + } + for(i = handle->dbs_sync; i; i = i->next) { + alpm_db_t *d = i->data; + if(strcmp(treename, d->treename) == 0) { + RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); + } + } + return _alpm_db_register_sync(handle, treename, level); } -- 1.8.4.2

2 1

[pacman-dev] [PATCH] alpm_sync_sysupgrade: skip packages being removed
by Andrew Gregory 11 Dec '13

11 Dec '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- pacman can't run into this (yet), but other front-ends might. lib/libalpm/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 551f926..af82dc5 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -209,6 +209,11 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { alpm_pkg_t *lpkg = i->data; + if(alpm_pkg_find(trans->remove, lpkg->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is marked for removal -- skipping\n", lpkg->name); + continue; + } + if(alpm_pkg_find(trans->add, lpkg->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; -- 1.8.4.2

2 1

Re: [pacman-dev] [PATCH 4/4] makepkg: git: update existing sources in srcdir without removing them first.
by Ido Rosen 10 Dec '13

10 Dec '13

I think I found a bug: If the repository URL/source array entry has changed but the directory name has not, the user would have to manually delete the cloned repository, otherwise the git fetch/checkout would be from the incorrect upstream repo. On Mon, Dec 9, 2013 at 3:31 PM, Lukáš Jirkovský <l.jirkovsky(a)gmail.com>wrote: > The local changes are discarded when updating. This matches the behaviour > when non-VCS sources are used. It also allows incremental builds. > > Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> > --- > scripts/makepkg.sh.in | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 1421bec..99af551 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -581,9 +581,18 @@ extract_git() { > > msg2 "$(gettext "Creating working copy of %s %s repo...")" > "${repo}" "git" > pushd "$srcdir" &>/dev/null > - rm -rf "${dir##*/}" > > - if ! git clone "$dir"; then > + local updating=false > + if [[ -d "${dir##*/}" ]]; then > + updating=true > + cd_safe "${dir##*/}" > + if ! git fetch; then > + error "$(gettext "Failure while updating working > copy of %s %s repo")" "${repo}" "git" > + plain "$(gettext "Aborting...")" > + exit 1 > + fi > + cd_safe "$srcdir" > + elif ! git clone "$dir"; then > error "$(gettext "Failure while creating working copy of > %s %s repo")" "${repo}" "git" > plain "$(gettext "Aborting...")" > exit 1 > @@ -591,7 +600,7 @@ extract_git() { > > cd_safe "${dir##*/}" > > - local ref > + local ref=origin/HEAD > if [[ -n $fragment ]]; then > case ${fragment%%=*} in > commit|tag) > @@ -607,8 +616,8 @@ extract_git() { > esac > fi > > - if [[ -n $ref ]]; then > - if ! git checkout -b makepkg $ref; then > + if [[ -n $ref ]] || ((updating)) ; then > + if ! git checkout --force -B makepkg $ref; then > error "$(gettext "Failure while creating working > copy of %s %s repo")" "${repo}" "git" > plain "$(gettext "Aborting...")" > exit 1 > -- > 1.8.5.1 > > >

2 1

[pacman-dev] Questions about how to show messages (warnings, etc)
by Olivier Brunel 04 Dec '13

04 Dec '13

Hi, So I'm working on changing the events callback as discussed earlier, and I'm running into some little issues (discrepancies really) when it comes to showing warnings/errors. As you know, pacman can show warnings/errors to the user; and when colors are used those prefixes will be shown in color. Except, not always. There seems to be some inconsistency when it comes to this, because when a warning/error needs to be shown, pacman can do one of two things: - show it right away - cache it and show it later, i.e. when the current progress will be done Now, when shown right away, prefixes are in color, and messages are shown on stderr. However, when delayed, there will be no colors (because unlike pm_vfprintf(), pm_vasprintf() doesn't add colors to the prefixes) *and* messages will be shown on stdout. Unless there's a reason for this I'm not aware of, I think that this should probably be fixed, as in have delayed messages use colors & show on stderr? As a side note, the FS#37711 that Andrew mentioned previously was about the lack of colors for creation of .pac* files, but it might actually have been a manifestation of this bug/discrepancy (i.e. when fixed, or if using --noprogressbar, one would have colors on those warnings already). -j

3 4

[pacman-dev] [PATCH] Added mirror support to makepkg's source array.
by Florian Pritz 25 Nov '13

25 Nov '13

From: Ido Rosen <code(a)idorosen.com> To specify multiple mirrors, simply add multiple files to the source array that have the same downloaded filename, e.g.: source=("file.tar.gz::http://mirror1.example.com/file.tar.gz" "file.tar.gz::http://mirror2.example.com/file.tar.gz") ...makepkg will try them all, and if all fail, will abort. This also applies to VCS repositories and local files references in the source array, so for example: source=("git+https://github.com/torvalds/linux.git "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git") ...will allow cloning the git repository from GitHub if kernel.org is down or fails. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- I've swichted from get_filepath for the array index to get_filename as get_filepath only returns something useful if the local file already exists. I guess this was just an oversight, but noted for reference. I've also tested this a little for http urls and it seems to work as expected. One thing that we might want to fix is that the downloads get validated multiple times right now (once for each entry). scripts/makepkg.sh.in | 73 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..452df09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -326,7 +326,7 @@ download_local() { else local filename=$(get_filename "$netfile") error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename" - exit 1 # $E_MISSING_FILE + return 1 # $E_MISSING_FILE fi } @@ -375,8 +375,7 @@ download_file() { if (( ret )); then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi # rename the temporary download file to the final destination @@ -460,8 +459,7 @@ download_bzr() { msg2 "$(gettext "Branching %s ...")" "${displaylocation}" if ! bzr branch "$url" "$dir" --no-tree --use-existing-dir; then error "$(gettext "Failure while branching %s")" "${displaylocation}" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo @@ -470,15 +468,13 @@ download_bzr() { if [[ -n $distant_url ]]; then if [[ $distant_url != "$local_url" ]]; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi else if [[ $url != "$local_url" ]] ; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" error "$(gettext "The local URL is %s")" "$local_url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" @@ -545,16 +541,14 @@ download_git() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then cd_safe "$dir" # Make sure we are fetching the right repo if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then error "$(gettext "%s is not a clone of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then @@ -634,8 +628,7 @@ download_hg() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" if ! hg clone -U "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "hg" @@ -673,15 +666,13 @@ extract_hg() { ;; *) error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 + return 1 esac fi if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi popd &>/dev/null @@ -711,8 +702,7 @@ download_svn() { mkdir -p "$dir/.makepkg" if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" @@ -776,34 +766,61 @@ download_sources() { GET_VCS=0 fi + declare -A downloaded # local since no -g supplied to declare. + declare -A expected # local since no -g supplied to declare. local netfile for netfile in "${source[@]}"; do pushd "$SRCDEST" &>/dev/null + local filename=$(get_filename "${netfile}") + expected["${filename}"]=1 + if [[ ${downloaded["${filename}"]} ]]; then + msg "$(gettext "Skipping mirror: %s")" "$netfile" + continue # file already downloaded, current mirror is redundant. + fi local proto=$(get_protocol "$netfile") case "$proto" in local) - download_local "$netfile" + download_local "$netfile" && \ + downloaded["${filename}"]=1 ;; bzr*) - (( GET_VCS )) && download_bzr "$netfile" + (( GET_VCS )) && download_bzr "$netfile" && \ + downloaded["${filename}"]=1 ;; git*) - (( GET_VCS )) && download_git "$netfile" + (( GET_VCS )) && download_git "$netfile" && \ + downloaded["${filename}"]=1 ;; hg*) - (( GET_VCS )) && download_hg "$netfile" + (( GET_VCS )) && download_hg "$netfile" && \ + downloaded["${filename}"]=1 ;; svn*) - (( GET_VCS )) && download_svn "$netfile" + (( GET_VCS )) && download_svn "$netfile" && \ + downloaded["${filename}"]=1 ;; *) - download_file "$netfile" + download_file "$netfile" && \ + downloaded["${filename}"]=1 ;; esac - popd &>/dev/null done + + local failed=() + for expectedfilename in "${!expected[@]}"; do + if [[ ${downloaded["${expectedfilename}"]} ]]; then + continue + else + failed=(${failed[@]} "${expectedfilename}") + error "$(gettext "Fatal failure while downloading file %s")" "${expectedfilename}" + fi + done + if [[ ${#failed[@]} -gt 0 ]]; then + plain "$(gettext "Aborting...")" + exit 1 + fi } # Automatically update pkgver variable if a pkgver() function is provided -- 1.8.4.2

8 15

[pacman-dev] [PATCH] alpm: Add events for creation of pacnew/pacorig files
by Olivier Brunel 21 Nov '13

21 Nov '13

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- Hey, Some background regarding this: I've written a little tool (kalu, [1]) which is an upgrade notifier, and also features a GUI/frontend for the sysupgrade (-Syu) operation. Whenever there was a pacnew installed, I would open a terminal and run vimdiff on the files; I would also wonder if it wouldn't be nice to have a third file featured, the "original" one (i.e. from the previous package). And so I started wondering about kalu making a list of all pacnew files created during the upgrade, as well as the name & version of the old package, so that I could use a little script to extract the file and start the 3-way diff. (kalu allows to execute one or more command lines after the sysupgrade completed, so this list is just a variable parsed on said cmdlines.) This all works well, but to make that list, kalu would have to e.g. use a regex to extract the pacnew filenames from ALPM's warnings, and that's just not a very good or reliable thing, especially when you know such warnings are translated. Hence, why adding a couple events (there's pacorig as well) in ALPM makes everything much better & simpler; And knowing about such events could be useful to some frontends, even though pacman obviously has no use for it (atm). So, I'm hoping you'd be willing to merge this. Thanks, -j [1] http://jjacky.com/kalu lib/libalpm/add.c | 3 +++ lib/libalpm/alpm.h | 10 +++++++++- src/pacman/callback.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ac4e36a..e5eca97 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -363,10 +363,12 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(try_rename(handle, checkfile, newpath)) { errors++; } else { + alpm_pkg_t *arr[2] = { oldpkg, newpkg }; _alpm_log(handle, ALPM_LOG_WARNING, _("%s installed as %s\n"), filename, newpath); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: %s installed as %s\n", filename, newpath); + EVENT(handle, ALPM_EVENT_PACNEW, arr, newpath); } free(newpath); @@ -395,6 +397,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, _("%s saved as %s\n"), filename, newpath); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: %s saved as %s\n", filename, newpath); + EVENT(handle, ALPM_EVENT_PACORIG, newpkg, newpath); } } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2c8c1e6..c4f772d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -387,7 +387,15 @@ typedef enum _alpm_event_t { /** Downloading missing keys into keyring. */ ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ - ALPM_EVENT_KEY_DOWNLOAD_DONE + ALPM_EVENT_KEY_DOWNLOAD_DONE, + /** A .pacnew file was installed + * An array of packages (current/old one, and installed/new one) and the + * name of the pacnew file are passed to the callback */ + ALPM_EVENT_PACNEW, + /** A .pacorig file was created + * The installed/new package and the name of the pacorig file are passed to + * the callback */ + ALPM_EVENT_PACORIG } alpm_event_t; /** Event callback */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 36531a2..0fc35f6 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -297,6 +297,9 @@ void cb_event(alpm_event_t event, void *data1, void *data2) case ALPM_EVENT_DELTA_INTEGRITY_DONE: case ALPM_EVENT_DELTA_PATCHES_DONE: case ALPM_EVENT_DISKSPACE_DONE: + /* events of creation of .pacnew/.pacorig files */ + case ALPM_EVENT_PACNEW: + case ALPM_EVENT_PACORIG: /* nothing */ break; } -- 1.8.4.2

3 5

[pacman-dev] [PATCH] Color output from pm_vfprintf
by Allan McRae 21 Nov '13

21 Nov '13

This makes sure warning and error messages from _alpm_log are colored. Fixes FS#35160. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23eea98..05135d7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1593,10 +1593,12 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li /* print a prefix to the message */ switch(level) { case ALPM_LOG_ERROR: - pm_asprintf(string, _("error: %s"), msg); + pm_asprintf(string, "%s%s%s%s", config->colstr.err, _("error: "), + config->colstr.nocolor, msg); break; case ALPM_LOG_WARNING: - pm_asprintf(string, _("warning: %s"), msg); + pm_asprintf(string, "%s%s%s%s", config->colstr.warn, _("warning: "), + config->colstr.nocolor, msg); break; case ALPM_LOG_DEBUG: pm_asprintf(string, "debug: %s", msg); -- 1.8.4.2

1 1

[pacman-dev] [PATCH 0/1] Change to the way pmenv and pmtest connect.
by Jeremy Heiner 19 Nov '13

19 Nov '13

This change was needed in a rescinded patch, and even though it is no longer required I still think it is an improvement that may be worth keeping. Prior to this change each pmtest searched the PATH envar to get the full paths to the fakeroot and fakechroot commands (used to fork the pacman binary being tested). That search logically fits better in the pmenv. And that change leads naturally to a slightly less verbose API for when the pmenv is calling pmtest methods. Jeremy Heiner (1): Simplify pmtest.generate and .run API (removed pacman parameter). test/pacman/pmenv.py | 13 ++++++++++--- test/pacman/pmtest.py | 30 +++++++++++++----------------- 2 files changed, 23 insertions(+), 20 deletions(-) -- 1.8.4.2

2 3

[pacman-dev] Fwd: [PATCH] pacdiff: do not remove pacfile after viewing, but ask user
by Vasiliy Korchagin 18 Nov '13

18 Nov '13

Hi all, I often use pacdiff tool for updating config files. And I find it very inconvenient that after viewing files in vimdiff, I have the only choice to delete pacfile. It would be more useful to ask user what to do next with standard set of choices (view, skip, remove, overwrite). One line patch is attached. Kind regards, Vasiliy.

3 4

[pacman-dev] [PATCH] pacscripts: Don't ask if sudo is installed; just check for it and inform the user
by Jason St. John 18 Nov '13

18 Nov '13

Have pacscripts check if "sudo" is installed when the sudo binary cannot be found, and remove the "Is sudo installed?" question. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- It doesn't make sense to force the user to run "pacman -Qi sudo", when we can easily check if sudo is installed automatically and inform the user. contrib/pacscripts.sh.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 8453f9c..7ab7b0d 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -71,8 +71,12 @@ spacman() { pacman "$@" else if ! type -p sudo; then - error "Cannot find the sudo binary! Is sudo installed?" - error "Otherwise, try to run the program as root" + error "Cannot find the sudo binary!" + if [ "$(pacman -Qq sudo)" != "sudo" ]; then + error "\"sudo\" is not installed. Either install it or run the program as root." + else + error "However, \"sudo\" appears to be installed. Try running the program as root." + fi exit 1 else sudo pacman "$@" -- 1.8.4.2

3 5