From 24dae363a3bc25af8d072b2215eecb11777da049 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 4 Aug 2011 12:35:38 -0500
Subject: linhes-config: remove larch packages after system install & remove
 larch from pacman.conf mv_install.py: exit if parted is not found

---
 abs/core/LinHES-config/PKGBUILD        |  6 +++---
 abs/core/LinHES-config/mv_install.py   |  1 +
 abs/core/LinHES-config/systemconfig.sh | 11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 2289196..2df19dd 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=21
+pkgrel=23
 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'
@@ -101,13 +101,13 @@ build() {
     install -m 0755 issue $startdir/pkg/etc/issue
 
 }
-md5sums=('c1f6bd445284408767ab8ab4c4164aed'
+md5sums=('c737f8538aea20fcb5f3903957e80837'
          '1a4694fcd694b362c339bda781ed0f3e'
          'e36da536dd651ef182e7642337889e77'
          '985891a43f7c4c983eb2a362162f1a0f'
          'd7a8cd4a0060399ae22e69f74e04eb07'
          '7a45287a07145fde5aa664583d4f6fba'
-         'f88d2fb88339a4bf8ec9217a3fbcdef7'
+         '39ca949f82123a5e84902d761a6f9ca2'
          '8ac1cfd2eca0f641737da0d0aca416a7'
          '9ae8d79f620c6d19973c55c32a921874'
          '95526b4d3dec6c9341088fb6511d831a'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 9dcc7b7..694a0b8 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -7,6 +7,7 @@ try:
     import parted
 except:
     print "module parted not found"
+    sys.exit(1)
 
 def usage():
     print "help text:"
diff --git a/abs/core/LinHES-config/systemconfig.sh b/abs/core/LinHES-config/systemconfig.sh
index 218f705..dce8c74 100755
--- a/abs/core/LinHES-config/systemconfig.sh
+++ b/abs/core/LinHES-config/systemconfig.sh
@@ -10,6 +10,17 @@ echo "----------------------start of systemconfig $@ ----------------------"
 . $MV_ROOT/bin/networkconfig.sh
 postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype`
 
+for i in larch liblarch larch-profiles larch-live
+do
+    pacman -Q $i
+    if [ $? == 0 ]
+    then
+        pacman -R $i --noconfirm
+    fi
+done
+
+ sed -i '/larch/d' /etc/pacman.conf
+
 systemconfig.py -m $@
 rc=$?
 echo "systemconfig.py exit code $rc"
-- 
cgit v0.12