[Et-mgmt-commits-list] [SCM] cobbler branch, master now at v0.4.7-7-g83571e4

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  83571e47380958940fbbb1d39e12487cec07811d (commit)
      from  2246bd2588e7dd84747ceb0f799a8987a07d0d34 (commit)

- Log -----------------------------------------------------------------
commit 83571e47380958940fbbb1d39e12487cec07811d
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Fri Apr 27 12:32:36 2007 -0400

    If import name has underscores, prevent duplicate arch info just the same.
    (This should probably be replaced with a regex eventually).
-----------------------------------------------------------------------

Diffstat:
 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
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  2246bd2588e7dd84747ceb0f799a8987a07d0d34 \
  83571e47380958940fbbb1d39e12487cec07811d