From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 6 Aug 2010 20:43:04 +0000 (+0000)
Subject: hook.in: Rename variable dir to dir_.
X-Git-Tag: releases/gcc-4.6.0~5193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd6b2fa0e7cc07a7007f4928813f14cc940c50d9;p=thirdparty%2Fgcc.git

hook.in: Rename variable dir to dir_.

libstdc++-v3/
	* python/hook.in: Rename variable dir to dir_.

Co-Authored-By: Jan Kratochvil <jan.kratochvil@redhat.com>

From-SVN: r162962
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ccdf13a939cd..4056c5a033e9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-06  David Malcolm  <dmalcolm@redhat.com>
+	    Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* python/hook.in: Rename variable dir to dir_.
+
 2010-08-06  Jason Merrill  <jason@redhat.com>
 
 	* include/std/thread: Add deleted thread(thread&).
diff --git a/libstdc++-v3/python/hook.in b/libstdc++-v3/python/hook.in
index d4c290f82cd6..c76d4a3b3eba 100644
--- a/libstdc++-v3/python/hook.in
+++ b/libstdc++-v3/python/hook.in
@@ -50,10 +50,10 @@ if gdb.current_objfile () is not None:
     dotdots = ('..' + os.sep) * len (libdir.split (os.sep))
 
     objfile = gdb.current_objfile ().filename
-    dir = os.path.join (os.path.dirname (objfile), dotdots, pythondir)
+    dir_ = os.path.join (os.path.dirname (objfile), dotdots, pythondir)
 
-    if not dir in sys.path:
-        sys.path.insert(0, dir)
+    if not dir_ in sys.path:
+        sys.path.insert(0, dir_)
 
 # Load the pretty-printers.
 from libstdcxx.v6.printers import register_libstdcxx_printers