- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove ALPM_QUESTION_LOCAL_NEWER
by Connor Behan 18 Apr '13

18 Apr '13

It seems this question has not been used since the 3.0 days. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- lib/libalpm/alpm.h | 7 +++---- src/pacman/callback.c | 9 --------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ccbdd1c..2277a69 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -405,10 +405,9 @@ typedef enum _alpm_question_t { ALPM_QUESTION_REPLACE_PKG = (1 << 1), ALPM_QUESTION_CONFLICT_PKG = (1 << 2), ALPM_QUESTION_CORRUPTED_PKG = (1 << 3), - ALPM_QUESTION_LOCAL_NEWER = (1 << 4), - ALPM_QUESTION_REMOVE_PKGS = (1 << 5), - ALPM_QUESTION_SELECT_PROVIDER = (1 << 6), - ALPM_QUESTION_IMPORT_KEY = (1 << 7) + ALPM_QUESTION_REMOVE_PKGS = (1 << 4), + ALPM_QUESTION_SELECT_PROVIDER = (1 << 5), + ALPM_QUESTION_IMPORT_KEY = (1 << 6) } alpm_question_t; /** Question callback */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 16d66df..a743adc 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -382,15 +382,6 @@ void cb_question(alpm_question_t event, void *data1, void *data2, *response = select_question(count); } break; - case ALPM_QUESTION_LOCAL_NEWER: - if(!config->op_s_downloadonly) { - *response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"), - alpm_pkg_get_name(data1), - alpm_pkg_get_version(data1)); - } else { - *response = 1; - } - break; case ALPM_QUESTION_CORRUPTED_PKG: *response = yesno(_("File %s is corrupted (%s).\n" "Do you want to delete it?"), -- 1.8.2.1

2 1

[pacman-dev] [PATCH] Give the frontend control over responses for print
by Connor Behan 17 Apr '13

17 Apr '13

There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..711d116 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

2 3

[pacman-dev] [PATCH] Unify front and backend responses for --print
by Connor Behan 17 Apr '13

17 Apr '13

When libalpm asks the user a question, there are two possible defaults. One default for pacman (used when the user presses enter without typing and for --noconfirm) and the libalpm default. Currently the libalpm default gets used for the pacman "--print" option. This affects the printing of ignored packages since the defaults differ for "ALPM_QUESTION_INSTALL_IGNOREPKG". Adjust the response of this case when using --print so pacman acts consistently. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..16d66df 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,11 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + if(event == ALPM_QUESTION_INSTALL_IGNOREPKG) { + *response = 1; + } else { + *response = 0; + } return; } switch(event) { -- 1.8.2.1

1 0

[pacman-dev] 回复: [PATCH] Give the frontend control over responses for print
by Ssfdust 16 Apr '13

16 Apr '13

已从三星手机发送 -------- 原始消息 -------- 主题：[pacman-dev] [PATCH] Give the frontend control over responses for print 发件人：Connor Behan <connor.behan(a)gmail.com> 收件人：pacman-dev(a)archlinux.org 抄送： null

1 0

[pacman-dev] 回复: [PATCH] Give the frontend control over responses for print
by Ssfdust 16 Apr '13

16 Apr '13

已从三星手机发送 -------- 原始消息 -------- 主题：[pacman-dev] [PATCH] Give the frontend control over responses for print 发件人：Connor Behan <connor.behan(a)gmail.com> 收件人：pacman-dev(a)archlinux.org 抄送： There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..711d116 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

1 0

[pacman-dev] 回复: [PATCH] Give the frontend control over responses for print
by Ssfdust 16 Apr '13

16 Apr '13

已从三星手机发送 -------- 原始消息 -------- 主题：[pacman-dev] [PATCH] Give the frontend control over responses for print 发件人：Connor Behan <connor.behan(a)gmail.com> 收件人：pacman-dev(a)archlinux.org 抄送： There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..711d116 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,14 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.0-13-g597286e
by allan＠archlinux.org 16 Apr '13

16 Apr '13

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 597286eb258f841dfc00f65474138fc6192f0092 (commit) via 695f0e443e18ca5d7b722bdf2c4695cc63c1af54 (commit) via 7e0f528274478e7d3057d71717596fdaa5e5bb79 (commit) via 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 (commit) via b7c994db8b049b87df5ec5d6cada84a36c60c47d (commit) via 3de8f8f1ccf103ae9737299b52407b4ebe51d75a (commit) via 32c91e28952f3b746da7513849a8f3c996aab807 (commit) via 95c68d26ef1fe9ccf7eafc1be4205964255c7f3f (commit) via 0f486adfec6d44f7578e526379078231aa300601 (commit) via f9280a0523d0c49039a0ad27718701c20d874ec3 (commit) via 0f05bfc340891ed6649168c888bb7c598d7f0d58 (commit) via 7b10519835eadec97487728516b1a712c4b896eb (commit) via b5a7734a7ecdd35f64f33eeed5252423ca005fd2 (commit) from 5caf143faaa64bd76c10c8e35dd0adbfd8619615 (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 597286eb258f841dfc00f65474138fc6192f0092 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Apr 11 09:18:47 2013 -0400 paccache: avoid subshell in calling runcmd Avoids problems with one of the worst CLI tools ever created, su. Fixes FS#34656. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 695f0e443e18ca5d7b722bdf2c4695cc63c1af54 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Apr 11 15:46:51 2013 +1000 makepkg: fix svn repo extraction Copy SVN repos rather than using "svn export" to keep all anotation files in the repo for build scripts that use (e.g.) "svin info". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e0f528274478e7d3057d71717596fdaa5e5bb79 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Apr 11 11:56:06 2013 +1000 Do not use checkout directory for SVN config Using the checkout directory for the SVN config can result in clashes between config files and files from the SVN checkout. Instead, use a ".makepkg" directory within the checkout. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 Author: Maxime Gauduin <alucryd(a)gmail.com> Date: Wed Apr 10 18:54:02 2013 +0200 Add support for all bzr URLs in the PKGBUILD source array Add support for all bzr URLs, including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used, and is outputted. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> commit b7c994db8b049b87df5ec5d6cada84a36c60c47d Author: William Giokas <1007380(a)gmail.com> Date: Fri Mar 15 12:11:11 2013 -0500 makepkg: don't run remove_deps twice when unneeded remove_deps already has a check and won't run unless -r is specified, so if this was meant to remove dependencies of a failure no matter what, then it's not doing it, and with -r it is run twice on a failure for no real reason. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3de8f8f1ccf103ae9737299b52407b4ebe51d75a Author: Allan McRae <allan(a)archlinux.org> Date: Tue Apr 9 11:59:43 2013 +1000 Rework callback message to add translation Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32c91e28952f3b746da7513849a8f3c996aab807 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 8 22:00:04 2013 +1000 contrib/checkupdates: do not log Avoid the log file filling up with "[PACMAN] synchronizing package lists". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95c68d26ef1fe9ccf7eafc1be4205964255c7f3f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Apr 2 19:53:45 2013 -0400 pacman: add -Qkk to usage() help Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f486adfec6d44f7578e526379078231aa300601 Author: William Giokas <1007380(a)gmail.com> Date: Mon Apr 1 10:19:35 2013 +0000 contrib: Use sysconfdir instead of /etc Don't force people to see /etc. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9280a0523d0c49039a0ad27718701c20d874ec3 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Apr 5 19:31:57 2013 -0400 zsh completion: make sure -Ss works if you put a type in pacman -Ss <regex> it doesn't work because it never passes through they pointer ->sync_search to set $state. All of the other iterations like this have a case, add one for -S*s* Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0f05bfc340891ed6649168c888bb7c598d7f0d58 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Mon Apr 1 19:46:29 2013 -0400 ctypes.h shouldn't be included twice Earnestly spotted this on #archlinux. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b10519835eadec97487728516b1a712c4b896eb Author: William Giokas <1007380(a)gmail.com> Date: Mon Apr 1 01:46:48 2013 -0500 doc: fix debug spelling mistake with -> when Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b5a7734a7ecdd35f64f33eeed5252423ca005fd2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Apr 5 10:12:04 2013 -0400 use off_t for table_row_t.size size went from off_t in _display_targets to int in add_transaction_sizes and back to off_t in humanize_size leading to potential overflows. Fixes FS#34616. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 4 ++-- contrib/zsh_completion.in | 14 ++++++++++---- doc/makepkg.conf.5.txt | 2 +- scripts/makepkg.sh.in | 42 ++++++++++++++++++++++++++++++++---------- src/pacman/callback.c | 10 +++++----- src/pacman/pacman.c | 3 +-- src/pacman/util.c | 4 ++-- 8 files changed, 54 insertions(+), 27 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] pacman-4.2 plans?
by Mohammad_Alsaleh 15 Apr '13

15 Apr '13

On Tue, Apr 16, 2013 at 02:31:08AM +0300, Mohammad_Alsaleh wrote: > On Sun, Apr 14, 2013 at 09:58:24AM +1000, Allan McRae wrote: > > On 14/04/13 09:52, Anatol Pomozov wrote: > > > > > >> > What happens if the network connection is dropped while > > >> > packages are still downloading after package installation has started? > > > In this case only those packages that are already downloaded will be > > > installed. And because installation respects dependency order then > > > partial installation will not brick the system, no? > > > > > > > Sure it can... e.g. an soname bump in ncurses. ncurses gets updated > > but nothing else, bash is dead. > > > > Allan > > > > > > On that note. > > Directing more effort to get already existing features more wildly used > might be more useful than implementing new features/optimizations IMHO. > (namely, sodepends and debug packages). But that's an Arch discussion > not a Pacman one! > > Having said that, local queries are the only operations that feel slow > to me. So, finally making a decision about how to (fix) this would be > great. s/wildly/widely

1 0

[pacman-dev] debug package repositories
by William Giokas 15 Apr '13

15 Apr '13

All, With the inclusion of the debug option in pacman 4.1.0, I think it makes sense to do something with this in the official repositories. I've sifted through some bug reports asking for inclusion of the debug symbols in a separate package or repository officially for testing purposes. With [extra] and [community] approaching 1.5 and 2 megabytes respectively, I think that adding debug symbols directly into these repositories would be a bad idea as it would probably add ~50% to those databases, and I've already seen some people complain about the sizes. What I would propose (and I've implemented this locally fine) is to have a separate series of repositories named [$repo-debug] that only contain the -debug packages, allowing those that don't bother with testing or debugging to simply not include them in their pacman.conf, but if there is something that they want to run valgrind or whatever on, they can simply enable the right [*-debug] repo for that package, and once they are done debugging simply remove that repo from their list along with the package. For really large packages, this will save people a while lot of time recompiling dependencies for these symbols. I talked to ioni on the channel, and he said that your repo scripts do not have support for this. If it's too much of a hassle, putting them in the same repo wouldn't be that terrible, honestly. Thank you, -- William Giokas | KaiSforza GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF

2 1

[pacman-dev] [PATCH][RFC] Unit tests!
by Andrew Gregory 15 Apr '13

15 Apr '13

Exposing and catching bugs deep in the internals of alpm or pacman can be rather difficult with our current test suite, so I'd like to add a unit test suite. Here's the setup I've come up with so far: * Tests use the check framework [1] (it's in the repos) * Tests should include the source file (not the header) for whatever is being tested. This is necessary because it seems like most of the low hanging fruit (ie functions that don't interact with the user or filesystem) are static. * Test files must define a function "build_suite" that assembles their tests into a suite. * Test files are built as dynamic libraries which are automatically discovered and loaded by the test runner. Check organizes individual tests into suites and then cases and allows individual suites/cases to be selected with an environment variable. Right now my example setup has exactly one case per suite because that's easier, I'm thinking it would be better though to have one case per test so that individual functions can be tested separately. For instance, `CK_RUN_SUITE=util.c ./runner` would test everything in util.c, and `CK_RUN_CASE=util.c/_alpm_strip_newline ./runner` would test only that one function. I've included a test runner and a couple stub tests with a minimal Makefile as an example. With check installed, running `make check` in test/alpm/unit gives: $ make check ./runner Running suite(s): alpm alpm_list util.c 75%: Checks: 4, Failures: 1, Errors: 0 util_test.c:22:F:Core:check_alpm_strip_newline:0: Assertion 'output==expected' failed: output=="test", expected=="this will fail" make: *** [check] Error 1 [1] http://check.sourceforge.net/doc/check_html/index.html Andrew Gregory (1): add unit tests test/alpm/unit/Makefile | 16 +++++++++ test/alpm/unit/alpm_list_test.c | 76 +++++++++++++++++++++++++++++++++++++++++ test/alpm/unit/runner.c | 47 +++++++++++++++++++++++++ test/alpm/unit/util_test.c | 34 ++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 test/alpm/unit/Makefile create mode 100644 test/alpm/unit/alpm_list_test.c create mode 100644 test/alpm/unit/runner.c create mode 100644 test/alpm/unit/util_test.c -- 1.8.2.1

2 2