xbps-install(1): added -I, --ignore-file-conflicts.

If set it will continue with the transaction and will
just print what are the conflicting files without returning
EEXIST.

This is a temporary solution for void where there are still
some packages with conflicting files (qt5-host-tools vs qt5-tools-devel).

With input by @duncaen
This commit is contained in:
Juan RP
2019-06-21 15:21:58 +02:00
parent 9a72aaf577
commit 4f717dc597
6 changed files with 49 additions and 25 deletions

View File

@ -460,6 +460,9 @@ collect_file(struct xbps_handle *xhp, const char *file, size_t size,
EEXIST, pkgver,
"%s: file `%s' already installed by package %s.",
pkgver, file, item->new.pkgver);
if (xhp->flags & XBPS_FLAG_IGNORE_FILE_CONFLICTS)
return 0;
return EEXIST;
}
goto add;