Author: jkupec
Date: Tue Feb 19 17:33:00 2008
New Revision: 8820
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8820&view=rev
Log:
- fixed some strings (#362927)
- removed calls to applyLocks() except before solving
Modified:
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-misc.h
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Feb 19 17:33:00 2008
@@ -879,18 +879,14 @@
}
*/
-void establish ()
+bool resolve(Zypper & zypper)
{
int locks = God->applyLocks();
- cout_v << format(_("%s items locked")) % locks << endl;
- //cout_v << _("Establishing status of aggregates") << endl;
- //God->resolver()->establishPool();
- dump_pool ();
-}
+ zypper.out().info(
+ boost::str(format(_PL("%s item locked", "%s items locked", locks)) % locks),
+ Out::HIGH);
-bool resolve(const Zypper & zypper)
-{
- establish();
+ dump_pool();
// --force-resolution command line parameter value
tribool force_resolution = indeterminate;
@@ -938,6 +934,8 @@
void patch_check ()
{
+ Out & out = Zypper::instance()->out();
+
cout_vv << "patch check" << endl;
gData.patches_count = gData.security_patches_count = 0;
@@ -957,9 +955,16 @@
}
}
- cout << format(_("%d patches needed (%d security patches)"))
- % gData.patches_count % gData.security_patches_count
- << std::endl;
+ ostringstream s;
+ // translators: %d is the number of needed patches
+ s << format(_PL("%d patch needed", "%d patches needed", gData.patches_count))
+ % gData.patches_count
+ << " ("
+ // translators: %d is the number of needed patches
+ << format(_PL("%d security patch", "%d security patches", gData.security_patches_count))
+ % gData.security_patches_count
+ << ")";
+ out.info(s.str(), Out::QUIET);
}
string string_status (const ResStatus& rs)
@@ -997,7 +1002,7 @@
}
// patches
-void show_patches(const Zypper & zypper)
+void show_patches(Zypper & zypper)
{
MIL << "Pool contains " << God->pool().size() << " items. Checking whether available patches are needed." << std::endl;
Modified: trunk/zypper/src/zypper-misc.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.h?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.h (original)
+++ trunk/zypper/src/zypper-misc.h Tue Feb 19 17:33:00 2008
@@ -55,9 +55,9 @@
//std::string calculate_token();
void establish();
-bool resolve(const Zypper & zypper);
+bool resolve(Zypper & zypper);
void dump_pool();
-void show_patches(const Zypper & zypper);
+void show_patches(Zypper & zypper);
bool xml_list_patches();
void xml_list_updates();
Modified: trunk/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/zypper/src/zypper.cc (original)
+++ trunk/zypper/src/zypper.cc Tue Feb 19 17:33:00 2008
@@ -1913,7 +1913,7 @@
// solve dependencies
if (copts.count("debug-solver"))
{
- establish();
+ //! \todo check whether applyLocks is needed here
out().info(_("Generating solver test case..."));
if (God->resolver()->createSolverTestcase("/var/log/zypper.solverTestCase"))
out().info(_("Solver test case generated successfully."));
@@ -2098,7 +2098,6 @@
// now load resolvables:
cond_load_resolvables(*this);
- establish ();
patch_check ();
if (gData.security_patches_count > 0)
@@ -2133,7 +2132,6 @@
if (exitCode() != ZYPPER_EXIT_OK)
return;
cond_load_resolvables(*this);
- establish();
show_patches(*this);
return;
@@ -2176,7 +2174,6 @@
if (exitCode() != ZYPPER_EXIT_OK)
return;
cond_load_resolvables(*this);
- establish ();
list_updates(*this, kind, best_effort );
@@ -2195,7 +2192,6 @@
if (exitCode() != ZYPPER_EXIT_OK)
return;
cond_load_resolvables(*this);
- establish ();
cout << "