- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/pactest (tests/scriptlet001.py util.py)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 04:30:18 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Added: tests/scriptlet001.py (1.1) Modified: util.py (1.6 -> 1.7) Quick pactest changes: * Minor change to utils.py(grep) to make it cleaner * Added scriptlet check to verify scriptlet events happen -----------------------+ tests/scriptlet001.py | 15 +++++++++++++++ util.py | 14 +++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) Index: pacman-lib/pactest/tests/scriptlet001.py diff -u /dev/null pacman-lib/pactest/tests/scriptlet001.py:1.1 --- /dev/null Thu Mar 22 04:30:18 2007 +++ pacman-lib/pactest/tests/scriptlet001.py Thu Mar 22 04:30:18 2007 @@ -0,0 +1,15 @@ +# quick note here - chroot() is expected to fail. We're not checking the +# validity of the scripts, only that they fire (or try to) +self.description = "Scriptlet test (pre/post install)" + +p1 = pmpkg("dummy") +p1.files = ['etc/dummy.conf'] +p1.install['pre_install'] = "ls /etc"; +p1.install['post_install'] = "ls /etc"; +self.addpkg(p1) + +self.args = "-U %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=pre_install") +self.addrule("PACMAN_OUTPUT=post_install") Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.6 pacman-lib/pactest/util.py:1.7 --- pacman-lib/pactest/util.py:1.6 Mon Mar 5 17:13:34 2007 +++ pacman-lib/pactest/util.py Thu Mar 22 04:30:18 2007 @@ -236,16 +236,12 @@ # def grep(filename, pattern): - found = 0 - fd = file(filename, "r") - while 1 and not found: - line = fd.readline() - if not line: - break + lines = file(filename, 'r').readlines() + for line in lines: + if not line: break if line.find(pattern) != -1: - found = 1 - fd.close() - return found + return True + return False def mkdir(dir): if os.path.isdir(dir):

3 2

[pacman-dev] [patch] updates for NEWS file
by Roman Kyrylych 22 Mar '07

22 Mar '07

Hi! * added few missed news (hopefully nothing interesting is missed) * changed wording of some news and other cosmetic fixes * reordered the list Signed-off-by: Roman Kyrylych diff -uprN pacman-lib.orig/NEWS pacman-lib/NEWS --- pacman-lib.orig/NEWS 2007-03-22 14:15:15.000000000 +0200 +++ pacman-lib/NEWS 2007-03-22 16:49:06.000000000 +0200 @@ -1,40 +1,56 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- 3.0.0 - first release based on libalpm backend - - added internationalization (gettext) support - - prompt to delete corrupted packages + - added internationalization (gettext) support, + de, fr, hu, it, pt_BR, en_GB, ru translations included + - switch to usage of libdownload and libarchive + - improved proxy support as a result of switch to libdownload - documentation - man pages updated, new conf manpages added + - repository mirror list updates - added support for package changelogs - logging of all install scriptlet messages to pacman.log - - repository mirror list updates - orphans search (-Qe) now shows true orphans - - new -Qu option- show all packages that can be upgraded + - new -Qu option - show all packages that can be upgraded + - new -Se option - install only dependencies - dependency sorting on install and removal - - improved backup handling- backup array is proactive on upgrade - - new uncompressed size field, shown on sync upgrade - check for free space before installing packages + - prompt to delete corrupted packages + - improved backup handling - backup array is proactive on upgrade + - removed NoUpgrade lines from default pacman.conf + - new uncompressed size field, shown on sync upgrade - improved progress and progressbar output - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - - switch to usage of libdownload and libarchive - - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - - added 'rankmirrors' - script to show best available mirrors - - added 'repo-add' - the backbone script for building repos - - added pactest testing suite - - abs - supports cvsup/csup, expanded configuration - - abs - supports fetching of testing repository - - makepkg fixes: + - makepkg changes: + - arch field is required + - added -arch suffix to generated package filenames - new configuration file options format + - changed default configuration - support alternate integrity checks - extract files using filetype, not extension - added noextract array + - new options array format - new option to log build process - - new repackage option - repackage pkg/ w/o building + - new repackage option - repackage pkg/ without building - user-selectable paths for doc stripping - configurable source cache location - dependencies now removed on a build success or failure - - pacman-optimize - support DB's on separate filesystem + - abs changes: + - supports both cvsup and csup + - expanded configuration + - added support for testing repository + - gensync writes more info about packages in a repo database file + - pacman-optimize - support databases on separate filesystem + - added new helper scripts: + - rankmirrors - shows best available mirrors + - repo-add - adds a package to a repo database file + - repo-remove - removes a package from a repo database file + - added pactest testing suite + - new build system + - language bindings support + - more architectures support + - many, many fixes and small inprovements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] CVS update of pacman-lib (15 files)
by Dan McGee 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 10:51:01 Author: dan Path: /home/cvs-pacman/pacman-lib Added: lib/libalpm/po/ru_RU.po (1.1) Modified: lib/libalpm/po/LINGUAS (1.4 -> 1.5) lib/libalpm/po/de.po (1.13 -> 1.14) lib/libalpm/po/en_GB.po (1.2 -> 1.3) lib/libalpm/po/fr.po (1.8 -> 1.9) lib/libalpm/po/hu.po (1.9 -> 1.10) lib/libalpm/po/it.po (1.18 -> 1.19) lib/libalpm/po/pt_BR.po (1.8 -> 1.9) src/pacman/po/de.po (1.16 -> 1.17) src/pacman/po/en_GB.po (1.4 -> 1.5) src/pacman/po/fr.po (1.12 -> 1.13) src/pacman/po/hu.po (1.13 -> 1.14) src/pacman/po/it.po (1.19 -> 1.20) src/pacman/po/pt_BR.po (1.11 -> 1.12) src/pacman/po/ru_RU.po (1.3 -> 1.4) Lots of translation updates before we release. * Ran msgmerge on all po files from new pot files, but did not check in the updated pot files as that just causes problems. * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * Updated Russian translation, added libalpm partial translation Владимир Байраковский <4rayven(a)gmail.com> * Updated Hungarian translation Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> * Updated French translation solsTiCe d'Hiver <solstice.dhiver(a)laposte.net> Thanks again guys! -------------------------+ lib/libalpm/po/LINGUAS | 1 lib/libalpm/po/de.po | 265 ++++---- lib/libalpm/po/en_GB.po | 240 +++---- lib/libalpm/po/fr.po | 663 ++++++++++---------- lib/libalpm/po/hu.po | 216 +++--- lib/libalpm/po/it.po | 310 ++++----- lib/libalpm/po/pt_BR.po | 238 +++---- lib/libalpm/po/ru_RU.po | 1499 ++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/de.po | 243 ++++--- src/pacman/po/en_GB.po | 202 +++--- src/pacman/po/fr.po | 392 ++++++------ src/pacman/po/hu.po | 236 +++---- src/pacman/po/it.po | 53 - src/pacman/po/pt_BR.po | 207 +++--- src/pacman/po/ru_RU.po | 225 +++--- 15 files changed, 3312 insertions(+), 1678 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] 20070322 Updated Italian Translation
by Giovanni Scafora 22 Mar '07

22 Mar '07

Hi guys, there is the updated italian translation patch. Thanks a lot. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [bug?] pacman 3 doesn't check for free space in /var/cache/pacman/pkg/
by bardo 22 Mar '07

22 Mar '07

Hi. I looked at the Flyspray and it seems this hasn't been seen before: pacman doesn't care if it has enough space to copy the downloaded file from the temporary source, and sometimes it fails. POC follows (I filled up my /var on purpose, then tried to install a package that wasn't in my cache). <code> [root@damocles ~]# df /var/ Filesystem 1K-blocks Used Available Use% Mounted on /dev/sdb6 3092380 3092380 0 100% /var [root@damocles ~]# pacman3 -S openvpn resolving dependencies... done. looking for inter-conflicts... done. Targets: openvpn-2.0.9-1 Total Package Size: 0.22 MB Proceed with installation? [Y/n] y :: Retrieving packages from current... openvpn 220.3K 183.0K/s 00:00:01 [---------------------] 100% checking package integrity... :: Archive openvpn-2.0.9-1.pkg.tar.gz is corrupted. Do you want to delete it? [Y/n] y error: failed to commit transaction (corrupted package) archive openvpn-2.0.9-1.pkg.tar.gz was corrupted (bad MD5 or SHA1 checksum) errors occurred, no packages were upgraded. [root@damocles ~]# </code> As you may notice, the package is actually downloaded, then marked as corrupted. bardo

2 3

[pacman-dev] Russian translation patch
by Владимир Байраковский 22 Mar '07

22 Mar '07

Hi! I've made some improvements in src/pacman/po/ru_RU.po (thanks to shild < sxp(a)bk.ru>) and new lib/libalpm/po/ru_RU.po added.

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 04:28:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.128 -> 1.129) I was mistaken, newpkg->data IS useful here, as the scriptlet isn't in the FS at this point -------+ add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.128 pacman-lib/lib/libalpm/add.c:1.129 --- pacman-lib/lib/libalpm/add.c:1.128 Thu Mar 22 04:22:48 2007 +++ pacman-lib/lib/libalpm/add.c Thu Mar 22 04:28:09 2007 @@ -361,7 +361,7 @@ /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, scriptlet, "pre_upgrade", newpkg->version, oldpkg->version, trans); + _alpm_runscriptlet(handle->root, newpkg->data, "pre_upgrade", newpkg->version, oldpkg->version, trans); } } else { is_upgrade = 0; @@ -371,7 +371,7 @@ /* pre_install scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, scriptlet, "pre_install", newpkg->version, NULL, trans); + _alpm_runscriptlet(handle->root, newpkg->data, "pre_install", newpkg->version, NULL, trans); } }

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c remove.c util.c)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 04:22:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.127 -> 1.128) remove.c (1.75 -> 1.76) util.c (1.50 -> 1.51) * Correct install scriptlet usage (reuse of handle->root when not needed) * Skip running scriptlet when chroot fails - to prevent issues in the host filesystem ----------+ add.c | 15 ++++++++------- remove.c | 12 +++++------- util.c | 2 ++ 3 files changed, 15 insertions(+), 14 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.127 pacman-lib/lib/libalpm/add.c:1.128 --- pacman-lib/lib/libalpm/add.c:1.127 Sun Mar 11 17:10:03 2007 +++ pacman-lib/lib/libalpm/add.c Thu Mar 22 04:22:48 2007 @@ -318,6 +318,7 @@ pkg_count = alpm_list_count(trans->targets); for(targ = trans->packages; targ; targ = targ->next) { + char scriptlet[PATH_MAX+1]; int targ_count = 0, is_upgrade = 0, use_md5 = 0; double percent = 0.0; pmpkg_t *newpkg = (pmpkg_t *)targ->data; @@ -328,6 +329,9 @@ break; } + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, + alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + /* check if we have a valid sha1sum, if not, use MD5 */ if(strlen(newpkg->sha1sum) == 0) { use_md5 = 1; @@ -357,7 +361,7 @@ /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, newpkg->data, "pre_upgrade", newpkg->version, oldpkg->version, trans); + _alpm_runscriptlet(handle->root, scriptlet, "pre_upgrade", newpkg->version, oldpkg->version, trans); } } else { is_upgrade = 0; @@ -367,7 +371,7 @@ /* pre_install scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle->root, newpkg->data, "pre_install", newpkg->version, NULL, trans); + _alpm_runscriptlet(handle->root, scriptlet, "pre_install", newpkg->version, NULL, trans); } } @@ -817,15 +821,12 @@ /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - char pm_install[PATH_MAX]; - snprintf(pm_install, PATH_MAX, "%s%s%s-%s/install", handle->root, db->path, - alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); if(is_upgrade) { - _alpm_runscriptlet(handle->root, pm_install, "post_upgrade", + _alpm_runscriptlet(handle->root, scriptlet, "post_upgrade", alpm_pkg_get_version(newpkg), oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans); } else { - _alpm_runscriptlet(handle->root, pm_install, "post_install", + _alpm_runscriptlet(handle->root, scriptlet, "post_install", alpm_pkg_get_version(newpkg), NULL, trans); } } Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.75 pacman-lib/lib/libalpm/remove.c:1.76 --- pacman-lib/lib/libalpm/remove.c:1.75 Fri Mar 9 00:33:06 2007 +++ pacman-lib/lib/libalpm/remove.c Thu Mar 22 04:22:48 2007 @@ -275,7 +275,7 @@ for(targ = trans->packages; targ; targ = targ->next) { int position = 0; - char pm_install[PATH_MAX]; + char scriptlet[PATH_MAX]; alpm_list_t *files; info = (pmpkg_t*)targ->data; const char *pkgname = NULL; @@ -284,6 +284,8 @@ break; } + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, + pkgname, alpm_pkg_get_version(info)); /* get the name now so we can use it after package is removed */ pkgname = alpm_pkg_get_name(info); @@ -294,9 +296,7 @@ /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); - _alpm_runscriptlet(handle->root, pm_install, "pre_remove", + _alpm_runscriptlet(handle->root, scriptlet, "pre_remove", alpm_pkg_get_version(info), NULL, trans); } } @@ -324,9 +324,7 @@ if(trans->type != PM_TRANS_TYPE_UPGRADE) { /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - pkgname, alpm_pkg_get_version(info)); - _alpm_runscriptlet(handle->root, pm_install, "post_remove", + _alpm_runscriptlet(handle->root, scriptlet, "post_remove", alpm_pkg_get_version(info), NULL, trans); } } Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.50 pacman-lib/lib/libalpm/util.c:1.51 --- pacman-lib/lib/libalpm/util.c:1.50 Mon Mar 19 00:49:28 2007 +++ pacman-lib/lib/libalpm/util.c Thu Mar 22 04:22:48 2007 @@ -431,6 +431,7 @@ if(stat(installfn, &buf)) { /* not found */ + _alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found", installfn); return(0); } @@ -469,6 +470,7 @@ /* just in case our cwd was removed in the upgrade operation */ if(chdir(root) != 0) { _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)"), root, strerror(errno)); + goto cleanup; } _alpm_log(PM_LOG_DEBUG, _("executing %s script..."), script);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (query.c)
by Aaron Griffin 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 03:32:54 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: query.c (1.31 -> 1.32) * -Qo now properly resolves paths when finding an owner NOTE that we do NOT want symlinked *files* resolved, only paths (i.e. /usr/lib/perl5/site_perl/*) ---------+ query.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.31 pacman-lib/src/pacman/query.c:1.32 --- pacman-lib/src/pacman/query.c:1.31 Tue Mar 20 23:38:43 2007 +++ pacman-lib/src/pacman/query.c Thu Mar 22 03:32:54 2007 @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <libintl.h> #include <errno.h> +#include <unistd.h> #include <alpm.h> #include <alpm_list.h> @@ -43,11 +44,43 @@ extern config_t *config; extern pmdb_t *db_local; +static char *resolve_path(const char* file) +{ + char *copy, *p, *str = NULL; + + if(!(copy = strdup(file))) { + return(NULL); + } + + if((p = strrchr(copy, '/')) == NULL) { + return(copy); + } else { + *p = '\0'; ++p; + + str = calloc(PATH_MAX+1, sizeof(char)); + if(!str) { + /* null hmmm.... */ + return(NULL); + } + + if(!realpath(copy, str)) { + return(NULL); + } + + str[strlen(str)] = '/'; + strcat(str, p); + } + + free(copy); + return(str); +} + + static void query_fileowner(pmdb_t *db, char *filename) { struct stat buf; int gotcha = 0; - char rpath[PATH_MAX]; + char *rpath; alpm_list_t *i, *j; if(db == NULL) { @@ -68,7 +101,7 @@ return; } - if(realpath(filename, rpath) == NULL) { + if(!(rpath = resolve_path(filename))) { ERR(NL, _("cannot determine real path for '%s': %s"), filename, strerror(errno)); return; } @@ -77,20 +110,24 @@ pmpkg_t *info = alpm_list_getdata(i); for(j = alpm_pkg_get_files(info); j && !gotcha; j = alpm_list_next(j)) { - char path[PATH_MAX]; - char *filename = alpm_list_getdata(j); - snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), filename); + char path[PATH_MAX], *ppath; + snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j)); + + ppath = resolve_path(path); - if(strcmp(path, rpath) == 0) { - printf(_("%s is owned by %s %s\n"), path, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + if(ppath && strcmp(ppath, rpath) == 0) { + printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); gotcha = 1; - break; } + + free(ppath); } } if(!gotcha) { ERR(NL, _("No package owns %s\n"), filename); } + + free(rpath); } int pacman_query(alpm_list_t *targets)

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (conflict.c)
by Dan McGee 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 02:25:26 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: conflict.c (1.46 -> 1.47) * Fix conflict checking to ignore symlinks that were in previous version of package. Regression from 2.9.8. ------------+ conflict.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.46 pacman-lib/lib/libalpm/conflict.c:1.47 --- pacman-lib/lib/libalpm/conflict.c:1.46 Mon Mar 5 17:13:33 2007 +++ pacman-lib/lib/libalpm/conflict.c Thu Mar 22 02:25:26 2007 @@ -366,14 +366,14 @@ return(conflicts); } +/* Find file conflicts that may occur during the transaction with two checks: + * 1: check every target against every target + * 2: check every target against the filesystem */ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root) { - alpm_list_t *i, *j, *k; - alpm_list_t *conflicts = NULL; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *i, *conflicts = NULL; alpm_list_t *targets = trans->packages; int numtargs = alpm_list_count(targets); - double percent; ALPM_LOG_FUNC; @@ -382,17 +382,16 @@ } for(i = targets; i; i = i->next) { + alpm_list_t *j, *k, *tmpfiles = NULL; pmpkg_t *p1, *p2, *dbpkg; - char *filestr = NULL; char path[PATH_MAX+1]; - struct stat buf; p1 = i->data; if(!p1) { continue; } - percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) + double percent = (double)(alpm_list_count(targets) - alpm_list_count(i) + 1) / alpm_list_count(targets); PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100), numtargs, (numtargs - alpm_list_count(i) +1)); @@ -407,7 +406,6 @@ tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2)); if(tmpfiles) { - char path[PATH_MAX]; for(k = tmpfiles; k; k = k->next) { snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data); conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_TARGET, path, @@ -418,6 +416,10 @@ } } + /* declarations for second check */ + struct stat buf; + char *filestr = NULL; + /* CHECK 2: check every target against the filesystem */ _alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s", p1->name); dbpkg = _alpm_db_get_pkgfromcache(db, p1->name); @@ -443,6 +445,26 @@ if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s", path); + /* Make sure the possible conflict is not a symlink that points to a + * path in the old package. This is kind of dirty with inode usage */ + if(dbpkg) { + struct stat buf2; + char str[PATH_MAX+1]; + unsigned ok = 0; + for(k = dbpkg->files; k; k = k->next) { + snprintf(str, PATH_MAX, "%s%s", root, (char*)k->data); + lstat(str, &buf2); + if(buf.st_ino == buf2.st_ino) { + ok = 1; + _alpm_log(PM_LOG_DEBUG, "conflict was a symlink: %s", path); + break; + } + } + if(ok == 1) { + continue; + } + } + /* Look at all the targets to see if file has changed hands */ int resolved_conflict = 0; /* have we acted on this conflict? */ for(k = targets; k; k = k->next) {

1 0