diff options
| author | James Laska <jlaska@redhat.com> | 2009-02-23 16:12:39 -0500 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2009-02-24 14:03:42 -0500 |
| commit | 90da76a410d37ae9450b3ed83aa2689c1dbe1440 (patch) | |
| tree | becdd03ba7d453da5668be0d010f3de5ef5ce4d8 /cobbler | |
| parent | 5e3f5923d4c25427b729f0c89580de577ea597f7 (diff) | |
| download | cobbler-90da76a410d37ae9450b3ed83aa2689c1dbe1440.tar.gz cobbler-90da76a410d37ae9450b3ed83aa2689c1dbe1440.tar.xz cobbler-90da76a410d37ae9450b3ed83aa2689c1dbe1440.zip | |
Order matters, check for 's390x', then 's390'.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_import.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 3de63b98..04701da4 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -774,7 +774,7 @@ class Importer: name = name.replace("chrp","ppc64") for separator in [ '-' , '_' , '.' ] : - for arch in [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc32", "ppc", "x86" , "s390", "s390x" , "386" , "amd" ]: + for arch in [ "i386" , "x86_64" , "ia64" , "ppc64", "ppc32", "ppc", "x86" , "s390x", "s390" , "386" , "amd" ]: name = name.replace("%s%s" % ( separator , arch ),"") return name @@ -792,10 +792,10 @@ class Importer: return "ia64" if dirname.find("i386") != -1 or dirname.find("386") != -1 or dirname.find("x86") != -1: return "i386" - if dirname.find("s390") != -1: - return "s390" if dirname.find("s390x") != -1: return "s390x" + if dirname.find("s390") != -1: + return "s390" if dirname.find("ppc64") != -1 or dirname.find("chrp") != -1: return "ppc64" if dirname.find("ppc32") != -1: |