Author: jkupec
Date: Mon Jun 2 17:23:02 2008
New Revision: 10310
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10310&view=rev
Log:
Merged revisions 10309 via svnmerge from
http://svn.opensuse.org/svn/zypp/trunk/zypper
........
r10309 | jkupec | 2008-06-02 17:21:44 +0200 (Mon, 02 Jun 2008) | 2 lines
- --debug-solver for inr and ve (bnc #396353)
........
Modified:
branches/SuSE-Linux-11_0-Branch/zypper/ (props changed)
branches/SuSE-Linux-11_0-Branch/zypper/src/zypper.cc
Modified: branches/SuSE-Linux-11_0-Branch/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/zypper/src/zypper.cc?rev=10310&r1=10309&r2=10310&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/zypper/src/zypper.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/zypper/src/zypper.cc Mon Jun 2 17:23:02 2008
@@ -914,6 +914,7 @@
{"repo", required_argument, 0, 'r'},
{"no-recommends", no_argument, 0, 0},
{"help", no_argument, 0, 'h'},
+ {"debug-solver", no_argument, 0, 0},
{0, 0, 0, 0}
};
specific_options = verify_options;
@@ -936,6 +937,7 @@
static struct option options[] = {
{"dry-run", no_argument, 0, 'D'},
{"repo", required_argument, 0, 'r'},
+ {"debug-solver", no_argument, 0, 0},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
@@ -950,6 +952,7 @@
" Command options:\n"
"-r, --repo