diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-23 08:40:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-23 08:40:53 +0000 |
| commit | eea7a780bc0d59f245ac7ad30f28d0008cd33757 (patch) | |
| tree | e9b3e8337da44b3d10aadfca5db7d5c8cbdf1315 | |
| parent | 09e6f3ac0f9c47dca05ca4c67bb952f03f038898 (diff) | |
| download | portage-eea7a780bc0d59f245ac7ad30f28d0008cd33757.tar.gz portage-eea7a780bc0d59f245ac7ad30f28d0008cd33757.tar.bz2 portage-eea7a780bc0d59f245ac7ad30f28d0008cd33757.zip | |
In config.regenerate(), skip loading /etc/profile.env if it's mtime hasn't changed.
svn path=/main/trunk/; revision=7682
| -rw-r--r-- | pym/portage/__init__.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 283b49be9..c05625ce2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -881,6 +881,7 @@ class config(object): self.user_profile_dir = None self.local_config = local_config self._use_wildcards = False + self._env_d_mtime = 0 if clone: self.incrementals = copy.deepcopy(clone.incrementals) @@ -1930,12 +1931,18 @@ class config(object): self.already_in_regenerate = 1 # We grab the latest profile.env here since it changes frequently. - self.configdict["env.d"].clear() - env_d = getconfig( - os.path.join(self["ROOT"], "etc", "profile.env"), expand=False) - if env_d: - # env_d will be None if profile.env doesn't exist. - self.configdict["env.d"].update(env_d) + env_d_filename = os.path.join(self["ROOT"], "etc", "profile.env") + try: + cur_timestamp = os.stat(env_d_filename).st_mtime + except OSError: + cur_timestamp = 0 + if cur_timestamp != self._env_d_mtime: + self._env_d_mtime = cur_timestamp + self.configdict["env.d"].clear() + env_d = getconfig(env_d_filename, expand=False) + if env_d: + # env_d will be None if profile.env doesn't exist. + self.configdict["env.d"].update(env_d) if useonly: myincrementals=["USE"] |