diff options
author | James Meyer <james.meyer@operamail.com> | 2009-01-17 18:52:21 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2009-01-17 18:52:21 (GMT) |
commit | aea6f85771b9fe294446b3f14b989c90fb31cc03 (patch) | |
tree | 3a9483070e810ab3ec09a8722929779732d546ab | |
parent | cff24d02505081b7297a257c38edcf286772e015 (diff) | |
download | linhes_pkgbuild-aea6f85771b9fe294446b3f14b989c90fb31cc03.zip linhes_pkgbuild-aea6f85771b9fe294446b3f14b989c90fb31cc03.tar.gz linhes_pkgbuild-aea6f85771b9fe294446b3f14b989c90fb31cc03.tar.bz2 |
Update to timezip to not bomb when the BEhostname query dies.
-rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
-rwxr-xr-x | abs/core-testing/LinHES-config/timezip.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index a3c00c1..ef13c04 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=193 +pkgrel=194 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) diff --git a/abs/core-testing/LinHES-config/timezip.py b/abs/core-testing/LinHES-config/timezip.py index 505b4a4..ad9bbd0 100755 --- a/abs/core-testing/LinHES-config/timezip.py +++ b/abs/core-testing/LinHES-config/timezip.py @@ -41,7 +41,10 @@ def selectvars(): # execute SQL statement cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb)) result = cursor.fetchone() - BEhostname=result[0] + try: + BEhostname=result[0] + except TypeError: + BEhostname="" cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname)) result = cursor.fetchone() |