5 Commits

Author	SHA1	Message	Date
Colin Walters	051cdf396c	lib/checkout: Rename disjoint union, change to merge identical files ... It turns out that librpm automatically merges identical files between distinct packages, and this occurs in practice with Fedora today between `chkconfig` and `initscripts` for exmaple. Since we added this for rpm-ostree, we basically want to do what librpm does, let's change the semantics to do a merge. While we're here rename to `UNION_IDENTICAL`. Closes: #1156 Approved by: jlebon	2017-09-13 19:19:33 +00:00
Ruixin	f07432d4ce	checkout: add an extra checkout_overwrite mode ... This is for issue projectatomic/rpm-ostree#365, an extra option of overwrite mode is added to the checkout command so that when there is "non-directory" file already exist during checkout, the error will be handled. Some tests are added for regression Closes: #1116 Approved by: cgwalters	2017-09-01 15:42:50 +00:00
Simon McVittie	355e8516b0	Remove shebang from bash completions ... bash completions are to be sourced. It makes little sense to execute them. Detected by Debian's Lintian tool, which warns about non-executable files that appear to be #! scripts. Signed-off-by: Simon McVittie <smcv@collabora.com> Closes: #1119 Approved by: cgwalters	2017-08-29 19:19:56 +00:00
Jonathan Lebon	9342be6e34	ostree-sysroot: make simple_write_deployment smarter ... This is a follow-up to https://github.com/ostreedev/ostree/pull/1097. We make simple_write_deployment smart enough so that it can be used for rpm-ostree's purposes. This is mostly an upstreaming of logic that already existed there. Notably we correctly append NOT_DEFAULT deployments *after* the booted deployment and we now support RETAIN_PENDING and RETAIN_ROLLBACK flags to have more granularity on deployment pruning. Expose these new flags on the CLI using new options (as well as expose the previously existing NOT_DEFAULT flag as --not-as-default). I couldn't add tests for --retain-pending because the merge deployment is always the topmost one. Though I did check that it worked in a VM. Closes: #1110 Approved by: cgwalters	2017-08-25 01:02:15 +00:00
Matthew Barnes	a11d696b4c	bash: Add bash completion ... Completes commands, options, commit checksums, ref names, remotes, and file paths. Closes: #1077 Approved by: jlebon	2017-08-15 15:51:34 +00:00