Try to match Portage profiles/* parsing rules more closely.

7 files changed, 14 insertions, 14 deletions

diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index f031ece..2308d76 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -138,7 +138,7 @@ namespace
                 std::set<std::string> info_pkgs;
                 if (_f.exists())
                 {
-                    LineConfigFile vars(_f, LineConfigFileOptions() + lcfo_allow_inline_comments);
+                    LineConfigFile vars(_f, LineConfigFileOptions() + lcfo_disallow_continuations);
                     info_pkgs.insert(vars.begin(), vars.end());
                 }
 
@@ -389,7 +389,7 @@ namespace paludis
 
             found_one = true;
 
-            LineConfigFile f(*p, LineConfigFileOptions() + lcfo_allow_inline_comments);
+            LineConfigFile f(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
             for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ; line != line_end ; ++line)
             {
                 std::vector<std::string> tokens;
@@ -445,7 +445,7 @@ namespace
                 if (! name_file.is_regular_file())
                     break;
 
-                LineConfigFile f(name_file, LineConfigFileOptions() + lcfo_allow_inline_comments);
+                LineConfigFile f(name_file, LineConfigFileOptions() + lcfo_disallow_comments + lcfo_disallow_continuations + lcfo_no_skip_blank_lines);
                 if (f.begin() == f.end())
                     break;
                 return RepositoryName(*f.begin());
@@ -756,7 +756,7 @@ ERepository::arch_flags() const
             if (! p->exists())
                 continue;
 
-            LineConfigFile archs(*p, LineConfigFileOptions() + lcfo_allow_inline_comments);
+            LineConfigFile archs(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
             std::copy(archs.begin(), archs.end(), create_inserter<UseFlagName>(_imp->arch_flags->inserter()));
             found_one = true;
         }
@@ -786,7 +786,7 @@ ERepository::need_mirrors() const
         {
             if (p->exists())
             {
-                LineConfigFile mirrors(*p, LineConfigFileOptions() + lcfo_allow_inline_comments);
+                LineConfigFile mirrors(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
                 for (LineConfigFile::ConstIterator line(mirrors.begin()) ; line != mirrors.end() ; ++line)
                 {
                     std::vector<std::string> ee;
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index d61231c..5b95517 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -105,7 +105,7 @@ ERepositoryNews::update_news() const
     {
         Context local_context("When handling news skip file '" + stringify(
                 _imp->skip_file) + "':");
-        LineConfigFile s(_imp->skip_file, LineConfigFileOptions() + lcfo_allow_inline_comments);
+        LineConfigFile s(_imp->skip_file, LineConfigFileOptions() + lcfo_disallow_continuations);
         std::copy(s.begin(), s.end(), std::inserter(skip, skip.end()));
     }
 
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index e06841c..8587597 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -259,7 +259,7 @@ Implementation<ERepositoryProfile>::load_profile_parent(const FSEntry & dir)
     if (! (dir / "parent").exists())
         return;
 
-    LineConfigFile file(dir / "parent", LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_disallow_comments);
+    LineConfigFile file(dir / "parent", LineConfigFileOptions() + lcfo_disallow_continuations);
 
     LineConfigFile::ConstIterator i(file.begin()), i_end(file.end());
     bool once(false);
@@ -306,7 +306,7 @@ Implementation<ERepositoryProfile>::load_profile_make_defaults(const FSEntry & d
         return;
 
     KeyValueConfigFile file(dir / "make.defaults", KeyValueConfigFileOptions() +
-            kvcfo_disallow_space_around_equals + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
+            kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
             &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
 
     for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -558,7 +558,7 @@ Implementation<ERepositoryProfile>::load_basic_use_file(const FSEntry & file, Fl
         return;
 
     Context context("When loading basic use file '" + stringify(file) + ":");
-    LineConfigFile f(file, LineConfigFileOptions() + lcfo_allow_inline_comments);
+    LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
     for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
             line != line_end ; ++line)
     {
@@ -597,7 +597,7 @@ Implementation<ERepositoryProfile>::load_spec_use_file(const FSEntry & file, Pac
         return;
 
     Context context("When loading specised use file '" + stringify(file) + ":");
-    LineConfigFile f(file, LineConfigFileOptions() + lcfo_allow_inline_comments);
+    LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
     for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
             line != line_end ; ++line)
     {
diff --git a/paludis/repositories/e/e_repository_profile_file.cc b/paludis/repositories/e/e_repository_profile_file.cc
index 06c08b7..0346989 100644
--- a/paludis/repositories/e/e_repository_profile_file.cc
+++ b/paludis/repositories/e/e_repository_profile_file.cc
@@ -97,7 +97,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
     if (! f.exists())
         return;
 
-    F_ file(f, LineConfigFileOptions() + lcfo_allow_inline_comments);
+    F_ file(f, LineConfigFileOptions() + lcfo_disallow_continuations);
     for (typename F_::ConstIterator line(file.begin()), line_end(file.end()) ; line != line_end ; ++line)
     {
         const std::string & key(FileEntryTraits<typename std::tr1::remove_const<typename std::tr1::remove_reference<
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index eed8164..646cb3c 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -839,7 +839,7 @@ EbuildInfoCommand::extend_command(const Command & cmd)
     std::string info_vars;
     if (info_params[k::info_vars()].is_regular_file_or_symlink_to_regular_file())
     {
-        LineConfigFile info_vars_f(info_params[k::info_vars()], LineConfigFileOptions() + lcfo_allow_inline_comments);
+        LineConfigFile info_vars_f(info_params[k::info_vars()], LineConfigFileOptions() + lcfo_disallow_continuations);
         info_vars = join(info_vars_f.begin(), info_vars_f.end(), " ");
     }
 
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index c263f99..2e92ecc 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -149,7 +149,7 @@ TraditionalLayout::need_category_names() const
         if (! i->exists())
             continue;
 
-        LineConfigFile cats(*i, LineConfigFileOptions() + lcfo_allow_inline_comments);
+        LineConfigFile cats(*i, LineConfigFileOptions() + lcfo_disallow_continuations);
 
         for (LineConfigFile::ConstIterator line(cats.begin()), line_end(cats.end()) ;
                 line != line_end ; ++line)
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index f846f1c..4f6a045 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -44,7 +44,7 @@ namespace paludis
         {
             if (f.is_regular_file_or_symlink_to_regular_file())
             {
-                LineConfigFile ff(f, LineConfigFileOptions() + lcfo_allow_inline_comments);
+                LineConfigFile ff(f, LineConfigFileOptions() + lcfo_disallow_continuations);
                 for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
                         line != line_end ; ++line)
                 {