Author: jkupec Date: Fri Jun 20 13:21:41 2008 New Revision: 10422 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10422&view=rev Log: - fix script output Modified: branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-rpm-callbacks.h Modified: branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-rpm-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-rpm-callbacks.h?rev=10422&r1=10421&r2=10422&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-rpm-callbacks.h (original) +++ branches/SuSE-Linux-11_0-Branch/zypper/src/zypper-rpm-callbacks.h Fri Jun 20 13:21:41 2008 @@ -61,7 +61,7 @@ _label = boost::str( // TranslatorExplanation speaking of a script - "Running: script file name (package name, script dir)" boost::format(_("Running: %s (%s, %s)")) % path_r.basename() % package->name() % path_r.dirname()); - Zypper::instance()->out().progressStart("run-script", _label, false); + cout << _label << endl; } /** @@ -72,17 +72,17 @@ virtual bool progress( Notify kind, const std::string &output ) { Zypper & zypper = *Zypper::instance(); - static bool was_ping_before = true; + static bool was_ping_before = false; if (kind == PING) { - zypper.out().progress("run-script", _label); + cout << "." << flush; was_ping_before = true; } else { if (was_ping_before) - zypper.out().info("\n"); - zypper.out().info(output); + cout << endl; + cout << output; was_ping_before = false; } @@ -94,7 +94,6 @@ { Zypper & zypper = *Zypper::instance(); - zypper.out().progressEnd("run-script", _label, true); zypper.out().error(description); Action action = (Action) read_action_ari (PROMPT_ARI_PATCH_SCRIPT_PROBLEM, ABORT); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org