From 1ec0fb3f80c64ede4c66a84dc63b475152824ae5 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 29 Aug 2007 18:16:25 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1240 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ catalyst | 2 +- modules/generic_stage_target.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b474c69..6a693f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 29 Aug 2007; Chris Gianelloni 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 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 38c15c26..8dbf0281 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 8f8f6a78..f1c8b507 100644 --- 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: -- 2.26.2