summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2015-02-05 16:45:12 -0800
committerSteve Reinhardt <steve.reinhardt@amd.com>2015-02-05 16:45:12 -0800
commit774922895bc622639d28cf2d0d56dc63fc4eddf5 (patch)
tree94991b46606c0b357a7c427b67813b05e4d06ea5
parent634d92375150f813763bb06b07b06ef3d7a15142 (diff)
downloadgem5-774922895bc622639d28cf2d0d56dc63fc4eddf5.tar.xz
config: rename 'file' var
Rename uses of 'file' as a local variable to avoid conflict with the built-in type of the same name.
-rw-r--r--configs/common/SysPaths.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py
index b13aff218..08d40bba4 100644
--- a/configs/common/SysPaths.py
+++ b/configs/common/SysPaths.py
@@ -33,24 +33,24 @@ from os import environ as env
config_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path)
-def searchpath(path, file):
+def searchpath(path, filename):
for p in path:
- f = joinpath(p, file)
+ f = joinpath(p, filename)
if os.path.exists(f):
return f
- raise IOError, "Can't find file '%s' on path." % file
+ raise IOError, "Can't find file '%s' on path." % filename
-def disk(file):
+def disk(filename):
system()
- return searchpath(disk.path, file)
+ return searchpath(disk.path, filename)
-def binary(file):
+def binary(filename):
system()
- return searchpath(binary.path, file)
+ return searchpath(binary.path, filename)
-def script(file):
+def script(filename):
system()
- return searchpath(script.path, file)
+ return searchpath(script.path, filename)
def system():
if not system.path: