Here's my first patch.
This one basically gets rid of "str" as a variable name. Also, I took
the opportunity to make the salt construction more concise, and pointed
out a bug that I don't know how to fix.
Shandy
97c97,98
< str = ""
---
> newArgs = []
> cfgFilename = "/tmp/install.cfg"
101,103c102,103
< f = open("/tmp/install.cfg")
< lines = f.readlines()
< for line in lines:
---
> f = open(cfgFilename)
> for line in f:
110c110
< str = str + "dasd=" + vparm
---
> newArgs.append( "dasd=" + vparm )
116c116,117
< pass
---
> log("exception parsing %s: %s" % (cfgFilename, e))
> f.close()
119c120,121
< ourargs = ["speakup_synth=", "apic", "noapic", "apm=", "ide=nodma", "noht", "acpi=", "video=", "pci=", "nodmraid", "nompath"]
---
> ourargs = ["speakup_synth=", "apic", "noapic", "apm=", "ide=nodma",
> "noht", "acpi=", "video=", "pci=", "nodmraid", "nompath"]
127,128c129,131
< if str: str = str + " "
< str = str + arg
---
> newArgs.append( arg )
>
> self.args = " ".join( newArgs )
130d132
< self.args = str
588c590
< str = self.writeLilo(instRoot, fsset, bl, langs, kernelList,
---
> out = self.writeLilo(instRoot, fsset, bl, langs, kernelList,
647a650
> saltPot = string.letters + string.digits +'./'
649,650c652
< salt = salt + random.choice (string.letters +
< string.digits + './')
---
> salt += random.choice( saltPot )
1197c1199
< str = self.writeGrub(instRoot, fsset, bl, langs, kernelList,
---
> out = self.writeGrub(instRoot, fsset, bl, langs, kernelList,
1393c1395
< str = self.writeZipl(instRoot, fsset, bl, langs, kernelList,
---
> out = self.writeZipl(instRoot, fsset, bl, langs, kernelList,
1396c1398
< str = self.writeChandevConf(bl, instRoot)
---
> out = self.writeChandevConf(bl, instRoot)
1739c1741
< str = self.writeYaboot(instRoot, fsset, bl, langs, kernelList,
---
> out = self.writeYaboot(instRoot, fsset, bl, langs, kernelList,
1991a1994,1995
> # TODO!!! FIXME!!! XXX!!!
> # butil is not defined!!! - assume this is in rhpl now?
d97 1
a97 2
newArgs = []
cfgFilename = "/tmp/install.cfg"
d101 3
a103 2
f = open(cfgFilename)
for line in f:
d110 1
a110 1
newArgs.append( "dasd=" + vparm )
d116 1
a116 2
log("exception parsing %s: %s" % (cfgFilename, e))
f.close()
d119 1
a119 2
ourargs = ["speakup_synth=", "apic", "noapic", "apm=", "ide=nodma",
"noht", "acpi=", "video=", "pci=", "nodmraid", "nompath"]
d127 2
a128 3
newArgs.append( arg )
self.args = " ".join( newArgs )
d130 1
d588 1
a588 1
out = self.writeLilo(instRoot, fsset, bl, langs, kernelList,
a647 1
saltPot = string.letters + string.digits +'./'
d649 2
a650 1
salt += random.choice( saltPot )
d1197 1
a1197 1
out = self.writeGrub(instRoot, fsset, bl, langs, kernelList,
d1393 1
a1393 1
out = self.writeZipl(instRoot, fsset, bl, langs, kernelList,
d1396 1
a1396 1
out = self.writeChandevConf(bl, instRoot)
d1739 1
a1739 1
out = self.writeYaboot(instRoot, fsset, bl, langs, kernelList,
a1991 2
# TODO!!! FIXME!!! XXX!!!
# butil is not defined!!! - assume this is in rhpl now?
