diff options
| -rw-r--r-- | cobbler.spec | 6 | ||||
| -rw-r--r-- | cobbler/utils.py | 4 | ||||
| -rw-r--r-- | tests/tests.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/cobbler.spec b/cobbler.spec index 6e3b449..494efbd 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -1,7 +1,7 @@ Summary: Boot server configurator Name: cobbler Version: 0.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System @@ -21,7 +21,7 @@ Xen, and re-provisioning an existing Linux system via auto-kickstart. The last two modes require 'koan' to be run on the remote system. %prep -%setup +%setup -q %build python setup.py build @@ -40,6 +40,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog +* Wed Aug 16 2006 - 0.1.1-5 +- Spec file tweaks only for FC-Extras * Thu Jul 20 2006 - 0.1.1-4 - Fixed python import paths in yaml code, which errantly assumed yaml was installed as a module. * Wed Jul 12 2006 - 0.1.1-3 diff --git a/cobbler/utils.py b/cobbler/utils.py index 0b96002..88c6c03 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -37,7 +37,7 @@ def find_system_identifier(strdata): pxelinux doesn't work in hostnames """ if is_mac(strdata): - return strdata + return strdata.upper() if is_ip(strdata): return strdata return resolve_ip(strdata) @@ -59,7 +59,7 @@ def is_mac(strdata): Return whether the argument is a mac address. """ # needs testcase - if re.search(r'[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F:0-9]{2}:[A-F:0-9]{2}',strdata): + if re.search(r'[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F:0-9]{2}:[A-F:0-9]{2}',strdata, re.IGNORECASE): return True return False diff --git a/tests/tests.py b/tests/tests.py index 11bf63f..1798c4a 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -111,7 +111,7 @@ class Utilities(BootTest): def test_matching(self): self.assertTrue(utils.is_mac("00:C0:B7:7E:55:50")) - self.assertFalse(utils.is_mac("00:c0:b7:7E:55:50")) + self.assertTrue(utils.is_mac("00:c0:b7:7E:55:50")) self.assertFalse(utils.is_mac("00.D0.B7.7E.55.50")) self.assertFalse(utils.is_mac(self.hostname)) self.assertTrue(utils.is_ip("127.0.0.1")) |