diff options
| author | Galen Guyer <galen@galenguyer.com> | 2022-10-04 23:25:33 -0400 |
|---|---|---|
| committer | Galen Guyer <galen@galenguyer.com> | 2022-10-05 15:57:45 -0400 |
| commit | 7c2539343396fe50dad99c3417c0a5309caee1bc (patch) | |
| tree | 8513653cf8a12f84297f4360abf363b4b47f3eda | |
| parent | a6b06a5b17e19db8700597ee06bae42b2cfe7b5a (diff) | |
Ignore all file and package conflictsno-conflicts
| -rw-r--r-- | lib/libalpm/add.c | 6 | ||||
| -rw-r--r-- | lib/libalpm/sync.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 774087fa..6dd66a53 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -289,10 +289,10 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, return 0; } else if(S_ISDIR(lsbuf.st_mode)) { /* case 5: trying to overwrite dir with file, don't allow it */ - _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), + _alpm_log(handle, ALPM_LOG_ERROR, _("extract: overwriting dir with file %s\n"), filename); - archive_read_data_skip(archive); - return 1; + // archive_read_data_skip(archive); + // return 1; } else if(S_ISDIR(entrymode)) { /* case 4: trying to overwrite file with dir */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 49bde401..5806568e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -504,7 +504,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) EVENT(handle, &event); } - if(!(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) { + if(false && !(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ event.type = ALPM_EVENT_INTERCONFLICTS_START; EVENT(handle, &event); @@ -1191,7 +1191,7 @@ int _alpm_sync_check(alpm_handle_t *handle, alpm_list_t **data) alpm_event_t event; /* fileconflict check */ - if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { + if(false && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { event.type = ALPM_EVENT_FILECONFLICTS_START; EVENT(handle, &event); |