Author: dmacvicar Date: Fri Aug 10 18:04:34 2007 New Revision: 6614 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6614&view=rev Log: zypp/RepoInfo.cc Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_connection.cpp Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=6614&r1=6613&r2=6614&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Fri Aug 10 18:04:34 2007 @@ -53,6 +53,22 @@ /CVS/;/\\\\.svn/;/\\\\.libs/;/\\\\.deps/;\\\\.swp$;/build/;\\\\.o$;\\\\.lo$;\\\\.la$;~$ ) +SET (CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} +"/CVS/;/.libs/;/.deps/;/.git/;.swp$;.#;/#;/build/" +"~$" +"\\\\.cvsignore$" +"/package" +"Makefile\\\\.in$" +) + +SET (CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} +"/CVS/;/.libs/;/.deps/;/.git/;.swp$;.#;/#;/build/" +"~$" +"\\\\.cvsignore$" +"/package" +"Makefile\\\\.in$" +) + INCLUDE(CPack) #################################################################### Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=6614&r1=6613&r2=6614&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Fri Aug 10 18:04:34 2007 @@ -187,6 +187,11 @@ std::string RepoInfo::name() const { + if ( _pimpl->name.empty() ) + { + return alias(); + } + repo::RepoVariablesStringReplacer replacer; return replacer(_pimpl->name); } Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=6614&r1=6613&r2=6614&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Fri Aug 10 18:04:34 2007 @@ -112,7 +112,7 @@ ProgressData progress; callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Cleaning repository '%s' cache"), info.alias().c_str())); + progress.name(str::form(_("Cleaning repository '%s' cache"), info.name().c_str())); if ( !store.isCached(info.alias()) ) return; @@ -505,7 +505,7 @@ ProgressData progress(100); callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Building repository '%s' cache"), info.alias().c_str())); + progress.name(str::form(_("Building repository '%s' cache"), info.name().c_str())); progress.toMin(); assert_alias(info); @@ -556,12 +556,12 @@ break; } - CombinedProgressData subprogrcv( progress, 100); - + switch ( repokind.toEnum() ) { case RepoType::RPMMD_e : { + CombinedProgressData subprogrcv( progress, 100); parser::yum::RepoParser parser(id, store, parser::yum::RepoParserOpts(), subprogrcv); parser.parse(rawpath); // no error @@ -569,6 +569,7 @@ break; case RepoType::YAST2_e : { + CombinedProgressData subprogrcv( progress, 100); parser::susetags::RepoParser parser(id, store, subprogrcv); parser.parse(rawpath); // no error @@ -576,6 +577,7 @@ break; case RepoType::RPMPLAINDIR_e : { + CombinedProgressData subprogrcv( progress, 100); InputStream is(rawpath + "cookie"); string buffer; getline( is.stream(), buffer); @@ -593,7 +595,7 @@ MIL << "Commit cache.." << endl; store.commit(); - progress.toMax(); + //progress.toMax(); } //////////////////////////////////////////////////////////////////////////// @@ -677,7 +679,7 @@ ProgressData progress; progress.sendTo(ProgressReportAdaptor( progressrcv, report )); //progress.sendTo( progressrcv ); - progress.name(str::form(_("Reading repository '%s' cache"), info.alias().c_str())); + progress.name(str::form(_("Reading repository '%s' cache"), info.name().c_str())); cache::CacheStore store(_pimpl->options.repoCachePath); @@ -767,7 +769,7 @@ ProgressData progress(100); callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Adding repository '%s'"), info.alias().c_str())); + progress.name(str::form(_("Adding repository '%s'"), info.name().c_str())); progress.toMin(); std::list<RepoInfo> repos = knownRepositories(); @@ -872,7 +874,7 @@ ProgressData progress; callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Removing repository '%s'"), info.alias().c_str())); + progress.name(str::form(_("Removing repository '%s'"), info.name().c_str())); MIL << "Going to delete repo " << info.alias() << endl; Modified: trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_connection.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_connection.cpp?rev=6614&r1=6613&r2=6614&view=diff ============================================================================== --- trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_connection.cpp (original) +++ trunk/libzypp/zypp/cache/sqlite3x/sqlite3x_connection.cpp Fri Aug 10 18:04:34 2007 @@ -70,6 +70,8 @@ sqlite3_connection::~sqlite3_connection() { + _ticks = zypp::ProgressData(); + resetprogresshandler(); if (this->db) sqlite3_close(this->db); } @@ -85,6 +87,7 @@ void sqlite3_connection::resetprogresshandler() { + _ticks = zypp::ProgressData(); sqlite3_progress_handler(db, 0, NULL, (void*)this); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org