summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-09-13 12:54:32 +0200
committerhut <hut@lavabit.com>2010-09-13 12:54:32 +0200
commit414b01ecfc75d2c977b52c93ab4045f959246914 (patch)
tree12f403dc9442338df3f418151386be9936db27f9
parent6df94b8b2ae44d3c44558204ba7483775f230d12 (diff)
downloadranger-414b01ecfc75d2c977b52c93ab4045f959246914.tar.gz
ranger.main: no file previews when user == root
-rw-r--r--ranger/__main__.py2
-rw-r--r--ranger/shared/settings.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/ranger/__main__.py b/ranger/__main__.py
index 39e7f1f3..7db82a57 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -212,6 +212,8 @@ def main():
 		fm.tabs = dict((n+1, os.path.abspath(path)) for n, path \
 				in enumerate(targets[:9]))
 		load_settings(fm, ranger.arg.clean)
+		if fm.env.username == 'root':
+			fm.settings.preview_files = False
 		FileManagerAware._assign(fm)
 		fm.ui = UI()
 
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 3a178882..7604af12 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -66,7 +66,9 @@ class SettingObject(SignalDispatcher):
 		if name[0] == '_':
 			self.__dict__[name] = value
 		else:
-			assert name in self._settings, "No such setting: {0}!".format(name)
+			assert name in ALLOWED_SETTINGS, "No such setting: {0}!".format(name)
+			if name not in self._settings:
+				getattr(self, name)
 			assert self._check_type(name, value)
 			kws = dict(setting=name, value=value,
 					previous=self._settings[name])
>
cfcfd885 ^
712aa449
4ea0f69a ^


712aa449
0a32b684 ^

4ad365fc ^
0a32b684 ^
2144cf26 ^
36e4e71e ^

4ea0f69a ^

36e4e71e ^




78a7d762 ^
36e4e71e ^

78a7d762 ^
36e4e71e ^


4ea0f69a ^

36e4e71e ^
bd088c49 ^
36e4e71e ^
0a32b684 ^
36e4e71e ^

f6ae504c ^
4ea0f69a ^

0a32b684 ^

4ea0f69a ^
0a32b684 ^
4ea0f69a ^


0a32b684 ^

4ea0f69a ^



36e4e71e ^
7582555b ^
36e4e71e ^
7582555b ^








36e4e71e ^
4ea0f69a ^


36e4e71e ^




4ea0f69a ^
e71c8103 ^

36e4e71e ^

f6ae504c ^
4ea0f69a ^
36e4e71e ^

4ea0f69a ^

36e4e71e ^






4ea0f69a ^

306c76d8 ^






b6aff4c3 ^

306c76d8 ^
4ea0f69a ^

45cf5174 ^












1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137