summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2017-05-17 20:00:32 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2017-05-17 20:00:32 +0100
commit1787d28337f1c3a17c7e65bad92f9cac70dd65c3 (patch)
tree9737c6172a1be30b48442998f1957db7b97af6fb
parentAdd support for a phase end event in maintenance processors which is called e... (diff)
downloadgentoobrowse-api-0.9.tar.bz2
gentoobrowse-api-0.9.tar.xz
gentoobrowse-api-0.9.zip
Use phaseEnd instead of apply for mask processor because new ebuilds can magically arrive masked by an existing maskgentoobrowse-api-0.9
-rw-r--r--gentoobrowse-api/service/maintenance/masksProcessor.cpp2
-rw-r--r--gentoobrowse-api/service/maintenance/masksProcessor.h2
-rw-r--r--gentoobrowse-api/unittests/testMaintenance.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/gentoobrowse-api/service/maintenance/masksProcessor.cpp b/gentoobrowse-api/service/maintenance/masksProcessor.cpp
index 5126fd4..b914bd4 100644
--- a/gentoobrowse-api/service/maintenance/masksProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/masksProcessor.cpp
@@ -99,7 +99,7 @@ namespace Gentoo {
}
void
- MasksProcessor::apply(DB::Connection * dbc, ChangeSet &)
+ MasksProcessor::phaseEnd(DB::Connection * dbc, ChangeSet &)
{
DB::TablePatch e;
e.dest = "gentoobrowse.ebuild_masks";
diff --git a/gentoobrowse-api/service/maintenance/masksProcessor.h b/gentoobrowse-api/service/maintenance/masksProcessor.h
index 3a07036..664a71e 100644
--- a/gentoobrowse-api/service/maintenance/masksProcessor.h
+++ b/gentoobrowse-api/service/maintenance/masksProcessor.h
@@ -18,7 +18,7 @@ namespace Gentoo {
void modified(DB::Connection * dbc, int64_t repoid, const Gentoo::StringList & fn, const boost::filesystem::path & path) override;
void deleted(DB::Connection * dbc, int64_t repoid, const Gentoo::StringList & fn) override;
- void apply(DB::Connection *, ChangeSet &) override;
+ void phaseEnd(DB::Connection *, ChangeSet &) override;
};
}
}
diff --git a/gentoobrowse-api/unittests/testMaintenance.cpp b/gentoobrowse-api/unittests/testMaintenance.cpp
index 34edb45..2bdba64 100644
--- a/gentoobrowse-api/unittests/testMaintenance.cpp
+++ b/gentoobrowse-api/unittests/testMaintenance.cpp
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE( refreshPackageTree )
BOOST_TEST_CONTEXT("756569aa764177340726dd3d40b41d89b11b20c7") {
m2.applyDiffOfFolders(rootDir / "fixtures" / "4156eb45cf3b0ce1d7125b84efd8688c2d6e831d", rootDir / "fixtures" / "756569aa764177340726dd3d40b41d89b11b20c7");
doRefreshPackageTree(db,
- 5, 1, 483, 982, 3638, 4599, 502, 393, 238, 50, 1573, 2009, 1546, 79, 152, 7);
+ 5, 1, 483, 982, 3638, 4599, 502, 393, 238, 50, 1573, 2009, 1546, 79, 152, 10);
}
BOOST_TEST_CONTEXT("empty") {