diff options
| -rw-r--r-- | packages.py | 4 | ||||
| -rw-r--r-- | timezone.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packages.py b/packages.py index 480ea30c7..beed857de 100644 --- a/packages.py +++ b/packages.py @@ -472,6 +472,10 @@ def setupTimezone(timezone, upgrade, instPath, dir): # we don't need this on an upgrade or going backwards if upgrade.get() or (dir == DISPATCH_BACK): return + + # dont do this in test mode! + if flags.test: + return os.environ["TZ"] = timezone.tz tzfile = "/usr/share/zoneinfo/" + timezone.tz diff --git a/timezone.py b/timezone.py index 31b8fe425..c4ec9275d 100644 --- a/timezone.py +++ b/timezone.py @@ -12,7 +12,7 @@ # import iutil - +from flags import flags from rhpl.log import log def bool(val): @@ -28,6 +28,10 @@ class Timezone: f.write(" %s\n" % self.tz) def write(self, instPath): + # dont do this in test mode! + if flags.test: + return + fromFile = instPath + "/usr/share/zoneinfo/" + self.tz try: |