* apt-pkg/contrib/configuration.cc:

[apt.git] / apt-pkg / aptconfiguration.cc

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index b5f29472d556460ad55464f882d21f72ac0d4dcc..2acf8dd9f08b64bcb2be328ef0e6351b9ae28a49 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -152,6 +152,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        builtin.push_back(c);
                }
        }
                        builtin.push_back(c);
                }
        }

+       closedir(D);

 
        // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
        // we extract both, a long and a short code and then we will
 
        // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
        // we extract both, a long and a short code and then we will


@@ -217,9 +218,10 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                environment.push_back(envLong);
        environment.push_back(envShort);
        // take care of LANGUAGE
                environment.push_back(envLong);
        environment.push_back(envShort);
        // take care of LANGUAGE

-       string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1);
+       const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
+       string envLang = Locale == 0 ? language_env : *(Locale+1);

        if (envLang.empty() == false) {
        if (envLang.empty() == false) {

-               std::vector<string> env = ExplodeString(envLang,':');
+               std::vector<string> env = VectorizeString(envLang,':');

                short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
                for (std::vector<string>::const_iterator e = env.begin();
                     e != env.end() && addedLangs < 3; ++e) {
                short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
                for (std::vector<string>::const_iterator e = env.begin();
                     e != env.end() && addedLangs < 3; ++e) {


@@ -317,4 +319,28 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                return codes;
 }
                                                                        /*}}}*/
                return codes;
 }
                                                                        /*}}}*/

+// getArchitectures - Return Vector of prefered Architectures          /*{{{*/
+std::vector<std::string> const Configuration::getArchitectures(bool const &Cached) {
+       using std::string;
+
+       std::vector<string> static archs;
+       if (likely(Cached == true) && archs.empty() == false)
+               return archs;
+
+       string const arch = _config->Find("APT::Architecture");
+       archs = _config->FindVector("APT::Architectures");
+       if (archs.empty() == true ||
+           std::find(archs.begin(), archs.end(), arch) == archs.end())
+               archs.push_back(arch);
+       return archs;
+}
+                                                                       /*}}}*/
+// checkArchitecture - are we interested in the given Architecture?    /*{{{*/
+bool const Configuration::checkArchitecture(std::string const &Arch) {
+       if (Arch == "all")
+               return true;
+       std::vector<std::string> const archs = getArchitectures(true);
+       return (std::find(archs.begin(), archs.end(), Arch) != archs.end());
+}
+                                                                       /*}}}*/

 }
 }