Don't check for git on CANNED
`rpm` doesn't work. I dunno off-hand how you'd install git on ostree if it wasn't there, so let's just assume it will be. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
6da1dbcdb9
commit
b8c58428b0
@ -9,8 +9,10 @@ use utils;
|
|||||||
|
|
||||||
sub check_and_install_git {
|
sub check_and_install_git {
|
||||||
# Let's see if Git is installed and install it, if it isn't.
|
# Let's see if Git is installed and install it, if it isn't.
|
||||||
if (script_run("rpm -q git")) {
|
unless (get_var("CANNED")) {
|
||||||
assert_script_run("dnf install -y git");
|
if (script_run("rpm -q git")) {
|
||||||
|
assert_script_run("dnf -y install git", 180);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user