Author: mlandres
Date: Thu Jul 10 18:18:38 2008
New Revision: 10533
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10533&view=rev
Log:
- If zypp is locked, the text provided by ZYppFactoryException. It
contains pid and name of the locking application. (bnc #280537)
Modified:
trunk/zypper/package/zypper.changes
trunk/zypper/src/Zypper.cc
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?rev=10533&r1=10532&r2=10533&view=diff
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Thu Jul 10 18:18:38 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 10 18:15:43 CEST 2008 - ma@suse.de
+
+- If zypp is locked, the text provided by ZYppFactoryException. It
+ contains pid and name of the locking application. (bnc #280537)
+- r10533
+
+-------------------------------------------------------------------
Wed Jul 9 22:14:28 CEST 2008 - jkupec@suse.cz
- fix setting of solver flags for dist-upgrade (bnc #406959)
Modified: trunk/zypper/src/Zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10533&r1=10532&r2=10533&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.cc (original)
+++ trunk/zypper/src/Zypper.cc Thu Jul 10 18:18:38 2008
@@ -84,7 +84,7 @@
Zypper::Ptr & Zypper::instance()
{
static Zypper::Ptr _instance;
-
+
if (!_instance)
_instance.reset(new Zypper());
else
@@ -106,7 +106,7 @@
MIL << "Caught exit request:" << endl << e.msg() << endl;
return exitCode();
}
-
+
if (runningHelp())
{
safeDoCommand();
@@ -138,7 +138,7 @@
{
if (_out_ptr)
return *_out_ptr;
-
+
cerr << "uninitialized output writer" << endl;
ZYPP_THROW(ExitRequestException("no output writer"));
}
@@ -154,7 +154,7 @@
"\t--table-style, -s\tTable style (integer).\n"
"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
"\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n"
- "\t--xmlout, -x\t\tSwitch to XML output.\n"
+ "\t--xmlout, -x\t\tSwitch to XML output.\n"
"\t--reposd-dir, -D <dir>\tUse alternative repository definition files directory.\n"
"\t--cache-dir, -C <dir>\tUse alternative meta-data cache database directory.\n"
"\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n"
@@ -188,7 +188,7 @@
"\trefresh, ref\t\tRefresh all repositories.\n"
"\tclean\t\t\tClean local caches.\n"
);
-
+
static string help_package_commands = _("\tSoftware Management:\n"
"\tinstall, in\t\tInstall packages.\n"
"\tremove, rm\t\tRemove packages.\n"
@@ -259,9 +259,9 @@
/*
* parses global options, returns the command
- *
+ *
* \returns ZypperCommand object representing the command or ZypperCommand::NONE
- * if an unknown command has been given.
+ * if an unknown command has been given.
*/
void Zypper::processGlobalOptions()
{
@@ -372,7 +372,7 @@
str::form(_("Use an integer number from %d to %d"), 0, 8));
}
- if (gopts.count("terse"))
+ if (gopts.count("terse"))
{
_gopts.machine_readable = true;
_gopts.no_abbrev = true;
@@ -380,7 +380,7 @@
}
// ======== other global options ========
-
+
string rug_test(_argv[0]);
if (gopts.count("rug-compatible") || rug_test.rfind("rug") == rug_test.size()-3 )
{
@@ -677,7 +677,7 @@
default:;
}
- // clear any previous arguments
+ // clear any previous arguments
_arguments.clear();
// clear command options
if (!_copts.empty())
@@ -698,7 +698,7 @@
gData.current_repo = RepoInfo();
// TODO:
- // gData.repos re-read after repo operations or modify/remove these very repoinfos
+ // gData.repos re-read after repo operations or modify/remove these very repoinfos
// gData.repo_resolvables re-read only after certain repo operations (all?)
// gData.target_resolvables re-read only after installation/removal/update
// call target commit refresh pool after installation/removal/update (#328855)
@@ -725,13 +725,13 @@
}
catch (const ExitRequestException & e)
{
- MIL << "Caught exit request:" << endl << e.msg() << endl;
+ MIL << "Caught exit request:" << endl << e.msg() << endl;
}
catch (const Exception & ex)
{
ZYPP_CAUGHT(ex);
- Out::Verbosity tmp = out().verbosity();
+ Out::Verbosity tmp = out().verbosity();
out().setVerbosity(Out::DEBUG);
out().error(ex, _("Unexpected exception."));
out().setVerbosity(tmp);
@@ -877,7 +877,7 @@
" Default: %s.\n"
"-n, --name Select resolvables by plain name, not by capability.\n"
"-C, --capability Select resolvables by capability.\n"
- " --debug-solver Create solver test case for debugging.\n"
+ " --debug-solver Create solver test case for debugging.\n"
"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n"
" --force-resolution Force the solver to find a solution (even an agressive).\n"
"-D, --dry-run Test the removal, do not actually remove.\n"
@@ -1113,7 +1113,7 @@
specific_options = service_modify_options;
_command_help = str::form(_(
// translators: %s is "--all|--remote|--local|--medium-type"
- // and "--all, --remote, --local, --medium-type"
+ // and "--all, --remote, --local, --medium-type"
"modifyrepo (mr) <options>