summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-08-26 17:45:19 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-08-26 17:45:19 (GMT)
commite713d247fa58cbd41e23219a9e83f7076214a9b5 (patch)
tree703479b769bd6736238089aead1585dfcc2794f4
parentb99a6e96e555c1cbecd56b536abb324e9b6859f8 (diff)
downloadlinhes_pkgbuild-e713d247fa58cbd41e23219a9e83f7076214a9b5.zip
linhes_pkgbuild-e713d247fa58cbd41e23219a9e83f7076214a9b5.tar.gz
linhes_pkgbuild-e713d247fa58cbd41e23219a9e83f7076214a9b5.tar.bz2
linhes-config: mv_install.py, fixed a few minor debugging typos
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/mv_install.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 66d1d42..f8d1eaa 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=5
+pkgrel=8
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,7 +101,7 @@ build() {
install -m 0755 issue $startdir/pkg/etc/issue
}
-md5sums=('b078307bd347cba80978511b0e75b68a'
+md5sums=('81872a7465943266e1bad177b0873b0a'
'16b98fcb3753ef6cfc35075c326d30e4'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index e774521..e89602b 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -263,7 +263,7 @@ def create_partitions(diskdevice, size, ptype, startsector):
newstart = 0
totalused = 0
device = parted.getDevice(diskdevice)
- logging.debug("Sector size is %s %s", %( diskdevice , device.sectorSize))
+ logging.debug("Sector size is %s %s", diskdevice , device.sectorSize)
partdisk = parted.Disk(device)
for partition in partdisk.partitions:
if partition.type != parted.PARTITION_FREESPACE:
@@ -293,7 +293,7 @@ def create_partitions(diskdevice, size, ptype, startsector):
# convert size in MB to a length on the device in sectors
length = (int(size) * (1024 * 1024)) / device.sectorSize
logging.debug("Size is %s", length)
- if length > device.length:
+ if length > device.length:
length = device.length - newstart
logging.info("Size is larger then disk, reducing size")
logging.debug("New Size is %s", length)