From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Fri, 6 Feb 2015 00:45:12 +0000 (-0800)
Subject: config: rename 'file' var
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=774922895bc622639d28cf2d0d56dc63fc4eddf5;p=gem5.git

config: rename 'file' var

Rename uses of 'file' as a local variable to avoid conflict
with the built-in type of the same name.
---

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: