[zypp-commit] r10937 - in /trunk/libzypp/zypp: RepoInfo.cc RepoInfo.h RepoManager.cc
Author: jkupec Date: Thu Sep 4 23:28:52 2008 New Revision: 10937 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10937&view=rev Log: - RepoInfo::dumpRepoOn() deprecated in favor of dumpAsIniOn() Modified: trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/RepoManager.cc Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=10937&r1=10936&r2=10937&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Thu Sep 4 23:28:52 2008 @@ -291,6 +291,9 @@ } std::ostream & RepoInfo::dumpRepoOn( std::ostream & str ) const + { return dumpAsIniOn(str); } + + std::ostream & RepoInfo::dumpAsIniOn( std::ostream & str ) const { RepoInfoBase::dumpAsIniOn(str); Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=10937&r1=10936&r2=10937&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Thu Sep 4 23:28:52 2008 @@ -319,7 +319,9 @@ /** * Write this RepoInfo object into \a str in a <tr>.repo</tt> file format. */ - virtual std::ostream & dumpRepoOn( std::ostream & str ) const; + virtual std::ostream & dumpAsIniOn( std::ostream & str ) const; + /** \deprecated use dumpAsIniOn(ostream) instead */ + ZYPP_DEPRECATED virtual std::ostream & dumpRepoOn( std::ostream & str ) const; /** * Write an XML representation of this RepoInfo object. Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=10937&r1=10936&r2=10937&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Thu Sep 4 23:28:52 2008 @@ -1110,7 +1110,7 @@ ZYPP_THROW (Exception( "Can't open " + repofile.asString() ) ); } - tosave.dumpRepoOn(file); + tosave.dumpAsIniOn(file); tosave.setFilepath(repofile); _pimpl->repos.insert(tosave); progress.toMax(); @@ -1159,7 +1159,7 @@ { MIL << "Saving " << (*it).alias() << endl; it->setFilepath(repofile.asString()); - it->dumpRepoOn(file); + it->dumpAsIniOn(file); _pimpl->repos.insert(*it); } MIL << "done" << endl; @@ -1227,7 +1227,7 @@ ++fit ) { if ( (*fit).alias() != todelete.alias() ) - (*fit).dumpRepoOn(file); + (*fit).dumpAsIniOn(file); } } @@ -1295,9 +1295,9 @@ // if the alias is different, dump the original // if it is the same, dump the provided one if ( (*fit).alias() != toedit.alias() ) - (*fit).dumpRepoOn(file); + (*fit).dumpAsIniOn(file); else - newinfo.dumpRepoOn(file); + newinfo.dumpAsIniOn(file); } _pimpl->repos.erase(toedit); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org
participants (1)
-
jkupec@svn.opensuse.org