A few typo and other minor fixes as reported by armin76

diff --git a/ChangeLog b/ChangeLog
index fa66273590251917f938cc00d28b706434f6658b..d5aca85bd7f32b5b09a0c7f73c15bdebc5e5a352 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> arch/amd64.py,
+  arch/x86.py, catalyst:
+  A few typo and other minor fixes as reported by armin76
+
   07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
   Add support for digests="all" for gentoo bug #209611

diff --git a/arch/amd64.py b/arch/amd64.py
index 40593cfc0be86ab0195c2913ed4f4d7f7556ee47..868760ee16c5847bbdaff3a817b197424691b5da 100644 (file)
--- a/arch/amd64.py
+++ b/arch/amd64.py
@@ -61,7 +61,7 @@ def register():
                "k8"            : arch_k8,
                "opteron"       : arch_k8,
                "athlon64"      : arch_k8,
-               "athlonfx"      : arch_k8
+               "athlonfx"      : arch_k8,
                "nocona"        : arch_nocona,
 # uncomment when gcc 4.3 is stable and delete this line
 #              "core2"         : arch_core2,

diff --git a/arch/x86.py b/arch/x86.py
index 9f3d39d3a3702b79f7e8c1b6fc0ae81384b2f07a..324ed7997e5eb1b2283fac66123543bb4fd145a5 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.py
@@ -1,6 +1,6 @@
 
 import builder,os
-from catalyst_supportimport *
+from catalyst_support import *
 
 class generic_x86(builder.generic):
        "abstract base class for all x86 builders"

diff --git a/catalyst b/catalyst
index 5473652aefc987226e3b4a9c2052b48a8ff60f24..0f08e34a1a2b5c1b248d8414bd279bd47165ee04 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -4,10 +4,13 @@
 # Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@gentoo.org>
 
-import os,sys,imp,string,getopt
+import os, sys, imp, string, getopt
 import pdb
+import os.path
 
-sys.path.append("./modules")
+__selfpath__ = os.path.abspath(os.path.dirname(__file__))
+
+sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util