aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Mike Kelly <pioto@pioto.org> 2009-01-04 10:55:50 -0500
committerAvatar Mike Kelly <pioto@pioto.org> 2009-01-04 10:55:50 -0500
commitfc9d2ade2ba12016f75346a54971533f74e5b91b (patch)
treef1783e23ebaf566b9a68a88201f5b4f16058e1b0
parent9d7f93b688e2088b86f7a1bb1e7c61fdb30e5b45 (diff)
downloadpaludis-fc9d2ade2ba12016f75346a54971533f74e5b91b.tar.gz
paludis-fc9d2ade2ba12016f75346a54971533f74e5b91b.tar.xz
Revert "Support different news directories for different distributions."
This reverts commit 9d7f93b688e2088b86f7a1bb1e7c61fdb30e5b45. We're going to do this differently.
-rw-r--r--paludis/distribution.cc3
-rw-r--r--paludis/distribution.hh2
-rw-r--r--paludis/distributions/exherbo.conf1
-rw-r--r--paludis/distributions/gentoo.conf1
-rw-r--r--paludis/repositories/e/e_repository_news.cc7
5 files changed, 3 insertions, 11 deletions
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index 4bd17c8..3149518 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -74,8 +74,7 @@ namespace paludis
value_for<n::fallback_environment>(k.get("fallback_environment")),
value_for<n::name>(strip_trailing_string(d->basename(), ".conf")),
value_for<n::paludis_package>(k.get("paludis_package")),
- value_for<n::support_old_style_virtuals>(destringify<bool>(k.get("support_old_style_virtuals"))),
- value_for<n::news_directory>(FSEntry(k.get("news_directory")))
+ value_for<n::support_old_style_virtuals>(destringify<bool>(k.get("support_old_style_virtuals")))
)))));
}
}
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index 7ef6ce8..847bbbf 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -53,7 +53,6 @@ namespace paludis
struct name;
struct paludis_package;
struct support_old_style_virtuals;
- struct news_directory;
}
/**
@@ -78,7 +77,6 @@ namespace paludis
NamedValue<n::name, std::string> name;
NamedValue<n::paludis_package, std::string> paludis_package;
NamedValue<n::support_old_style_virtuals, bool> support_old_style_virtuals;
- NamedValue<n::news_directory, FSEntry> news_directory;
};
/**
diff --git a/paludis/distributions/exherbo.conf b/paludis/distributions/exherbo.conf
index 7fd2e06..1ba46ad 100644
--- a/paludis/distributions/exherbo.conf
+++ b/paludis/distributions/exherbo.conf
@@ -7,5 +7,4 @@ default_environment = paludis
fallback_environment =
paludis_package = sys-apps/paludis
support_old_style_virtuals = false
-news_directory = /var/lib/exherbo/news
diff --git a/paludis/distributions/gentoo.conf b/paludis/distributions/gentoo.conf
index cb69b62..b4d6bde 100644
--- a/paludis/distributions/gentoo.conf
+++ b/paludis/distributions/gentoo.conf
@@ -7,5 +7,4 @@ default_environment = paludis
fallback_environment = portage
paludis_package = sys-apps/paludis
support_old_style_virtuals = true
-news_directory = /var/lib/gentoo/news
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index b0198c1..cac18a6 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -36,7 +36,6 @@
#include <paludis/generator.hh>
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
-#include <paludis/distribution.hh>
#include <set>
#include <ostream>
@@ -63,7 +62,6 @@ namespace paludis
const ERepository * const e_repository;
const erepository::ERepositoryParams params;
- const FSEntry news_directory;
const FSEntry skip_file;
const FSEntry unread_file;
@@ -72,10 +70,9 @@ namespace paludis
environment(e),
e_repository(p),
params(k),
- news_directory((*DistributionData::get_instance()->distribution_from_string(e->distribution())).news_directory()),
- skip_file(e->root() / news_directory /
+ skip_file(e->root() / "var" / "lib" / "gentoo" / "news" /
("news-" + stringify(e_repository->name()) + ".skip")),
- unread_file(e->root() / news_directory /
+ unread_file(e->root() / "var" / "lib" / "gentoo" / "news" /
("news-" + stringify(e_repository->name()) + ".unread"))
{
}