[Uludag-commits] r17579 - in branches/yali4: po yali4 yali4/gui yali4/gui/Ui
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
4 Nis 2008 Cum 17:41:23 EEST
Author: gokmen.goksel
Date: Fri Apr 4 17:41:23 2008
New Revision: 17579
Modified:
branches/yali4/po/ca.po
branches/yali4/po/de.po
branches/yali4/po/es.po
branches/yali4/po/fr.po
branches/yali4/po/it.po
branches/yali4/po/nl.po
branches/yali4/po/pl.po
branches/yali4/po/pt_BR.po
branches/yali4/po/tr.po
branches/yali4/po/yali4.pot
branches/yali4/yali4/bootloader.py
branches/yali4/yali4/gui/ScrBootloader.py
branches/yali4/yali4/gui/Ui/main.ui
branches/yali4/yali4/gui/installdata.py
Log:
* Yali4 est silicis - firmus
Modified: branches/yali4/po/ca.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/de.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/es.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/fr.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/it.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/nl.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/pl.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/pt_BR.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/tr.po
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/po/yali4.pot
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: branches/yali4/yali4/bootloader.py
=================================================================
--- branches/yali4/yali4/bootloader.py (original)
+++ branches/yali4/yali4/bootloader.py Fri Apr 4 17:41:23 2008
@@ -23,7 +23,7 @@
import yali4.partitiontype as parttype
import yali4.partitionrequest as request
from yali4.partitionrequest import partrequests
-from yali4.constants import consts
+import yali4.gui.context as ctx
grub_conf_tmp = """\
default 0
@@ -90,7 +90,7 @@
d = l[1]
return d
- def write_grub_conf(self, install_root_path,install_dev):
+ def write_grub_conf(self, install_root_path, install_dev):
""" Check configurations and write grub.conf to the installed system.
Default path is /mnt/target/boot/grub.conf """
if not install_dev.startswith("/dev/"):
@@ -106,9 +106,16 @@
# write an empty grub.conf, for grub to create a device map.
open(self.grub_conf, "w").close()
+ deviceMap = open(self.device_map, "w")
+ i = 0
# create device map
- cmd = "/sbin/grub --batch --no-floppy --device-map=%s < %s" % (self.device_map, self.grub_conf)
- os.system(cmd)
+ for disk in ctx.installData.orderedDiskList:
+ deviceMap.write("(hd%d)\t%s\n" % (i,disk))
+ i+=1
+ deviceMap.close()
+
+ # cmd = "/sbin/grub --batch --no-floppy --device-map=%s < %s" % (self.device_map, self.grub_conf)
+ # os.system(cmd)
_grb = self._find_grub_dev(install_root_path)
Modified: branches/yali4/yali4/gui/ScrBootloader.py
=================================================================
--- branches/yali4/yali4/gui/ScrBootloader.py (original)
+++ branches/yali4/yali4/gui/ScrBootloader.py Fri Apr 4 17:41:23 2008
@@ -101,8 +101,8 @@
self.slotSelect)
def shown(self):
- self.orderedDiskList = yali4.storage.getOrderedDiskList()
- ctx.debugger.log("Disks BIOS Boot order : %s " % ','.join(self.orderedDiskList))
+ ctx.installData.orderedDiskList = yali4.storage.getOrderedDiskList()
+ ctx.debugger.log("Disks BIOS Boot order : %s " % ','.join(ctx.installData.orderedDiskList))
def backCheck(self):
if ctx.autoInstall:
@@ -191,9 +191,6 @@
ctx.debugger.log("dryRun activated Yali stopped")
return
- # We always need swap ..
- self.checkSwap()
-
# Auto Partitioning
if ctx.installData.autoPartDev:
if ctx.installData.autoPartMethod == methodEraseAll:
@@ -205,6 +202,7 @@
time.sleep(2)
info.updateMessage(_("Formatting ..."))
ctx.mainScreen.processEvents()
+ self.checkSwap()
ctx.partrequests.applyAll()
elif ctx.installData.autoPartMethod == methodUseAvail:
pass
@@ -220,6 +218,7 @@
time.sleep(2)
info.updateMessage(_("Formatting ..."))
ctx.mainScreen.processEvents()
+ self.checkSwap()
ctx.partrequests.applyAll()
ctx.debugger.log("Format Operation Finished")
ctx.mainScreen.processEvents()
@@ -238,7 +237,7 @@
ctx.installData.bootLoaderDev = basename(self.device.getPath())
else:
if len(yali4.storage.devices) > 1:
- ctx.installData.bootLoaderDev = basename(self.orderedDiskList[0])
+ ctx.installData.bootLoaderDev = basename(ctx.installData.orderedDiskList[0])
else:
ctx.installData.bootLoaderDev = str(basename(root_part_req.partition().getPath()))
Modified: branches/yali4/yali4/gui/Ui/main.ui
=================================================================
--- branches/yali4/yali4/gui/Ui/main.ui (original)
+++ branches/yali4/yali4/gui/Ui/main.ui Fri Apr 4 17:41:23 2008
@@ -556,7 +556,7 @@
<string>Previous Screen</string>
</property>
<property name="text" >
- <string>« Back</string>
+ <string>Back</string>
</property>
</widget>
</item>
@@ -569,7 +569,7 @@
<string>Next Screen</string>
</property>
<property name="text" >
- <string> Next »</string>
+ <string>Next</string>
</property>
</widget>
</item>
Modified: branches/yali4/yali4/gui/installdata.py
=================================================================
--- branches/yali4/yali4/gui/installdata.py (original)
+++ branches/yali4/yali4/gui/installdata.py Fri Apr 4 17:41:23 2008
@@ -23,6 +23,7 @@
autoPartPartition = None
autoPartMethod = methodUseAvail
bootLoaderDev = None
+ orderedDiskList = []
repoAddr = None
useYaliFirstBoot = False
timezone = "Europe/Istanbul"
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi