moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

* has_archname changes 

* makepkg attempt at multiple file integrity checks
* honor "force" option on -S packages (not just -Su)
This commit is contained in:
Aaron Griffin 2006-11-14 17:26:19 +00:00
parent eb514bee96
commit 7d6161ccc3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/package.c
View File

@ -459,6 +459,12 @@ int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch)
if((p = _alpm_pkgname_has_arch(tmp))) {
*p = '\0';
}
if(witharch) {
/* trim architecture */
if((p = _alpm_pkgname_has_arch(tmp))) {
*p = 0;
}
}
p = tmp + strlen(tmp);

2
lib/libalpm/sync.c
View File

@ -324,7 +324,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync,
local = _alpm_db_get_pkgfromcache(db_local, spkg->name);
if(local) {
cmp = _alpm_versioncmp(local->version, spkg->version);
if(cmp > 0) {
if(cmp > 0 && !spkg->force) {
/* local version is newer -- get confirmation before adding */
int resp = 0;
QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, local, NULL, NULL, &resp);