- Pacman-dev - lists.archlinux.org

[pacman-dev] Updated Hungarian translation + -Rh message bug
by Nagy Gabor 09 Nov '07

09 Nov '07

Hi! I attached the gzipped hu.po file. I found an issue during localization: -Rh prints usage twice. Bye, ngaba PS: "Optional deps:" is too long to fit in the "column" in Hungarian, and I didn't want to reformat all of the --info messages, so I had to use an abbreviation here :-( ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-544-g7d51882
by Dan McGee 09 Nov '07

09 Nov '07

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 7d51882dd0afdb87fe986a7d7c672cc0be93795b (commit) via 4e45e1187d01e34e0869ad206780a67f27a41200 (commit) via 889fccd55f68c919d5ceab7906c200e5011cb53b (commit) via e6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d (commit) via 5b4b4df4c9c2cfb3aa2e4b40c2c49ea8bf10ce37 (commit) via 9407baaaa68ddd30b48069ce3e96fd8c8d550b31 (commit) via c00f46b653484abe387af3a2c28507e8db4f7898 (commit) via f3e8343c7ed778deaa6615e4aca2cb68a6bc0053 (commit) via 9fdb15b4b52a6748619c4671af6cbde156921734 (commit) via dd2d6f980bb4dd3ab099f0783172c7801aa4beb5 (commit) from 23745a7bf24ffd0c44279019563502568cc1c5fb (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 7d51882dd0afdb87fe986a7d7c672cc0be93795b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 23:41:05 2007 -0600 Simplify callback DONE event handling Move them all to a single fallthrough case statement since they all print "done". Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4e45e1187d01e34e0869ad206780a67f27a41200 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 23:39:07 2007 -0600 Add missing 'done' printout Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 889fccd55f68c919d5ceab7906c200e5011cb53b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 23:38:32 2007 -0600 Small manpage updates Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 23:18:07 2007 -0600 Fix some issues with localized dates/epoch usage Commit 47622eef4dd8fd86a0aa0e3ebdb7b33f7c9d6804 introduced localized times in the metadata by way of storing the UNIX epoch value instead of a hard coded date string. However, it missed a few things: * If we weren't in the C/POSIX/en_US locale, the date parsing would fail as it tried to use the abbreviations of the locale being used. Fix this by switching the LC_TIME value before we parse a date. * We used ctime to print the date value, which is always the C locale string. Instead, use strftime to print a localized date string. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5b4b4df4c9c2cfb3aa2e4b40c2c49ea8bf10ce37 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 21:56:53 2007 -0600 Get rid of the footnotes section in generated manpages We really don't need it since it is just links. However, we do need to figure out how to get our old links to show up right. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9407baaaa68ddd30b48069ce3e96fd8c8d550b31 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 21:17:59 2007 -0600 doc: update links in footer.txt so they are actual links Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c00f46b653484abe387af3a2c28507e8db4f7898 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Thu Nov 8 21:16:07 2007 -0600 Update Italian Translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f3e8343c7ed778deaa6615e4aca2cb68a6bc0053 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 09:33:05 2007 -0600 Update PKGBUILD.5 with missing devel variable descriptions The lack of descriptions on some of the variables was causing issues with documentation generation. Adding text to them fixes this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9fdb15b4b52a6748619c4671af6cbde156921734 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 09:31:58 2007 -0600 Sync asciidoc.conf with GIT repository changes We got our file from the GIT repository originally, so keep it up to date. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd2d6f980bb4dd3ab099f0783172c7801aa4beb5 Author: Scott Horowitz <stonecrest(a)gmail.com> Date: Thu Nov 8 00:26:01 2007 -0700 Correctly handle version comparisons for SVN/CVS/etc PKGBUILDS. Retrieve SVN/CVS/etc revision number before checking if the package has already been built. This allows building a newer version of a developmental package without having to use -f. Now -f will only be needed if the latest SVN/CVS/etc revision is the same as the built package. Signed-off-by: Scott Horowitz <stonecrest(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 7 +- doc/PKGBUILD.5.txt | 7 + doc/asciidoc.conf | 6 + doc/footer.txt | 6 +- doc/makepkg.8.txt | 8 +- doc/pacman.8.txt | 2 +- lib/libalpm/be_files.c | 4 + lib/libalpm/package.c | 2 + lib/libalpm/po/it.po | 663 ++++++++-------- po/it.po | 2075 ++++++++++++++++++++++++++++++++++++------------ scripts/makepkg.sh.in | 7 +- src/pacman/callback.c | 26 +- src/pacman/package.c | 7 +- src/pacman/remove.c | 1 + 14 files changed, 1933 insertions(+), 888 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Updated Italian translation of libalpm
by Giovanni Scafora 09 Nov '07

09 Nov '07

Hi guys, I attached the gzipped it.po file (for libalpm). Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 1

[pacman-dev] Adding namcap-git to the [pacman-git] repo
by bardo 09 Nov '07

09 Nov '07

Is namcap in good shape? Is it ready to be tested? Or will it come long after pacman 3.1? Does it make sense to file a bug report on the current namcap? Corrado

3 4

[pacman-dev] Delta testing
by Nathan Jones 09 Nov '07

09 Nov '07

I have created a repo for those you who may want to help test the xdelta code in pacman 3.1. There is just one package in the repo: deltatest. I will try to update the package at least once a day. Steps for delta goodness: 1. Install pacman from git 2. Install xdelta: pacman -S xdelta 3. Add UseDelta to your pacman.conf 4. Add the deltatest server to pacman.conf: [deltatest] Server = http://home.insightbb.com/~nathanj/dt 5. Install the package: pacman -Sy deltatest 6. Update the package whenever you want 7. Report many, many bugs

4 14

[pacman-dev] Updated Italian translation
by Giovanni Scafora 08 Nov '07

08 Nov '07

Hi guys, I attached the gzipped it.po file. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

Re: [pacman-dev] Delta testing
by Dale Ogilvie 08 Nov '07

08 Nov '07

One suggestion for an additional package in your test repo: deltatest-libs-1.0.1-1-i686.pkg.tar.gz That extra hyphen in the package name can cause some grief for the delta naming code. Not saying that it will with your code, mind you, just that it did with mine ;-) Regards Dale

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-534-g23745a7
by Dan McGee 08 Nov '07

08 Nov '07

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 23745a7bf24ffd0c44279019563502568cc1c5fb (commit) via 0e83f12f4aca7abc5131b5292302f4ac9de1b56b (commit) via 4bbb055cd9938b33bb06c026099df512454f45f3 (commit) from d0d58489ff8b4458719e4bceb6a5d7290c99588a (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 23745a7bf24ffd0c44279019563502568cc1c5fb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 7 18:58:04 2007 -0600 Update the PKGBUILD example in the manpages The old one was old. Use something a bit more recent and a bit simpler as well so it actually looks OK in the manpage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e83f12f4aca7abc5131b5292302f4ac9de1b56b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 6 16:07:33 2007 -0600 Change -fstack-protector flag to -fstack-protector-all We only use it with --enable-debug, so we might as well go all out and try to find any attempt of stack smashing. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4bbb055cd9938b33bb06c026099df512454f45f3 Author: Jeff Bailes <thepizzaking(a)gmail.com> Date: Tue Nov 6 08:24:39 2007 -0600 Update en_GB translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: acinclude.m4 | 8 +- doc/PKGBUILD-example.txt | 36 +-- lib/libalpm/po/en_GB.po | 697 +++++++++++++++++--------------- po/en_GB.po | 1026 +++++++++++++++++++++++++--------------------- 4 files changed, 948 insertions(+), 819 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] The time has come- pacman 3.1 testing releases
by Dan McGee 07 Nov '07

07 Nov '07

The time has come. I really want to get pacman 3.1 out the door, and to do that, we need to test this thing a lot. I am currently ONLY supporting i686, and you will need libarchive 2.4.0 installed from testing. However, if anyone on this list would like to step forward and volunteer to build the package for x86_64, I will gladly host the built package. I've provided the PKGBUILD and accompanying files. You can use versionpkg to build this package on your own, or once you have pacman 3.1 installed makepkg has versionpkg functionality built right in so you can just use that to rebuild a new version. Notable changes and things to know: 1. The sync DBs are now in a sync/ subdir in your pacman DB directory. Thus, the old top-level dbs are obsolete. This should hopefully clearly separate the local and sync dbs and keep people from wiping that important local one. 2. I WOULD NOT recommend using the --root option at this point. I still need to make some fixes, and its behavior wrt other path options is a lot different than pacman 3.0.X. 3. Consolidated mirrorlists- you don't need 5 of them anymore. See below for a bit more info on this, and take a look at the installed /etc/pacman.conf and /etc/pacman.d/mirrorlist files. So without further ado, instructions for upgrading/testing (PLEASE read all instructions before actually doing the upgrade!): 1. Because this package will replace your stock pacman, you either need to put the package in your own local repo, or add my [pacman] repo to your pacman.conf. The second is probably a safer bet and will allow you to get updates I make to the package anyway. Once you add the repo, the package name is pacman-git. 2. Once installed, you will see that you get a whole bunch of pacsave files. A lot of these are related to the mirrorlists being consolidated into one "mirrorlist" file instead of having 5 separate but basically identical lists. I kept these on my system just so I can use the pacman2.static binary if something goes horribly wrong. (Of course, you would have to remove the pacsave extension from all of these files to use them). 3. A pacman2.static binary has been included in the package, just in case. Hopefully no one needs to use it. 4. One issue is kind of weird, and may be a bug in the way we do replaces handling. Your original pacman.conf will be moved to pacman.conf.pacsave, and the new one installed as pacman.conf. Of course, you will need to do some merging of the config files, but unfortunately they end up backwards from the norm. 5. Point 4 also applies for makepkg.conf, but the contents of this file have changed enough that you should probably just start a new one anyway. A note to testers- please let me know if anything in your upgrade path is different from above. This will really help us later when it comes to finalizing the real upgrade path. And if you hit a problem, please submit a full report to the mailling list and/or Flyspray (this means a descriptive title, steps to reproduce, and --debug output). I have this installed, so don't worry too much about it killing your system. :P And now the links and stuff: Package/DB: http://www.archlinux.org/~dan/pacman-git/ PKGBUILD/files: http://www.archlinux.org/~dan/pacman-git/pacman-git/ pacman.conf entry: [pacman-git] Server = http://www.archlinux.org/~dan/pacman-git/ -Dan

6 13

[pacman-dev] [PATCH] New -Ru option
by Nagy Gabor 06 Nov '07

06 Nov '07

Hi! The most difficult thing was: to find out good names for the option and the newly introduced stuffs. So feel free to rename them. And if you like and apply the patch, please update pacman's manual and bash-completion. Note: If user wants to remove pkg1 and pkg2 with the same "prov" provision, then only one of them should be removed from the list. That's why inducer is not checked by depmiss_isin. But if there is many multiple provision in the original target list, human may be able to compute fewer package to remove from the target list, but I don't care (pathological case):-P Enjoy it, ngaba ---------------------- From d8a7ab05ba50197386b25e7fd879f342384370d4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 26 Oct 2007 18:33:20 +0200 Subject: [PATCH] New -Ru option With --unneeded option 'pacman -R' doesn't stop in case of dependency error; it removes the needed-dependency targets from the target-list instead. See also: http://archlinux.org/pipermail/pacman-dev/2007-October/009653.html The patch also adds a new inducer field to pmdepmissing_t which indicates the to-be-removed package which would cause a dependency break. This is needed, because miss->depend.name may be a provision. miss->depend will be useful in -R dependency error messages too. A new _alpm_pkgname_pkg_cmp(pkgname, pkg) function is also added, which retruns true iff pkg's name is pkgname. This is useful if you want to remove a package from pmpkg_t* list, and you want to search for package name. remove049.py tests -Ru. --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/conflict.c | 2 +- lib/libalpm/deps.c | 41 ++++++++++++++++++++++++++++------------- lib/libalpm/deps.h | 3 ++- lib/libalpm/package.c | 5 +++++ lib/libalpm/package.h | 1 + lib/libalpm/remove.c | 15 +++++++++++++++ src/pacman/pacman.c | 3 +++ 8 files changed, 58 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2000db4..99dcd24 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -275,7 +275,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_UNNEEDED = 0x2000, } pmtransflag_t; /* Transaction Events */ @@ -375,6 +376,7 @@ alpm_list_t *alpm_checkdeps(pmdb_t *db, pmtranstype_t op, const char *alpm_miss_get_target(pmdepmissing_t *miss); pmdeptype_t alpm_miss_get_type(pmdepmissing_t *miss); pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); +const char *alpm_miss_get_inducer(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); const char *alpm_dep_get_name(pmdepend_t *dep); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d09c996..bf8aa80 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -76,7 +76,7 @@ static void add_conflict(alpm_list_t **baddeps, const char *pkg1, const char *pkg2) { pmdepmissing_t *miss = _alpm_depmiss_new(pkg1, PM_DEP_TYPE_CONFLICT, - PM_DEP_MOD_ANY, pkg2, NULL); + PM_DEP_MOD_ANY, pkg2, NULL, ""); if(miss && !_alpm_depmiss_isin(miss, *baddeps)) { *baddeps = alpm_list_add(*baddeps, miss); } else { diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7f4fb0b..f8109d8 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -65,7 +65,7 @@ static void _alpm_graph_free(void *data) pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion) + const char *depversion, const char *inducer) { pmdepmissing_t *miss; @@ -86,6 +86,7 @@ pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, } else { miss->depend.version[0] = 0; } + strncpy(miss->inducer, inducer, PKG_NAME_LEN); return(miss); } @@ -333,7 +335,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "checkdeps: updated '%s' won't satisfy a dependency of '%s'\n", alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -382,7 +384,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", depend->name, alpm_pkg_get_name(tp)); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -437,7 +439,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, alpm_pkg_get_name(p), alpm_pkg_get_name(rmpkg)); miss = _alpm_depmiss_new(alpm_pkg_get_name(p), PM_DEP_TYPE_DEPEND, depend->mod, depend->name, - depend->version); + depend->version, alpm_pkg_get_name(rmpkg)); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -772,7 +774,19 @@ error: return(-1); } -const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) + +pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(-1)); + ASSERT(miss != NULL, return(-1)); + + return miss->type; +} + +pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -780,21 +794,21 @@ const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return miss->target; + return &miss->depend; } -pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_inducer(pmdepmissing_t *miss) { ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(handle != NULL, return(-1)); - ASSERT(miss != NULL, return(-1)); + ASSERT(handle != NULL, return(NULL)); + ASSERT(miss != NULL, return(NULL)); - return miss->type; + return miss->inducer; } -pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -802,9 +816,10 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return &miss->depend; + return miss->target; } + pmdepmod_t SYMEXPORT alpm_dep_get_mod(pmdepend_t *dep) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 59b2630..6f01593 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -40,6 +40,7 @@ struct __pmdepmissing_t { char target[PKG_NAME_LEN]; pmdeptype_t type; pmdepend_t depend; + char inducer[PKG_NAME_LEN]; /* this is used in case of remove dependency error only */ }; /* Graphs */ @@ -53,7 +54,7 @@ struct __pmgraph_t { pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion); + const char *depversion, const char *inducer); int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f6f5a9..00e8332 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -803,6 +803,11 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2))); } +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package) +{ + return(strcmp(alpm_pkg_get_name((pmpkg_t *) package), (char *) pkgname)); +} + /* Parses the package description file for the current package * TODO: this should ALL be in a backend interface (be_files), we should * be dealing with the abstracted concepts only in this file diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index daaeb36..d7032e6 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -94,6 +94,7 @@ pmpkg_t* _alpm_pkg_new(const char *name, const char *version); pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(pmpkg_t *pkg); int _alpm_pkg_cmp(const void *p1, const void *p2); +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package); int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full); pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0ed4dd0..3904a36 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -126,6 +126,21 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) FREELIST(lp); lp = _alpm_checkdeps(db, trans->type, trans->packages); } + } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { + while(lp != NULL) { + alpm_list_t *i; + for(i = lp; i; i = i->next) { + pmdepmissing_t *miss = (pmdepmissing_t *)i->data; + pmpkg_t *unneeded; + trans->packages = alpm_list_remove(trans->packages, miss->inducer, _alpm_pkgname_pkg_cmp, &unneeded); + if(unneeded) { + _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", alpm_pkg_get_name(unneeded)); + alpm_pkg_free(unneeded); + } + } + FREELIST(lp); + lp = _alpm_checkdeps(db, trans->type, trans->packages); + } } else { if(data) { *data = lp; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 705edaf..199878f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -95,6 +95,7 @@ static void usage(int op, char *myname) printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); + printf(_(" -u, --unneeded remove only unneeded packages (that won't break packages)\n")); } else if(op == PM_OP_UPGRADE) { if(config->flags & PM_TRANS_FLAG_FRESHEN) { printf("%s: %s {-F --freshen} [%s] <%s>\n", str_usg, myname, str_opt, str_file); @@ -277,6 +278,7 @@ static int parseargs(int argc, char *argv[]) {"orphans", no_argument, 0, 't'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, + {"unneeded", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, @@ -413,6 +415,7 @@ static int parseargs(int argc, char *argv[]) case 'u': config->op_s_upgrade = 1; config->op_q_upgrade = 1; + config->flags |= PM_TRANS_FLAG_UNNEEDED; break; case 'v': (config->verbose)++; break; case 'w': diff --git a/pactest/tests/remove049.py b/pactest/tests/remove049.py new file mode 100644 index 0000000..724f8da --- /dev/null +++ b/pactest/tests/remove049.py @@ -0,0 +1,19 @@ +self.description = "-Ru test" + +lp1 = pmpkg("pkg1") +lp1.requiredby = [ "pkg3" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.depends = [ "pkg1" ] +self.addpkg2db("local", lp3) + +self.args = "-Ru pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") \ No newline at end of file -- 1.5.3.4

4 13