Author: tgoettlicher Date: Wed Aug 1 14:08:05 2007 New Revision: 6359 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6359&view=rev Log: - added --non-interactive --terse to zypp-checkpatches-wrapper - added to machine_readable to zypper-callbacks Modified: trunk/zypper/src/zypp-checkpatches-wrapper.c trunk/zypper/src/zypper-callbacks.cc trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypp-checkpatches-wrapper.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-checkpatches-wrapper.c?rev=6359&r1=6358&r2=6359&view=diff ============================================================================== --- trunk/zypper/src/zypp-checkpatches-wrapper.c (original) +++ trunk/zypper/src/zypp-checkpatches-wrapper.c Wed Aug 1 14:08:05 2007 @@ -10,8 +10,10 @@ #define WRAPPER_ERROR 101 const char *app = "/usr/bin/zypper"; -const char *arg1 = "-q"; -const char *arg2 = "xu"; +const char *arg1 = "--non-interactive"; +const char *arg2 = "--terse"; +const char *arg3 = "-q"; +const char *arg4 = "xu"; int main (void) { /* cd / to avoid NFS problems */ @@ -34,7 +36,7 @@ } /* execute the real application */ - execl (app, app, arg1, arg2, (char *) NULL); + execl (app, app, arg1, arg2, arg3, arg4, (char *) NULL); /* if we are still here, it has failed */ perror ("exec"); Modified: trunk/zypper/src/zypper-callbacks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?rev=6359&r1=6358&r2=6359&view=diff ============================================================================== --- trunk/zypper/src/zypper-callbacks.cc (original) +++ trunk/zypper/src/zypper-callbacks.cc Wed Aug 1 14:08:05 2007 @@ -9,6 +9,9 @@ void display_progress (ostream & out, const string& s, int percent) { static AliveCursor cursor; + if (gSettings.machine_readable) + return; + if ( percent == 100 ) out << CLEARLN << cursor.done() << " " << s; else @@ -23,6 +26,10 @@ void display_tick (ostream & out, const string& s) { static AliveCursor cursor; + + if (gSettings.machine_readable) + return; + cursor++; out << CLEARLN << cursor << " " << s; out << flush; @@ -33,6 +40,9 @@ void display_done (ostream & out, const string& s) { static AliveCursor cursor; + if (gSettings.machine_readable) + return; + out << CLEARLN << cursor.done() << " " << s; out << flush; out << endl; @@ -41,6 +51,10 @@ // ---------------------------------------------------------------------------- void display_done (ostream & out) { + + if (gSettings.machine_readable) + return; + out << endl; } Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=6359&r1=6358&r2=6359&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Aug 1 14:08:05 2007 @@ -459,7 +459,6 @@ void cond_load_resolvables() { load_repo_resolvables(); - if ( ! gSettings.disable_system_resolvables ) { load_target_resolvables(); } @@ -524,13 +523,17 @@ void load_target_resolvables() { - cout_n << _("Reading RPM database..."); + if (!gSettings.machine_readable) + cout_n << _("Reading RPM database..."); MIL << "Going to read RPM database" << endl; - ResStore tgt_resolvables(God->target()->resolvables()); + ResStore tgt_resolvables(God->target()->resolvables()); - cout_v << " " << format(_("(%s resolvables)")) % tgt_resolvables.size(); - cout_n << endl; + if (!gSettings.machine_readable) + { + cout_v << " " << format(_("(%s resolvables)")) % tgt_resolvables.size(); + cout_n << endl; + } DBG << tgt_resolvables.size() << " resolvables read"; God->addResolvables(tgt_resolvables, true /*installed*/); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org