Author: matz Date: Thu Feb 7 18:34:01 2008 New Revision: 8545 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8545&view=rev Log: Also prepend arch dir if we have a mediafile. 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=8545&r1=8544&r2=8545&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Thu Feb 7 18:34:01 2008 @@ -147,6 +147,10 @@ std::string ret; if (lc.mediadir) ret += std::string( lc.mediadir ) + "/"; + else + /* If we haven't seen an explicit dirname, then prepend the arch as + directory. */ + ret += IdString(_solvable->arch).asString() + "/"; if (!lc.trivial) { if (lc.mediafile) @@ -155,10 +159,6 @@ } /* Trivial means that we can construct the rpm name from our solvable data, as name-evr.arch.rpm . */ - /* If we haven't seen an explicit dirname, then prepend the arch as - directory. */ - if (!lc.mediadir) - ret += IdString(_solvable->arch).asString() + "/"; ret += IdString(_solvable->name).asString(); ret += '-'; ret += IdString(_solvable->evr).asString(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org