Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7674 - /trunk/sat-solver/testsuite/deptestomatic.c
  • From: coolo@xxxxxxxxxxxxxxxx
  • Date: Sun, 28 Oct 2007 19:05:55 -0000
  • Message-id: <20071028190555.2D71223E07@xxxxxxxxxxxxxxxx>
Author: coolo
Date: Sun Oct 28 20:05:54 2007
New Revision: 7674

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7674&view=rev
Log:
fixing locks a bit. Non-existant channels are equal to the
system

Modified:
trunk/sat-solver/testsuite/deptestomatic.c

Modified: trunk/sat-solver/testsuite/deptestomatic.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=7674&r1=7673&r2=7674&view=diff
==============================================================================
--- trunk/sat-solver/testsuite/deptestomatic.c (original)
+++ trunk/sat-solver/testsuite/deptestomatic.c Sun Oct 28 20:05:54 2007
@@ -889,13 +889,11 @@
*/

const char *channel = attrval( atts, "channel" );
- const char *package = attrval( atts, "package" );
+ char package[MAXNAMELEN];
+ getPackageName( atts, package );
const char *arch = attrval( atts, "arch" );

- if (package == NULL)
- package = attrval( atts, "name" );
-
- if (package == NULL)
+ if (!strlen(package))
{
err( "%s: No package given in <lock>", Current );
break;
@@ -905,21 +903,22 @@
if (channel) /* from specific channel */
{
Id cid = str2id( pool, channel, 0 );
- if (cid == ID_NULL)
- {
- err( "Install: Channel '%s' does not exist", channel );
- exit( 1 );
- }
- int i = 0;
- while (i < pd->nchannels )
+ if (cid != ID_NULL)
{
- if (pd->channels[i].nid == cid)
+ int i = 0;
+ while (i < pd->nchannels )
{
- repo = pd->channels[i].repo;
- break;
+ if (pd->channels[i].nid == cid)
+ {
+ repo = pd->channels[i].repo;
+ break;
+ }
+ ++i;
}
- ++i;
}
+ }
+ if (repo)
+ {
Id id = select_solvable( pool, repo, package, arch );
if (id == ID_NULL)
{
@@ -932,8 +931,8 @@
}
else /* no channel given, lock installed */
{
- Id id = str2id( pool, package, 1 );
- queuepush( &(pd->trials), SOLVER_INSTALL_SOLVABLE_NAME );
+ Id id = select_solvable( pool, pd->system, package, arch );
+ queuepush( &(pd->trials), SOLVER_INSTALL_SOLVABLE );
queuepush( &(pd->trials), id );
}
}

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

< Previous Next >
This Thread
  • No further messages