[rtems-tools commit] 4.11: fix hosts defaults loading for linux systems.

Gedare Bloom gedare at rtems.org
Tue Mar 20 17:04:53 UTC 2018


Module:    rtems-tools
Branch:    4.11
Commit:    2b82b8006089ba0deb57df0507635b27475c2a72
Changeset: http://git.rtems.org/rtems-tools/commit/?id=2b82b8006089ba0deb57df0507635b27475c2a72

Author:    Gedare Bloom <gedare at rtems.org>
Date:      Tue Mar 20 13:01:31 2018 -0400

4.11: fix hosts defaults loading for linux systems.

---

 rtemstoolkit/linux.py   | 2 +-
 rtemstoolkit/options.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rtemstoolkit/linux.py b/rtemstoolkit/linux.py
index d011f67..15c6132 100644
--- a/rtemstoolkit/linux.py
+++ b/rtemstoolkit/linux.py
@@ -138,7 +138,7 @@ def load():
                      '__chown':        ('exe',     'required', '/usr/sbin/chown') },
         }
 
-    if variations in distro:
+    if distro in variations:
         for v in variations[distro]:
             if path.exists(variations[distro][v][2]):
                 defines[v] = variations[distro][v]
diff --git a/rtemstoolkit/options.py b/rtemstoolkit/options.py
index d0e4c81..f156641 100644
--- a/rtemstoolkit/options.py
+++ b/rtemstoolkit/options.py
@@ -581,6 +581,7 @@ def load(opts):
                     from . import linux
                 except:
                     import linux
+                overrides = linux.load()
             elif uname[0] == 'SunOS':
                 try:
                     from . import solaris




More information about the vc mailing list