diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-10-18 13:48:48 -0400 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-18 13:48:48 -0400 |
| commit | 680184ad9785066fd6610a5709992b5a4370b900 (patch) | |
| tree | df45d3aa44345a0de0a90a2fb8edf3a0c8c06bfd /cobbler/action_import.py | |
| parent | 4f3a2a94785ca94a67d27bc2b26a997b86d1eda3 (diff) | |
| download | third_party-cobbler-680184ad9785066fd6610a5709992b5a4370b900.tar.gz third_party-cobbler-680184ad9785066fd6610a5709992b5a4370b900.tar.xz third_party-cobbler-680184ad9785066fd6610a5709992b5a4370b900.zip | |
bugfix to revert a previous change -- paths DO need to have "/"'s in them, because slashes cause obvious problems.
Diffstat (limited to 'cobbler/action_import.py')
| -rw-r--r-- | cobbler/action_import.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 7c40645..69bfa97 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -182,7 +182,6 @@ class Importer: initrd = None kernel = None for tentative in fnames: - print "T(%s)" % tentative for filter_out in DIRECTORY_SIEVE: if tentative == filter_out: fnames.remove(tentative) @@ -221,10 +220,10 @@ class Importer: self.api.serialize() def get_proposed_name(self,dirname): - # for now, just use the path to the images directory as the - # name or the profile. This provides the added bonus of letting - # the shell interpolate it. - return dirname + name = "_".join(dirname.split("/")) + if name.startswith("_"): + name = name[1:] + return name def get_pxe_arch(self,dirname): t = dirname |