[Uludag-commits] r11071 - in trunk/yali: . extensions yali yali/gui

[svn-uludag at uludag.org.tr]

Author: baris
Date: Fri Dec  1 13:42:08 2006
New Revision: 11071

Added:
   trunk/yali/extensions/yalisys.c
Removed:
   trunk/yali/extensions/eject.c
   trunk/yali/extensions/mount.c
   trunk/yali/extensions/reboot.c
Modified:
   trunk/yali/setup.py
   trunk/yali/yali/gui/ScrGoodbye.py
   trunk/yali/yali/gui/ScrWelcome.py
   trunk/yali/yali/gui/runner.py
   trunk/yali/yali/partitionrequest.py
   trunk/yali/yali/sysutils.py
Log:
- yalisys.c: one extension to rule them all
- sysutils.eject_cdrom(): ultra capable eject function ;).



Modified: trunk/yali/setup.py
=================================================================
--- trunk/yali/setup.py	(original)
+++ trunk/yali/setup.py	Fri Dec  1 13:42:08 2006
@@ -165,14 +165,8 @@
 
 
 
-mountmodule = Extension('mount',
-                        sources = ['extensions/mount.c'],
-                        extra_compile_args = ['-Wall'])
-rebootmodule = Extension('reboot',
-                         sources = ['extensions/reboot.c'],
-                         extra_compile_args = ['-Wall'])
-ejectmodule = Extension('eject',
-                        sources = ['extensions/eject.c'],
+yalisysmodule = Extension('yalisys',
+                        sources = ['extensions/yalisys.c'],
                         extra_compile_args = ['-Wall'])
 xcapslockmodule = Extension('xcapslock',
                             sources = ['extensions/xcapslock.c'],
@@ -194,7 +188,7 @@
                     ('/usr/share/yali/slideshow', gui_slidepics()),
                     ('/usr/share/yali/user_faces', user_faces())],
       scripts = ['yali-bin'],
-      ext_modules = [mountmodule, rebootmodule, ejectmodule, xcapslockmodule],
+      ext_modules = [yalisysmodule, xcapslockmodule],
       cmdclass = {
         'build' : YaliBuild,
         'clean' : YaliClean,

Modified: trunk/yali/yali/gui/ScrGoodbye.py
=================================================================
--- trunk/yali/yali/gui/ScrGoodbye.py	(original)
+++ trunk/yali/yali/gui/ScrGoodbye.py	Fri Dec  1 13:42:08 2006
@@ -18,8 +18,7 @@
 __trans = gettext.translation('yali', fallback=True)
 _ = __trans.ugettext
 
-import mount
-import reboot
+import yalisys
 
 import yali.sysutils
 import yali.users
@@ -100,12 +99,12 @@
 
 
         try:
-            mount.umount(ctx.consts.target_dir + "/home")
+            yalisys.umount(ctx.consts.target_dir + "/home")
         except:
             pass
 
-        mount.umount(ctx.consts.target_dir)
-        reboot.fastreboot()
+        yalisys.umount(ctx.consts.target_dir)
+        yalisys.fastreboot()
 
 
     # process pending actions defined in other screens.
@@ -149,8 +148,7 @@
         l.addLayout(buttons)
 
 
-        # dummy way to remove CD. But eject does it all for us :)
-        os.system("eject")
+        yali.sysutils.eject_cdrom()
 
         self.connect(self.reboot, SIGNAL("clicked()"),
                      self.slotReboot)

Modified: trunk/yali/yali/gui/ScrWelcome.py
=================================================================
--- trunk/yali/yali/gui/ScrWelcome.py	(original)
+++ trunk/yali/yali/gui/ScrWelcome.py	Fri Dec  1 13:42:08 2006
@@ -18,7 +18,7 @@
 _ = __trans.ugettext
 
 
-import reboot
+import yalisys
 from yali.gui.ScreenWidget import ScreenWidget
 from yali.gui.Ui.welcomewidget import WelcomeWidget
 import yali.gui.context as ctx
@@ -103,7 +103,7 @@
 
 
     def slotReboot(self):
-        reboot.fastreboot()
+        yalisys.fastreboot()
 
 
 

Modified: trunk/yali/yali/gui/runner.py
=================================================================
--- trunk/yali/yali/gui/runner.py	(original)
+++ trunk/yali/yali/gui/runner.py	Fri Dec  1 13:42:08 2006
@@ -18,8 +18,7 @@
 __trans = gettext.translation('yali', fallback=True)
 _ = __trans.ugettext
 
-import mount
-import reboot
+import yalisys
 
 import yali
 import yali.gui.context as ctx
@@ -190,8 +189,8 @@
     def slotReboot(self):
         
         try:
-            mount.umount(ctx.consts.target_dir + "/home")
+            yalisys.umount(ctx.consts.target_dir + "/home")
         except:
             pass
-        mount.umount(ctx.consts.target_dir)
-        reboot.fastreboot()
+        yalisys.umount(ctx.consts.target_dir)
+        yalisys.fastreboot()

Modified: trunk/yali/yali/partitionrequest.py
=================================================================
--- trunk/yali/yali/partitionrequest.py	(original)
+++ trunk/yali/yali/partitionrequest.py	Fri Dec  1 13:42:08 2006
@@ -13,7 +13,7 @@
 # partitionrequest.py defines requests (format, mount) on the partitions.
 
 import os
-import mount
+import yalisys
 
 from yali.exception import *
 from yali.constants import consts
@@ -309,7 +309,7 @@
         if not os.path.isdir(target):
             os.mkdir(target)
 
-        mount.mount(source, target, filesystem)
+        yalisys.mount(source, target, filesystem)
         
         mtab_entry = "%s %s %s rw 0 0\n" % (source,
                                             target,

Modified: trunk/yali/yali/sysutils.py
=================================================================
--- trunk/yali/yali/sysutils.py	(original)
+++ trunk/yali/yali/sysutils.py	Fri Dec  1 13:42:08 2006
@@ -13,7 +13,7 @@
 # sysutils module provides basic system utilities
 
 import os
-import mount
+import yalisys
 from string import ascii_letters
 from string import digits
 
@@ -96,6 +96,10 @@
             
     return None
 
+def eject_cdrom(mount_point=consts.source_dir):
+    if not yalisys.eject(mount_point):
+        os.system("eject %s" % mount_point)
+
 
 
 def text_is_valid(text):
@@ -146,18 +150,19 @@
 
     try:
         if file_system == "fat32":
-            mount.mount(partition_path, m_dir, "vfat")
+            yalisys.mount(partition_path, m_dir, "vfat")
         else:
-            mount.mount(partition_path, m_dir, file_system)
+            yalisys.mount(partition_path, m_dir, file_system)
     except:
         return False
 
     exist = lambda f: os.path.exists(os.path.join(m_dir, f))
 
     if exist("boot.ini") or exist("command.com"):
-        mount.umount(m_dir)
+        yalisys.umount(m_dir)
         return True
     else:
-        mount.umount(m_dir)
+        yalisys.umount(m_dir)
         return False
 
+