keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app/override: Don't auto-enable cache-only if also installing

Browse Source 
Otherwise, we won't be able to fetch the requested packages from the
repo.

Closes: #1384

Closes: #1402
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-06-12 09:44:34 -04:00 committed by Atomic Bot
parent 27bd7b97bb
commit 073978aace
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/rpmostree-override-builtins.c
View File

@ -72,7 +72,7 @@ handle_override (RPMOSTreeSysroot *sysroot_proxy,
/* Perform uninstalls offline; users don't expect the "auto-update" behaviour here. But
* note we might still need to fetch pkgs in the local replacement case (e.g. the
* replacing pkg has an additional out-of-tree dep). */
const gboolean cache_only = (override_replace == NULL);
const gboolean cache_only = (override_replace == NULL && install_pkgs == NULL);
GVariantDict dict;
g_variant_dict_init (&dict, NULL);

5
tests/vmcheck/test-override-remove.sh
View File

@ -216,3 +216,8 @@ if vm_rpmostree override remove foo; then
fi
vm_rpmostree cleanup -p
echo "ok override remove base dep to layered pkg fails"
vm_build_rpm boo
vm_rpmostree override remove foo --install boo
vm_rpmostree cleanup -p
echo "ok remove and --install at the same time"