zypp/RepoInfo.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fb4432..edccbd4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,22 @@ SET (CPACK_SOURCE_IGNORE_FILES
 /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)
 
 ####################################################################

diff --git a/zypp/RepoInfo.cc b/zypp/RepoInfo.cc
index f68dded..82cf94a 100644 (file)
--- a/zypp/RepoInfo.cc
+++ b/zypp/RepoInfo.cc
@@ -187,6 +187,11 @@ namespace zypp
 
   std::string RepoInfo::name() const
   {
+    if ( _pimpl->name.empty() )
+    {
+      return alias();
+    }
+    
     repo::RepoVariablesStringReplacer replacer;
     return replacer(_pimpl->name);
   }

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index 3c6aa3e..25cbbe8 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -112,7 +112,7 @@ namespace zypp
     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 @@ namespace zypp
     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 @@ namespace zypp
       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 @@ namespace zypp
       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 @@ namespace zypp
       break;
       case RepoType::RPMPLAINDIR_e :
       {
+        CombinedProgressData subprogrcv( progress, 100);
         InputStream is(rawpath + "cookie");
         string buffer;
         getline( is.stream(), buffer);
@@ -593,7 +595,7 @@ namespace zypp
 
     MIL << "Commit cache.." << endl;
     store.commit();
-    progress.toMax();
+    //progress.toMax();
   }
 
   ////////////////////////////////////////////////////////////////////////////
@@ -677,7 +679,7 @@ namespace zypp
     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 @@ namespace zypp
     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 @@ namespace zypp
     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;
 

diff --git a/zypp/cache/sqlite3x/sqlite3x_connection.cpp b/zypp/cache/sqlite3x/sqlite3x_connection.cpp
index e3ad870..f38415c 100644 (file)
--- a/zypp/cache/sqlite3x/sqlite3x_connection.cpp
+++ b/zypp/cache/sqlite3x/sqlite3x_connection.cpp
@@ -70,6 +70,8 @@ sqlite3_connection::sqlite3_connection(const wchar_t *db) : db(NULL)
 \r
 sqlite3_connection::~sqlite3_connection()\r
 {\r
+  _ticks = zypp::ProgressData();\r
+  resetprogresshandler();\r
   if (this->db) sqlite3_close(this->db);\r
 }\r
 \r
@@ -85,6 +87,7 @@ void sqlite3_connection::setprogresshandler( const zypp::ProgressData::ReceiverF
 \r
 void sqlite3_connection::resetprogresshandler()\r
 {\r
+  _ticks = zypp::ProgressData();\r
   sqlite3_progress_handler(db, 0, NULL, (void*)this);\r
 }\r
 \r