diff options
| -rw-r--r-- | lib/Iurt/Chroot.pm | 7 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 547cd03..0fc5a26 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -525,6 +525,13 @@ sub build_chroot { return 0; } + # <mrl> URPMI saying ok or not, we check this anyway. So that's why + # it's outside the else. + if (! -f "$tmp_chroot/usr/bin/rpmbuild") { + plog(1, "ERROR: rpm-build is missing!"); + return 0; + } + # remove files used by --urpmi-root sudo($run, $config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg"); sudo($run, $config, "--rm", "$tmp_chroot/var/lib/urpmi/*"); diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index d22b90d..ff5b3e3 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -547,13 +547,7 @@ sub install_packages { $ok = 0; } - # <mrl> URPMI saying ok or not, we check this anyway. So that's why - # it's outside the else. - if (! -f "$chroot_tmp/usr/bin/rpmbuild") { - plog(1, "ERROR: rpm-build is missing!"); - $ok = 0; - } - elsif ($ok && (!@rpm || are_installed($chroot_tmp, @rpm))) { + if ($ok && (!@rpm || are_installed($chroot_tmp, @rpm))) { plog("installation successful"); $ok = 1; } |