reapack

commit c8504b5efcf234afc2c184498dfc4a09553a22fe
parent c90dc8f31352c98b5fdd61c57316c86bec0c88d8
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Tue, 15 Dec 2015 12:23:57 -0500

don't abort the whole transaction when a database cannot be read

Diffstat:
M
src/transaction.cpp
 | 
20
++++++++++++++------
M
src/transaction.hpp
 | 
1
+

2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/transaction.cpp b/src/transaction.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 Transaction::Transaction(Registry *reg, const Path &root)
-  : m_registry(reg), m_root(root), m_isCancelled(false)
+  : m_registry(reg), m_root(root), m_isCancelled(false), m_hasConflicts(false)
 {
   m_dbPath = m_root + "ReaPack";
 
@@ -81,7 +81,7 @@ void Transaction::prepare()
     }
   }
 
-  if(m_packages.empty() || m_errors.size())
+  if(m_packages.empty() || m_hasConflicts)
     finish();
   else
     m_onReady();
@@ -186,12 +186,20 @@ void Transaction::registerFiles(const vector<Path> &list)
 {
   m_files.insert(m_files.end(), list.begin(), list.end());
 
-  const auto uniqueIt = unique(m_files.begin(), m_files.end());
+  const auto dupBegin = unique(m_files.begin(), m_files.end());
 
-  for(auto it = uniqueIt; it != m_files.end(); it++) {
+  if(dupBegin == m_files.end())
+    return;
+
+  auto it = dupBegin;
+
+  do {
     addError("Conflict: This file is part of more than one package",
       it->join());
-  }
 
-  m_files.erase(uniqueIt, m_files.end());
+    it++;
+  } while(it != m_files.end());
+
+  m_files.erase(dupBegin, m_files.end());
+  m_hasConflicts = true;
 }
diff --git a/src/transaction.hpp b/src/transaction.hpp
@@ -72,6 +72,7 @@ private:
 
   std::vector<PackageTransaction *> m_transactions;
   std::vector<Path> m_files;
+  bool m_hasConflicts;
 
   Signal m_onReady;
   Signal m_onFinish;