if (gSettings.license_auto_agree)
{
// TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package')
- cout << format(_("Automatically agreeing with %s %s license."))
- % it->resolvable()->name() % it->resolvable()->kind().asString()
- << endl;
+ if (!gSettings.machine_readable)
+ cout << format(_("Automatically agreeing with %s %s license."))
+ % it->resolvable()->name() % it->resolvable()->kind().asString()
+ << endl;
MIL << format("Automatically agreeing with %s %s license.")
% it->resolvable()->name() % it->resolvable()->kind().asString()
{
_resolvable = resolvable;
if (gSettings.machine_readable)
- cout << "Installing: " + to_string (resolvable) << endl;
+ cout << "Installing: " + resolvable->name() << endl;
else
cerr << "Installing: " + to_string (resolvable) << endl;
}
}
catch (const Exception & ex) {
ZYPP_CAUGHT(ex);
- cerr << _("Unexpected exception.") << endl;
- cerr << ex.asUserString() << endl;
- report_a_bug(cerr);
+
+ if (gSettings.machine_readable)
+ {
+ cerr << "ERROR:" << _("Unexpected exception.") << endl;
+ cerr << "ERROR:" << ex.asUserString() << endl;
+ }
+ else
+ {
+ cerr << _("Unexpected exception.") << endl;
+ cerr << ex.asUserString() << endl;
+ report_a_bug(cerr);
+ }
}
return ret;
}