summaryrefslogtreecommitdiffstats
path: root/iutil.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-09-27 19:37:08 +0000
committerJeremy Katz <katzj@redhat.com>2002-09-27 19:37:08 +0000
commitad6aa44bd430a7c2b37ab730c7db8164f0597cb7 (patch)
tree1d7bc4ab374c84f6fd65048f17f5feaef1be6e82 /iutil.py
parentf06380adc9d5372bc41baa91b80729df313a0fe8 (diff)
downloadanaconda-ad6aa44bd430a7c2b37ab730c7db8164f0597cb7.tar.gz
anaconda-ad6aa44bd430a7c2b37ab730c7db8164f0597cb7.tar.xz
anaconda-ad6aa44bd430a7c2b37ab730c7db8164f0597cb7.zip
simplify this. it'll also mean we don't traceback if tmptzdata doesn't get set
Diffstat (limited to 'iutil.py')
-rw-r--r--iutil.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/iutil.py b/iutil.py
index b03fa227d..160860728 100644
--- a/iutil.py
+++ b/iutil.py
@@ -286,17 +286,11 @@ def findtz(basepath, relpath):
continue
elif n[:1] >= 'A' and n[:1] <= 'Z':
if stat.S_ISDIR(filemode):
- tmptzdata = findtz(basepath, timezone)
+ tzdata.extend(findtz(basepath, timezone))
else:
- tmptzdata = [timezone]
-
- for m in tmptzdata:
- if tzdata == []:
- tzdata = [m]
- else:
- tzdata.append(m)
+ tzdata.append(timezone)
- tzdata.sort()
+ tzdata.sort()
return tzdata