diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-27 12:32:36 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-04-27 12:32:36 -0400 |
| commit | 83571e47380958940fbbb1d39e12487cec07811d (patch) | |
| tree | 29bce06a487141ab7f1827442d3f8d49754fc4c3 /cobbler/action_import.py | |
| parent | 2246bd2588e7dd84747ceb0f799a8987a07d0d34 (diff) | |
| download | third_party-cobbler-83571e47380958940fbbb1d39e12487cec07811d.tar.gz third_party-cobbler-83571e47380958940fbbb1d39e12487cec07811d.tar.xz third_party-cobbler-83571e47380958940fbbb1d39e12487cec07811d.zip | |
If import name has underscores, prevent duplicate arch info just the same.
(This should probably be replaced with a regex eventually).
Diffstat (limited to 'cobbler/action_import.py')
| -rw-r--r-- | cobbler/action_import.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 6fb4280..a01128d 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -412,8 +412,11 @@ class Importer: name = name.replace("-pxeboot","") name = name.replace("--","-") name = name.replace("-i386","") + name = name.replace("_i386","") name = name.replace("-x86_64","") + name = name.replace("_x86_64","") name = name.replace("-ia64","") + name = name.replace("_ia64","") # ensure arch is on the end, regardless of path used. name = name + "-" + archname |