- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Feedback from installed package while searching
by djszapi2＠gmail.com 04 Sep '09

04 Sep '09

From: Laszlo Papp <djszapi2(a)gmail.com> To get feedback while searching instead of using another utility for this purpose, whether the desired packages are installed. You can see example for it in case of yaourt. Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/sync.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..9935d6d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -330,6 +330,10 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + if (alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg))) { + printf(" [%s]", _("installed")); + } + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); -- 1.6.4.1

5 8

[pacman-dev] [PATCH] Feedback from installed package while searching
by Laszlo Papp 03 Sep '09

03 Sep '09

To get feedback while searching instead of using another utility for this purpose, whether the desired packages are installed. You can see example for it in case of yaourt. Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/sync.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..3ae6927 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -330,6 +330,11 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + pmpkg_t *ipkg = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); + if (ipkg) { + printf(_(" [installed: %s]"), alpm_pkg_get_version(ipkg)); + } + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); -- 1.6.4.1

1 0

[pacman-dev] [PATCH] Feedback from installed packages while searching
by Laszlo Papp 03 Sep '09

03 Sep '09

From: root <root(a)djszapi.localdomain> To get feedback while searching instead of using another utility for this purpose, whether the desired packages are installed. You can see example for it in case of yaourt. Signed-off-by: root <root(a)djszapi.localdomain> --- src/pacman/sync.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..9935d6d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -330,6 +330,10 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + if (alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg))) { + printf(" [%s]", _("installed")); + } + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); -- 1.6.4.1

3 2

[pacman-dev] http://archlinux.org/pacman doesn't work
by Laszlo Papp 03 Sep '09

03 Sep '09

Hello! When will http://archlinux.org/pacman be available ? 404 - Page not found. Best Regards, Laszlo Papp

4 6

[pacman-dev] My repo has moved
by Allan McRae 03 Sep '09

03 Sep '09

With the reinstall of the Arch server, my pacman working git repo has now moved to git://projects.archlinux.org/users/allan/pacman.git Allan

3 3

Re: [pacman-dev] makepkg -i should fail when packages cannot be installed
by Allan McRae 02 Sep '09

02 Sep '09

Pierre Schmitz wrote: > Hi, > > I would file a bug report but somehow... > > It seems makepkg -i just throws a warning if it cannot install the package > after build. I would prefer if it would at least return something different > from 0. > > My scripts assume that everything is fine if makepkg retuns 0 and an inter > package file conflict wasn't noticed due to the behaviour that makepkg did > return 0 even if something went wrong. > Hmmm... there was a bug report that was the opposite. The reasoning here is that makepkg did not fail, rather pacman failed to install the successfully built package. The same occurs when pacman fails to remove deps as asked by makepkg. Allan _________________________________________________________________ Use Hotmail to send and receive mail from your different email accounts. http://clk.atdmt.com/UKM/go/167688463/direct/01/

5 5

[pacman-dev] [PATCH] Removing strndup and a small typo fix
by Laszlo Papp 02 Sep '09

02 Sep '09

Code cleaning, removing strndup, because it's available with glibc in the same manner, and a small typo fix. Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/package.c | 2 +- src/pacman/util.c | 12 ------------ src/pacman/util.h | 4 ---- 3 files changed, 1 insertions(+), 17 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 328d5bf..3b14516 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -84,7 +84,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) } if(level>0) { - /* compute this here so we don't get a puase in the middle of output */ + /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); } diff --git a/src/pacman/util.c b/src/pacman/util.c index a02b43c..a95d82e 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -819,18 +819,6 @@ static size_t strnlen(const char *s, size_t max) for(p = s; *p && max--; ++p); return(p - s); } - -char *strndup(const char *s, size_t n) -{ - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); - - if (new == NULL) - return NULL; - - new[len] = '\0'; - return (char *) memcpy(new, s, len); -} #endif /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index 1282422..ce5e019 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -64,10 +64,6 @@ int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attr int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n); -#endif - #endif /* _PM_UTIL_H */ /* vim: set ts=2 sw=2 noet: */ -- 1.6.4.1

3 3

[pacman-dev] makepkg -i should fail when packages cannot be installed
by Pierre Schmitz 01 Sep '09

01 Sep '09

Hi, I would file a bug report but somehow... It seems makepkg -i just throws a warning if it cannot install the package after build. I would prefer if it would at least return something different from 0. My scripts assume that everything is fine if makepkg retuns 0 and an inter package file conflict wasn't noticed due to the behaviour that makepkg did return 0 even if something went wrong. -- Pierre Schmitz, http://users.archlinux.de/~pierre

1 0

[pacman-dev] [PATCH] Add a new reason field to pmconflict_t struct
by Nagy Gabor 01 Sep '09

01 Sep '09

>From 841439f2d5d8c8e750d7abe186a22f53f7f87729 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 31 Aug 2009 16:20:18 +0200 Subject: [PATCH] Add a new reason field to pmconflict_t struct Sometimes "foo conflicts with bar" information is not enough, see this thread: http://bbs.archlinux.org/viewtopic.php?id=77647. That's why I added a new reason field to our pmconflict_t struct that stores the packager- defined conflict that induced the fact that package1 conflicts with package2. I modified the front-end (in callback.c, sync.c, upgrade.c) to print this new information as well (only if reason differs from package2). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 1 + lib/libalpm/conflict.c | 24 +++++++++++++++++++----- lib/libalpm/conflict.h | 3 ++- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 18 ++++++++++++++---- src/pacman/sync.c | 13 ++++++++++--- src/pacman/upgrade.c | 11 +++++++++-- 7 files changed, 56 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1f33078..86dd621 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -443,6 +443,7 @@ alpm_list_t *alpm_checkconflicts(alpm_list_t *pkglist); const char *alpm_conflict_get_package1(pmconflict_t *conflict); const char *alpm_conflict_get_package2(pmconflict_t *conflict); +const char *alpm_conflict_get_reason(pmconflict_t *conflict); pmdepmod_t alpm_dep_get_mod(const pmdepend_t *dep); const char *alpm_dep_get_name(const pmdepend_t *dep); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 07ef73c..be97f00 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -41,7 +41,7 @@ #include "cache.h" #include "deps.h" -pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2) +pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason) { pmconflict_t *conflict; @@ -51,6 +51,7 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2) STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(conflict->package2, package2, RET_ERR(PM_ERR_MEMORY, NULL)); + STRDUP(conflict->reason, reason, RET_ERR(PM_ERR_MEMORY, NULL)); return(conflict); } @@ -59,6 +60,7 @@ void _alpm_conflict_free(pmconflict_t *conflict) { FREE(conflict->package2); FREE(conflict->package1); + FREE(conflict->reason); FREE(conflict); } @@ -69,6 +71,7 @@ pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict) STRDUP(newconflict->package1, conflict->package1, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(newconflict->package2, conflict->package2, RET_ERR(PM_ERR_MEMORY, NULL)); + STRDUP(newconflict->reason, conflict->reason, RET_ERR(PM_ERR_MEMORY, NULL)); return(newconflict); } @@ -122,9 +125,9 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2) * @param pkg2 package causing conflict */ static void add_conflict(alpm_list_t **baddeps, const char *pkg1, - const char *pkg2) + const char *pkg2, const char *reason) { - pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2); + pmconflict_t *conflict = _alpm_conflict_new(pkg1, pkg2, reason); if(conflict && !_alpm_conflict_isin(conflict, *baddeps)) { *baddeps = alpm_list_add(*baddeps, conflict); } else { @@ -168,9 +171,9 @@ static void check_conflict(alpm_list_t *list1, alpm_list_t *list2, if(does_conflict(pkg1, conflict, pkg2)) { if(order >= 0) { - add_conflict(baddeps, pkg1name, pkg2name); + add_conflict(baddeps, pkg1name, pkg2name, conflict); } else { - add_conflict(baddeps, pkg2name, pkg1name); + add_conflict(baddeps, pkg2name, pkg1name, conflict); } } } @@ -578,6 +581,17 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) return conflict->package2; } +const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(NULL)); + ASSERT(conflict != NULL, return(NULL)); + + return conflict->reason; +} + const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 149c728..73a6e95 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -27,6 +27,7 @@ struct __pmconflict_t { char *package1; char *package2; + char *reason; }; struct __pmfileconflict_t { @@ -36,7 +37,7 @@ struct __pmfileconflict_t { char *ctarget; }; -pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2); +pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason); pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict); void _alpm_conflict_free(pmconflict_t *conflict); int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4763924..dda4953 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -504,7 +504,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); int doremove = 0; QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, conflict->package1, - conflict->package2, NULL, &doremove); + conflict->package2, conflict->reason, &doremove); if(doremove) { /* append to the removes list */ _alpm_log(PM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8b611f1..3df3ef5 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -259,10 +259,20 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data2)); break; case PM_TRANS_CONV_CONFLICT_PKG: - *response = yesno(_(":: %s conflicts with %s. Remove %s?"), - (char *)data1, - (char *)data2, - (char *)data2); + /* data parameters: package1, package2, conflict (string) */ + /* print conflict only if it contains more information than package2 */ + if(!strcmp(data2, data3)) { + *response = yesno(_(":: %s conflicts with %s. Remove %s?"), + (char *)data1, + (char *)data2, + (char *)data2); + } else { + *response = yesno(_(":: %s conflicts with %s (%s). Remove %s?"), + (char *)data1, + (char *)data2, + (char *)data3, + (char *)data2); + } break; case PM_TRANS_CONV_REMOVE_PKGS: { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..3314545 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -650,10 +650,17 @@ static int sync_trans(alpm_list_t *targets) } break; case PM_ERR_CONFLICTING_DEPS: - for(i = data; i; i = alpm_list_next(i)) { + for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s\n"), - alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); + const char *package1 = alpm_conflict_get_package1(conflict); + const char *package2 = alpm_conflict_get_package2(conflict); + const char *reason = alpm_conflict_get_reason(conflict); + /* only print reason if it contains more information than package2 */ + if(!strcmp(package2, reason)) { + printf(_(":: %s: conflicts with %s\n"), package1, package2); + } else { + printf(_(":: %s: conflicts with %s (%s)\n"), package1, package2, reason); + } } break; default: diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 1570f95..9c3690d 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -104,8 +104,15 @@ int pacman_upgrade(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s\n"), - alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); + const char *package1 = alpm_conflict_get_package1(conflict); + const char *package2 = alpm_conflict_get_package2(conflict); + const char *reason = alpm_conflict_get_reason(conflict); + /* only print reason if it contains more information than package2 */ + if(!strcmp(package2, reason)) { + printf(_(":: %s: conflicts with %s\n"), package1, package2); + } else { + printf(_(":: %s: conflicts with %s (%s)\n"), package1, package2, reason); + } } break; case PM_ERR_FILE_CONFLICTS: -- 1.6.0.3

1 3

[pacman-dev] [PATCH] Do not remove conflict by default
by Nagy Gabor 31 Aug '09

31 Aug '09

>From 66cb7b5d48ae173944531318022d351f4e503172 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 31 Aug 2009 23:54:51 +0200 Subject: [PATCH] Do not remove conflict by default When a conflict is detected, pacman asks if the user wants to remove the conflicting package. In many cases this is a bad idea. e.g. udev conflicts with initscripts (initscripts<2009.07). Remove initscripts [Y/n] This changes the query to [y/N]. The --noconfirm behavior has been also changed, because it chooses the default answer. Since the yes answer is more interesting in our pactests dealing with conflicts, I inserted '--ask=4' to all of them with one exception: sync042.py tests the no answer. Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync042.py | 6 +++--- pactest/tests/sync043.py | 2 +- pactest/tests/sync044.py | 2 +- pactest/tests/sync1004.py | 2 +- pactest/tests/sync890.py | 2 +- pactest/tests/sync892.py | 2 +- pactest/tests/sync893.py | 2 +- pactest/tests/sync895.py | 2 +- pactest/tests/sync896.py | 2 +- pactest/tests/sync897.py | 2 +- pactest/tests/sync899.py | 2 +- pactest/tests/sync900.py | 2 +- pactest/tests/sync901.py | 2 +- pactest/tests/sync992.py | 2 +- pactest/tests/sync999.py | 2 +- src/pacman/callback.c | 4 ++-- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pactest/tests/sync042.py b/pactest/tests/sync042.py index 0aa7e37..7c3498d 100644 --- a/pactest/tests/sync042.py +++ b/pactest/tests/sync042.py @@ -9,6 +9,6 @@ self.addpkg2db("local", lp); self.args = "-S %s" % sp.name -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/sync043.py b/pactest/tests/sync043.py index 1302bf0..eb2f570 100644 --- a/pactest/tests/sync043.py +++ b/pactest/tests/sync043.py @@ -10,7 +10,7 @@ self.addpkg2db("local", lp1); lp1 = pmpkg("pkg3") self.addpkg2db("local", lp1); -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync044.py b/pactest/tests/sync044.py index c4ff154..0c8fd2e 100644 --- a/pactest/tests/sync044.py +++ b/pactest/tests/sync044.py @@ -11,7 +11,7 @@ sp3 = pmpkg("pkg3") sp3.conflicts = ["pkg1"] self.addpkg2db("sync", sp3); -self.args = "-S pkg2" +self.args = "-S pkg2 --ask=4" self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/sync1004.py b/pactest/tests/sync1004.py index f87bbe9..a9cee49 100644 --- a/pactest/tests/sync1004.py +++ b/pactest/tests/sync1004.py @@ -11,7 +11,7 @@ self.addpkg2db("sync", sp2) lp = pmpkg("depend") self.addpkg2db("local", lp) -self.args = "-S pkg1 pkg2" +self.args = "-S pkg1 pkg2 --ask=4" self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=depend") diff --git a/pactest/tests/sync890.py b/pactest/tests/sync890.py index 75947e9..e8380b7 100644 --- a/pactest/tests/sync890.py +++ b/pactest/tests/sync890.py @@ -12,7 +12,7 @@ lp2.conflicts = ["pkg3"] for p in lp1, lp2: self.addpkg2db("local", p) -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync892.py b/pactest/tests/sync892.py index 04cc79c..dfd889e 100644 --- a/pactest/tests/sync892.py +++ b/pactest/tests/sync892.py @@ -16,7 +16,7 @@ lp2.conflicts = ["pkg3"] for p in lp1, lp2: self.addpkg2db("local", p) -self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) +self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/sync893.py b/pactest/tests/sync893.py index 1c8494a..e96bb7b 100644 --- a/pactest/tests/sync893.py +++ b/pactest/tests/sync893.py @@ -13,7 +13,7 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") self.addpkg2db("local", lp2) -self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) +self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync895.py b/pactest/tests/sync895.py index 1b348c1..fd98786 100644 --- a/pactest/tests/sync895.py +++ b/pactest/tests/sync895.py @@ -12,7 +12,7 @@ lp2 = pmpkg("pkg2") lp2.depends = ["foo"] self.addpkg2db("local", lp2) -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync896.py b/pactest/tests/sync896.py index a89b5c7..492bd7b 100644 --- a/pactest/tests/sync896.py +++ b/pactest/tests/sync896.py @@ -13,7 +13,7 @@ lp2 = pmpkg("pkg2") lp2.depends = ["foo"] self.addpkg2db("local", lp2) -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/sync897.py b/pactest/tests/sync897.py index f7bd3d7..8a1c5a7 100644 --- a/pactest/tests/sync897.py +++ b/pactest/tests/sync897.py @@ -16,7 +16,7 @@ self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") self.addpkg2db("local", lp3) -self.args = "-Su" +self.args = "-Su --ask=4" self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync899.py b/pactest/tests/sync899.py index a561ae6..fd30805 100644 --- a/pactest/tests/sync899.py +++ b/pactest/tests/sync899.py @@ -11,7 +11,7 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") self.addpkg2db("local", lp2) -self.args = "-Su" +self.args = "-Su --ask=4" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync900.py b/pactest/tests/sync900.py index 16dfee1..744fad0 100644 --- a/pactest/tests/sync900.py +++ b/pactest/tests/sync900.py @@ -16,7 +16,7 @@ lp2 = pmpkg("pkg2") lp2.depends = ["foo"] self.addpkg2db("local", lp2) -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=foo") diff --git a/pactest/tests/sync901.py b/pactest/tests/sync901.py index bb420b7..f583453 100644 --- a/pactest/tests/sync901.py +++ b/pactest/tests/sync901.py @@ -16,7 +16,7 @@ lp2 = pmpkg("pkg2") lp2.depends = ["foo"] self.addpkg2db("local", lp2) -self.args = "-S %s" % sp.name +self.args = "-S %s --ask=4" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=foo") diff --git a/pactest/tests/sync992.py b/pactest/tests/sync992.py index a7ad111..63faaab 100644 --- a/pactest/tests/sync992.py +++ b/pactest/tests/sync992.py @@ -15,7 +15,7 @@ for p in sp1, sp2, sp3: lp1 = pmpkg("pkg2", "0.1-1") self.addpkg2db("local", lp1) -self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) +self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/pactest/tests/sync999.py b/pactest/tests/sync999.py index 69089fa..89447ca 100644 --- a/pactest/tests/sync999.py +++ b/pactest/tests/sync999.py @@ -14,7 +14,7 @@ self.addpkg2db("local", lp1) lp2 = pmpkg("pkg2") self.addpkg2db("local", lp2) -self.args = "-Su" +self.args = "-Su --ask=4" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4ec9b60..97dffc9 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -271,12 +271,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, void *data3, /* data parameters: package1, package2, conflict (string) */ /* print conflict only if it contains more information than package2 */ if(!strcmp(data2, data3)) { - *response = yesno(_(":: %s conflicts with %s. Remove %s?"), + *response = noyes(_(":: %s conflicts with %s. Remove %s?"), (char *)data1, (char *)data2, (char *)data2); } else { - *response = yesno(_(":: %s conflicts with %s (%s). Remove %s?"), + *response = noyes(_(":: %s conflicts with %s (%s). Remove %s?"), (char *)data1, (char *)data2, (char *)data3, -- 1.6.0.3

1 0