mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
* has_archname changes
* makepkg attempt at multiple file integrity checks * honor "force" option on -S packages (not just -Su)
This commit is contained in:
parent
eb514bee96
commit
7d6161ccc3
@ -459,6 +459,12 @@ int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch)
|
|||||||
if((p = _alpm_pkgname_has_arch(tmp))) {
|
if((p = _alpm_pkgname_has_arch(tmp))) {
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
}
|
}
|
||||||
|
if(witharch) {
|
||||||
|
/* trim architecture */
|
||||||
|
if((p = _alpm_pkgname_has_arch(tmp))) {
|
||||||
|
*p = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
p = tmp + strlen(tmp);
|
p = tmp + strlen(tmp);
|
||||||
|
|
||||||
|
@ -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);
|
local = _alpm_db_get_pkgfromcache(db_local, spkg->name);
|
||||||
if(local) {
|
if(local) {
|
||||||
cmp = _alpm_versioncmp(local->version, spkg->version);
|
cmp = _alpm_versioncmp(local->version, spkg->version);
|
||||||
if(cmp > 0) {
|
if(cmp > 0 && !spkg->force) {
|
||||||
/* local version is newer -- get confirmation before adding */
|
/* local version is newer -- get confirmation before adding */
|
||||||
int resp = 0;
|
int resp = 0;
|
||||||
QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, local, NULL, NULL, &resp);
|
QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, local, NULL, NULL, &resp);
|
||||||
|
Loading…
Reference in New Issue
Block a user