Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10573 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Mon, 14 Jul 2008 11:53:28 -0000
  • Message-id: <20080714115329.130EB3444A@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Mon Jul 14 13:53:28 2008
New Revision: 10573

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10573&view=rev
Log:
Remove obsolete references to Script/Message/Atom

Modified:
trunk/libzypp-testsuite/solver/src/deptestomatic.cc

Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=10573&r1=10572&r2=10573&view=diff
==============================================================================
--- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original)
+++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Mon Jul 14 13:53:28 2008
@@ -176,18 +176,9 @@
else if (str == "patch") {
kind = ResTraits<zypp::Patch>::kind;
}
- else if (str == "atom") {
- kind = ResTraits<zypp::Atom>::kind;
- }
else if (str == "pattern") {
kind = ResTraits<zypp::Pattern>::kind;
}
- else if (str == "script") {
- kind = ResTraits<zypp::Script>::kind;
- }
- else if (str == "message") {
- kind = ResTraits<zypp::Message>::kind;
- }
else if (str == "product") {
kind = ResTraits<zypp::Product>::kind;
}
@@ -387,7 +378,7 @@
else if(p.isBroken())
RESULT << p << " IS BROKEN" << endl;
else if(p.isRelevant())
- RESULT << p << " IS RELEVANT" << endl;
+ RESULT << p << " IS RELEVANT" << endl;
return true;
}
};
@@ -398,9 +389,9 @@
IsStatisfied info (ResTraits<zypp::Package>::kind);
invokeOnEach( God->pool().begin( ),
God->pool().end ( ),
- functor::functorRef<bool,PoolItem> (info) );

+ functor::functorRef<bool,PoolItem> (info) );
} else {
- Resolvable::Kind kind = string2kind (kind_name);
+ Resolvable::Kind kind = string2kind (kind_name);
IsStatisfied info (kind);

invokeOnEach( God->pool().byKindBegin( kind ),
@@ -816,7 +807,7 @@
static bool first_trial = true;

bool verify = false;
- bool doUpdate = false;
+ bool doUpdate = false;
bool instorder = false;
bool mediaorder = false;

@@ -936,7 +927,7 @@
resolver->doUpgrade(stats);

print_pool( resolver, MARKER );
-
+
} else if (node->equals ("update")) {

RESULT << "Doing update ..." << endl;
@@ -1065,7 +1056,7 @@
success = resolver->resolveQueue(solverQueue);
else
success = resolver->resolvePool();
-
+
if (success) {
RESULT << "No problems so far" << endl;
}
@@ -1098,14 +1089,14 @@

YUILog::setLogFileName( "/tmp/testUI.log" );
YUILog::enableDebugLogging();
-
+
YDialog *dialog = YUI::widgetFactory()->createMainDialog();
YLayoutBox *vbox = YUI::widgetFactory()->createVBox( dialog );

long modeFlags = 0;
if ( node->equals ("YOU") )
modeFlags = YPkg_OnlineUpdateMode;
-
+
YPackageSelector *pkgSelector =
YUI::widgetFactory()->createPackageSelector( vbox,

modeFlags );
dialog->setInitialSize();
@@ -1126,7 +1117,7 @@

PoolItem poolItem;

- poolItem = get_poolItem (source_alias, package_name, kind_name,
version, release, architecture );
+ poolItem = get_poolItem (source_alias, package_name, kind_name,
version, release, architecture );
if (poolItem) {
RESULT << "Locking " << package_name << " from channel " <<
source_alias << endl;
poolItem.status().setLock (true, ResStatus::USER);
@@ -1148,11 +1139,11 @@
if (!solverQueue.empty())
success = resolver->resolveQueue(solverQueue);
else
- success = resolver->resolvePool();
-
+ success = resolver->resolvePool();
+
if (!package_name.empty()) {
PoolItem poolItem;
- poolItem = get_poolItem (source_alias, package_name,
kind_name, version, release, architecture );
+ poolItem = get_poolItem (source_alias, package_name,
kind_name, version, release, architecture );
if (poolItem) {
if (poolItem.isSatisfied())
RESULT << package_name << " from channel " <<
source_alias << " IS SATISFIED" << endl;
@@ -1210,7 +1201,7 @@
}
} else if (node->equals ("addQueueInstall")) {
string name = node->getProp ("name");
- string soft = node->getProp ("soft");
+ string soft = node->getProp ("soft");

if (name.empty())
{
@@ -1223,7 +1214,7 @@
} else if (node->equals ("addQueueDelete")) {
string name = node->getProp ("name");
string soft = node->getProp ("soft");
-
+
if (name.empty())
{
cerr << "addQueueDelete need 'name' parameter" << endl;
@@ -1233,7 +1224,7 @@
new zypp::solver::detail::SolverQueueItemDelete(pool, name,
(soft.empty() ? false : true));
solverQueue.push_back (del);
} else if (node->equals ("addQueueLock")) {
- string soft = node->getProp ("soft");
+ string soft = node->getProp ("soft");
string kind_name = node->getProp ("kind");
string name = node->getProp ("name");
if (name.empty())
@@ -1337,7 +1328,7 @@
}

bool success = false;
-
+
if (!doUpdate) {
if (verify) {
success = resolver->verifySystem ();

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages