Fixed livecd/volid by removing the string.join() from set_iso_volume_id() for bug...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1240 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 8b474c691b8efde7381cb31b7a5df7b578f3a008..6a693f07f5026e312b897cc5b2f4c06d2a114f3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/generic_stage_target.py:
+  Fixed livecd/volid by removing the string.join() from set_iso_volume_id()
+  for bug #188099. This is catalyst 2.0.5_pre2 for testing.
+
   29 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/rc-update.sh:
   Added support for the newer versions of splashutils which use fbcondecor as

diff --git a/catalyst b/catalyst
index 38c15c26299f82f4876e0b59f38711c42037b8c5..8dbf0281f16e66d9cde5172c3e560bcce682f9a4 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5_pre1"
+__version__="2.0.5_pre2"
 
 conf_values={}
 

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8f8f6a789492f174ea324513e9d8eec44badc68f..f1c8b50722b540f6977da2eecefcd0976e217a77 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -390,7 +390,7 @@ class generic_stage_target(generic_target):
 
        def set_iso_volume_id(self):
                 if self.settings.has_key(self.settings["spec_prefix"]+"/volid"):
-                       self.settings["iso_volume_id"] = string.join(self.settings[self.settings["spec_prefix"]+"/volid"])
+                       self.settings["iso_volume_id"] = self.settings[self.settings["spec_prefix"]+"/volid"]
                        if len(self.settings["iso_volume_id"])>32:
                                raise CatalystError,"ISO VOLUME ID: volid must not exceed 32 characters."
                else: