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

sync.c: download packages before starting commit 

download_files sets the transaction state to STATE_DOWNLOADING.
Modifying the state after it has already been set to STATE_COMMITTING
created a brief window where SIGINT would fail to interrupt the process
and caused interrupted downloads to result in a 'transaction started'
message in the log with no matching transaction end.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
This commit is contained in:
Andrew Gregory 2014-10-11 04:08:20 -04:00 committed by Allan McRae
parent 42c859e4cc
commit c1d6cec2e2
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libalpm/sync.c
View File

@ -1263,13 +1263,12 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
return 0;
}
int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data)
{
alpm_list_t *i, *deltas = NULL;
size_t total = 0;
uint64_t total_bytes = 0;
alpm_trans_t *trans = handle->trans;
alpm_event_t event;
if(download_files(handle, &deltas)) {
alpm_list_free(deltas);
@ -1318,7 +1317,13 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
return -1;
}
trans->state = STATE_COMMITING;
return 0;
}
int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
{
alpm_trans_t *trans = handle->trans;
alpm_event_t event;
/* fileconflict check */
if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) {

1
lib/libalpm/sync.h
View File

@ -25,6 +25,7 @@
#include "alpm.h"
int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data);
int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data);
int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data);
#endif /* _ALPM_SYNC_H */

10
lib/libalpm/trans.c
View File

@ -175,6 +175,16 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data)
return 0;
}
if(trans->add) {
if(_alpm_sync_load(handle, data) != 0) {
/* pm_errno is set by _alpm_sync_load() */
return -1;
}
if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) {
return 0;
}
}
trans->state = STATE_COMMITING;
alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction started\n");