summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-04-30 04:21:38 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-04-30 04:21:38 (GMT)
commit6a936942119984f56abf30bc43970d10a28fa358 (patch)
tree01baecbd4fff86f2380b469c98a31ef99b59dd8e
parentac93b18796c7f26dbaba5558c7ab88e245295552 (diff)
downloadlinhes_pkgbuild-6a936942119984f56abf30bc43970d10a28fa358.zip
linhes_pkgbuild-6a936942119984f56abf30bc43970d10a28fa358.tar.gz
linhes_pkgbuild-6a936942119984f56abf30bc43970d10a28fa358.tar.bz2
LinHES-config: mv_supplemental, Fix setting windowmanager when the values are missing from systemconfig.
This can occur during upgrade of an older system
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rw-r--r--abs/core/LinHES-config/mv_supplemental.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 9373cef..5347d53 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=69
+pkgrel=70
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -138,7 +138,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
'9a1728bfd4fb83ca1c46321b57ef0248'
'23d0e12b7ca1cc6ea6b993c1d7ff20b9'
'0b5b9e5385c7ae77e561812e96ce8161'
- 'a1c80cc2b9f77080db02ca54c6057151'
+ '404f290d52e9c05a502910a7cb4140f1'
'd8f80e5686d02555f044363f1ac17d97'
'2596460462cf6c889cf8f95485537b20'
'a63ff9ef5250965aeabc74bfa8e43981')
diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py
index a09cce9..ca83400 100644
--- a/abs/core/LinHES-config/mv_supplemental.py
+++ b/abs/core/LinHES-config/mv_supplemental.py
@@ -12,7 +12,7 @@ def windowmanager(systemconfig):
windowmanager = "default"
return
- if windowmanager == "" :
+ if windowmanager == "" or windowmanager == None:
windowmanager = "default"
try:
style = systemconfig.get("EnhancedWMStyle")