mirror of
https://gitlab.archlinux.org/pacman/pacman.git
synced 2025-11-05 01:44:48 +01:00
Compare commits
1 Commits
morganamil
...
andrew/nol
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
448b43a5d2 |
@@ -177,8 +177,6 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data)
|
||||
ASSERT(trans != NULL, RET_ERR(handle, ALPM_ERR_TRANS_NULL, -1));
|
||||
ASSERT(trans->state == STATE_PREPARED, RET_ERR(handle, ALPM_ERR_TRANS_NOT_PREPARED, -1));
|
||||
|
||||
ASSERT(!(trans->flags & ALPM_TRANS_FLAG_NOLOCK), RET_ERR(handle, ALPM_ERR_TRANS_NOT_LOCKED, -1));
|
||||
|
||||
/* If there's nothing to do, return without complaining */
|
||||
if(trans->add == NULL && trans->remove == NULL) {
|
||||
return 0;
|
||||
|
||||
@@ -605,8 +605,8 @@ trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
|
||||
trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
|
||||
|
||||
|
||||
OPT_SHORT="k:npqRsv"
|
||||
OPT_LONG=('include-sigs' 'key:' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
OPT_SHORT="knpqRsv"
|
||||
OPT_LONG=('include-sigs' 'key' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
'sign' 'verify')
|
||||
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
||||
exit 1 # E_INVALID_OPTION
|
||||
|
||||
@@ -140,7 +140,7 @@ static void make_aligned_titles(void)
|
||||
size_t padlen = maxcol - wcol[i];
|
||||
wmemset(wbuf[i] + wlen[i], L' ', padlen);
|
||||
wmemcpy(wbuf[i] + wlen[i] + padlen, title_suffix, ARRAYSIZE(title_suffix));
|
||||
wcstombs(titles[i], wbuf[i], sizeof(titles[i]));
|
||||
wcstombs(titles[i], wbuf[i], sizeof(wbuf[i]));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user