summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@fedoraproject.org>2008-07-21 16:11:33 -0400
committerMichael DeHaan <mdehaan@fedoraproject.org>2008-07-21 16:11:33 -0400
commit738e9624c60631ed2f0068f48ab42c96a3887a57 (patch)
treed0a8c0df3100a34798f1ccbd571f730c657d0eab
parente84bf323d8d2ec93a8348028b3e5daaf180e870a (diff)
downloadcobbler-738e9624c60631ed2f0068f48ab42c96a3887a57.tar.gz
cobbler-738e9624c60631ed2f0068f48ab42c96a3887a57.tar.xz
cobbler-738e9624c60631ed2f0068f48ab42c96a3887a57.zip
update services.py from master
-rw-r--r--cobbler/services.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cobbler/services.py b/cobbler/services.py
index f0fb1e4d..5d428cc9 100644
--- a/cobbler/services.py
+++ b/cobbler/services.py
@@ -101,14 +101,16 @@ class CobblerSvc(object):
if macinput is not None:
# FIXME: will not key off other NICs, problem?
mac = macinput.split()[1].strip()
-
+ else:
+ macinput = "None"
+
ip = rest["REMOTE_ADDR"]
candidates = []
for x in systems:
for y in x["interfaces"]:
- if x["interfaces"][y]["mac_address"].lower() == mac.lower():
+ if x["interfaces"][y]["mac_address"].lower() == macinput.lower():
candidates.append(x)
if len(candidates) == 0: