summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-06-22 23:41:48 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-06-22 23:41:48 (GMT)
commit6d4fe104ad3739e1bd5a948ed356f6f0fe357760 (patch)
tree4fb7f59c6a99724191b5db60220c7197cbe0e3f6
parent9cd5ccf725cc6a4cf5ea201a943bd897a60b369b (diff)
downloadlinhes_pkgbuild-6d4fe104ad3739e1bd5a948ed356f6f0fe357760.zip
linhes_pkgbuild-6d4fe104ad3739e1bd5a948ed356f6f0fe357760.tar.gz
linhes_pkgbuild-6d4fe104ad3739e1bd5a948ed356f6f0fe357760.tar.bz2
linhes-config: remove forced error, used for testing.
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/install_proxy.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 72a6472..676c13f 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.0
-pkgrel=22
+pkgrel=25
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 system-templates rsync python-parted ddcxinfo)
diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh
index 4d4160a..bedacbf 100755
--- a/abs/core-testing/LinHES-config/install_proxy.sh
+++ b/abs/core-testing/LinHES-config/install_proxy.sh
@@ -33,7 +33,10 @@ case $1 in
mv_install.py --rootdisk=$disk --rootfs=$rootfs --rootsize=$rootsize --datafs=$datafs --datasize=$datasize --datadisk=$disk --swapsize=$swapsize -c full_install
rc=$?
echo "mv_install.py exit code $rc"
- echo "mv_install error" >> /tmp/.install_error
+ if [ $rc != 0 ]
+ then
+ echo "mv_install error" >> /tmp/.install_error
+ fi
exit $rc
;;