From bfe038362415ca03b735c7e7405bf578be0f4569 Mon Sep 17 00:00:00 2001
From: Matthew McGill <mhollismcgill@gmail.com>
Date: Wed, 17 Oct 2018 20:50:01 +0000
Subject: [PATCH] thanos integration
Former-commit-id: b36d5bc6a8e506a7af82955e547f444a4acd29e2
---
libIRDB/src/util/IRDB_Objects.cpp | 2 +-
libIRDB/test/fill_in_cfg.cpp | 2 ++
tools/thanos/thanos.cpp | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libIRDB/src/util/IRDB_Objects.cpp b/libIRDB/src/util/IRDB_Objects.cpp
index 8e7228a25..f77d3afef 100644
--- a/libIRDB/src/util/IRDB_Objects.cpp
+++ b/libIRDB/src/util/IRDB_Objects.cpp
@@ -247,7 +247,7 @@ int IRDBObjects_t::DeleteVariant(db_id_t variant_id)
int IRDBObjects_t::WriteBackAll(void)
{
int ret_status = 0;
- cout << "Writing file IRs" << endl;
+
// Write back FileIRs
for(map<db_id_t, pair<shared_ptr<File_t>, shared_ptr<FileIR_t>>>::iterator
file_it = file_IR_map.begin();
diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp
index 6c451d5b4..e78c40b29 100644
--- a/libIRDB/test/fill_in_cfg.cpp
+++ b/libIRDB/test/fill_in_cfg.cpp
@@ -605,6 +605,8 @@ int PopulateCFG::ParseArgs
fix_landing_pads = false;
}
}
+
+ cout<<"fix_landing_pads="<<fix_landing_pads<<endl;
return 0;
}
diff --git a/tools/thanos/thanos.cpp b/tools/thanos/thanos.cpp
index b697b95c9..d59ed92c2 100644
--- a/tools/thanos/thanos.cpp
+++ b/tools/thanos/thanos.cpp
@@ -272,5 +272,5 @@ int execute_step(int argc, char* argv[], bool step_optional, Mode exec_mode,
}
}
- return 12;
+ return step_error;
}
--
GitLab