1 |
commit: 03ddbaadd7667b41d7d89f4018aa5b8bcf51f657 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 28 09:21:54 2011 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 28 09:21:54 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=03ddbaad |
7 |
|
8 |
sleep_for_mtime_granularity: remove |
9 |
|
10 |
Remove trails from long gone sleep_for_mtime_granularity, that were |
11 |
still in the Prefix branch, because some functionality was factored out |
12 |
in a function in order to be able to easily skip it. |
13 |
|
14 |
--- |
15 |
pym/portage/util/env_update.py | 11 +++-------- |
16 |
1 files changed, 3 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
19 |
index 70b7356..ea3bef1 100644 |
20 |
--- a/pym/portage/util/env_update.py |
21 |
+++ b/pym/portage/util/env_update.py |
22 |
@@ -118,12 +118,9 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
23 |
env.update(myconfig) |
24 |
|
25 |
if EPREFIX == '': |
26 |
- sleep_for_mtime_granularity = dolinkingstuff( |
27 |
- target_root, specials, prelink_capable, |
28 |
+ dolinkingstuff(target_root, specials, prelink_capable, |
29 |
makelinks, contents, prev_mtimes, env) |
30 |
- else: |
31 |
- sleep_for_mtime_granularity = False |
32 |
- writeshellprofile(target_root, env, sleep_for_mtime_granularity) |
33 |
+ writeshellprofile(target_root, env) |
34 |
|
35 |
def dolinkingstuff(target_root, specials, prelink_capable, makelinks, |
36 |
contents, prev_mtimes, env): |
37 |
@@ -275,9 +272,7 @@ def dolinkingstuff(target_root, specials, prelink_capable, makelinks, |
38 |
|
39 |
del specials["LDPATH"] |
40 |
|
41 |
- return sleep_for_mtime_granularity |
42 |
- |
43 |
-def writeshellprofile(target_root, env, sleep_for_mtime_granularity): |
44 |
+def writeshellprofile(target_root, env): |
45 |
penvnotice = "# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.\n" |
46 |
penvnotice += "# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES\n" |
47 |
cenvnotice = penvnotice[:] |