[zypp-commit] r8668 - /branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc

Author: jkupec Date: Wed Feb 13 17:20:30 2008 New Revision: 8668 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8668&view=rev Log: - ResObject::repository() -> repoInfo() Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc?rev=8668&r1=8667&r2=8668&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc (original) +++ branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc Wed Feb 13 17:20:30 2008 @@ -627,8 +627,8 @@ // plus edition and architecture for verbose output cout_v << "-" << res->edition() << "." << res->arch(); // plus repo providing this package - if (res->repository() != Repository::noRepository) - cout_v << " (" << res->repository().info().name() << ")"; + if (!res->repoInfo().alias().empty()) + cout_v << " (" << res->repoInfo().name() << ")"; // new line after each package in the verbose mode cout_v << endl; } @@ -1024,7 +1024,7 @@ Patch::constPtr patch = asKind<Patch>(res); TableRow tr; - tr << patch->repository().info().name(); + tr << patch->repoInfo().name(); tr << res->name () << res->edition ().asString(); tr << patch->category(); tr << string_status (it->status ()); @@ -1096,10 +1096,10 @@ cout << " <description>" << xml_escape(patch->description()) << "</description>" << endl; cout << " <license>" << xml_escape(patch->licenseToConfirm()) << "</license>" << endl; - if ( patch->repository() != Repository::noRepository ) + if ( !patch->repoInfo().alias().empty() ) { - cout << " repository().info().baseUrlsBegin()); - cout << "\" alias=\"" << patch->repository().info().alias() << "\"/>" << endl; + cout << " repoInfo().baseUrlsBegin()); + cout << "\" alias=\"" << patch->repoInfo().alias() << "\"/>" << endl; } cout << " </update>" << endl; @@ -1144,7 +1144,7 @@ if (true) { TableRow tr (cols); - tr << patch->repository().info().name(); + tr << patch->repoInfo().name(); tr << res->name () << res->edition ().asString(); tr << patch->category(); tr << string_status (it->status ()); @@ -1300,7 +1300,7 @@ TableRow tr (cols); tr << "v"; if (!hide_repo) { - tr << res->repository().info().name(); + tr << res->repoInfo().name(); } if (zypper.globalOpts().is_rug_compatible) tr << ""; // Bundle @@ -1404,10 +1404,10 @@ cout << " <description>" << xml_escape(res->description()) << "</description>" << endl; cout << " <license>" << xml_escape(res->licenseToConfirm()) << "</license>" << endl; - if ( res->repository() != Repository::noRepository ) + if ( !res->repoInfo().alias().empty() ) { - cout << " repository().info().baseUrlsBegin()); - cout << "\" alias=\"" << res->repository().info().alias() << "\"/>" << endl; + cout << " repoInfo().baseUrlsBegin()); + cout << "\" alias=\"" << res->repoInfo().alias() << "\"/>" << endl; } cout << " </update>" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org