Author: dmacvicar Date: Sun Feb 10 23:33:50 2008 New Revision: 8588 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8588&view=rev Log: no tabs please Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc?rev=8588&r1=8587&r2=8588&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Sun Feb 10 23:33:50 2008 @@ -97,26 +97,26 @@ switch (key->type) { case TYPE_ID: - if (key->name == SolvAttr::mediadir.idStr().id()) - { - if (data->localpool) - lc->mediadir = stringpool_id2str(&data->spool, kv->id); - else - lc->mediadir = id2str(data->repo->pool, kv->id); - } - break; - case TYPE_STR: - if (key->name == SolvAttr::mediafile.idStr().id()) - lc->mediafile = kv->str; - break; - case TYPE_VOID: - if (key->name == SolvAttr::mediafile.idStr().id()) - lc->trivial = 1; - break; - case TYPE_CONSTANT: - if (key->name == SolvAttr::medianr.idStr().id()) - lc->medianr = kv->num; - break; + if (key->name == SolvAttr::mediadir.idStr().id()) + { + if (data->localpool) + lc->mediadir = stringpool_id2str(&data->spool, kv->id); + else + lc->mediadir = id2str(data->repo->pool, kv->id); + } + break; + case TYPE_STR: + if (key->name == SolvAttr::mediafile.idStr().id()) + lc->mediafile = kv->str; + break; + case TYPE_VOID: + if (key->name == SolvAttr::mediafile.idStr().id()) + lc->trivial = 1; + break; + case TYPE_CONSTANT: + if (key->name == SolvAttr::medianr.idStr().id()) + lc->medianr = kv->num; + break; } /* continue walking */ return 0; @@ -140,7 +140,7 @@ if (data->state == REPODATA_STUB || data->state == REPODATA_ERROR) continue; if (sid < data->start || sid >= data->end) - continue; + continue; repodata_search(data, sid - data->start, 0, location_cb, &lc); } medianr = lc.medianr; @@ -153,9 +153,9 @@ ret += IdString(_solvable->arch).asString() + "/"; if (!lc.trivial) { - if (lc.mediafile) - ret += lc.mediafile; - return ret; + if (lc.mediafile) + ret += lc.mediafile; + return ret; } /* Trivial means that we can construct the rpm name from our solvable data, as name-evr.arch.rpm . */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org