From 69bf86d8a6cadad490401040a36e227afe7e8524 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat dot com>
Date: Fri, 25 May 2007 14:28:38 -0400
Subject: [PATCH] Better handle CD size variable (float vs string and comments)

---
 config/f7-everything.i386   | 2 +-
 config/f7-everything.ppc    | 2 +-
 config/f7-everything.x86_64 | 2 +-
 config/f7-fedora.i386       | 2 +-
 config/f7-fedora.ppc        | 2 +-
 config/f7-fedora.x86_64     | 2 +-
 pypungi/pungi.py            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/f7-everything.i386 b/config/f7-everything.i386
index fce7f87d..3052245d 100644
--- a/config/f7-everything.i386
+++ b/config/f7-everything.i386
@@ -15,5 +15,5 @@ arch = i386
 version = 7
 flavor = Everything
 discs = 2
-cdsize = 4608.0; DVD size
+cdsize = 4608.0
 getsource = no
diff --git a/config/f7-everything.ppc b/config/f7-everything.ppc
index 6fa997c3..2c713a94 100644
--- a/config/f7-everything.ppc
+++ b/config/f7-everything.ppc
@@ -15,5 +15,5 @@ arch = ppc
 version = 7
 flavor = Everything
 discs = 2
-cdsize = 4608.0; DVD size
+cdsize = 4608.0
 getsource = no
diff --git a/config/f7-everything.x86_64 b/config/f7-everything.x86_64
index ea89f940..d0025aea 100644
--- a/config/f7-everything.x86_64
+++ b/config/f7-everything.x86_64
@@ -15,5 +15,5 @@ arch = x86_64
 version = 7
 flavor = Everything
 discs = 2
-cdsize = 4608.0; DVD size
+cdsize = 4608.0
 getsource = no
diff --git a/config/f7-fedora.i386 b/config/f7-fedora.i386
index ea1fd9a4..90ad163d 100644
--- a/config/f7-fedora.i386
+++ b/config/f7-fedora.i386
@@ -15,5 +15,5 @@ arch = i386
 version = 7
 flavor = Fedora
 discs = 1
-# cdsize = 4608.0; not used with discs = 1
+# cdsize = 4608.0
 getsource = no
diff --git a/config/f7-fedora.ppc b/config/f7-fedora.ppc
index 844b664d..0a1e423d 100644
--- a/config/f7-fedora.ppc
+++ b/config/f7-fedora.ppc
@@ -15,5 +15,5 @@ arch = ppc
 version = 7
 flavor = Fedora
 discs = 1
-# cdsize = 4608.0; not used with discs = 1
+# cdsize = 4608.0
 getsource = no
diff --git a/config/f7-fedora.x86_64 b/config/f7-fedora.x86_64
index 2d6674ff..8d6d4fa5 100644
--- a/config/f7-fedora.x86_64
+++ b/config/f7-fedora.x86_64
@@ -15,5 +15,5 @@ arch = x86_64
 version = 7
 flavor = Fedora
 discs = 1
-#cdsize = 4608.0; not used with discs = 1
+#cdsize = 4608.0
 getsource = no
diff --git a/pypungi/pungi.py b/pypungi/pungi.py
index 3f74669a..b4bdfc87 100755
--- a/pypungi/pungi.py
+++ b/pypungi/pungi.py
@@ -215,7 +215,7 @@ class Pungi:
 
         timber = splittree.Timber()
         timber.arch = self.config.get('default', 'arch')
-        timber.target_size = float(self.config.get('default', 'cdsize')) * 1024 * 1024
+        timber.target_size = self.config.getfloat('default', 'cdsize') * 1024 * 1024
         timber.total_discs = self.config.getint('default', 'discs')
         timber.bin_discs = self.config.getint('default', 'discs')
         timber.src_discs = 0