[Uludag-commits] r11972 - in trunk/yali: . extensions yali yali/gui
svn-uludag at uludag.org.tr
svn-uludag at uludag.org.tr
14 Oca 2007 Paz 16:28:51 EET
Author: baris
Date: Sun Jan 14 16:28:50 2007
New Revision: 11972
Added:
trunk/yali/yali/_sysutils.c
- copied, changed from r11951, trunk/yali/extensions/yalisys.c
Removed:
trunk/yali/extensions/
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:
Get rid of the extensions sub-directory and gather all modules in yali/.
Modified: trunk/yali/setup.py
=================================================================
--- trunk/yali/setup.py (original)
+++ trunk/yali/setup.py Sun Jan 14 16:28:50 2007
@@ -178,8 +178,8 @@
('/usr/share/yali/slideshow', gui_slidepics()),
('/usr/share/yali/user_faces', user_faces())],
scripts = ['yali-bin'],
- ext_modules = [Extension('yalisys',
- sources = ['extensions/yalisys.c'],
+ ext_modules = [Extension('yali._sysutils',
+ sources = ['yali/_sysutils.c'],
extra_compile_args = ['-Wall'])],
cmdclass = {
'build' : YaliBuild,
Copied: trunk/yali/yali/_sysutils.c (from r11951, trunk/yali/extensions/yalisys.c)
=================================================================
--- trunk/yali/extensions/yalisys.c (original)
+++ trunk/yali/yali/_sysutils.c Sun Jan 14 16:28:50 2007
@@ -24,7 +24,7 @@
"method implements the mount(2) system call in Linux\n");
static PyObject*
-yalisys_mount(PyObject *self, PyObject *args)
+_sysutils_mount(PyObject *self, PyObject *args)
{
int ok;
@@ -50,7 +50,7 @@
"method implements the umount(2) system call in Linux\n");
static PyObject*
-yalisys_umount(PyObject *self, PyObject *args)
+_sysutils_umount(PyObject *self, PyObject *args)
{
int ok;
const char *tgt;
@@ -74,7 +74,7 @@
"");
static PyObject*
-yalisys_eject(PyObject *self, PyObject *args)
+_sysutils_eject(PyObject *self, PyObject *args)
{
int fd;
const char *mount_point;
@@ -109,7 +109,7 @@
"sync() and reboot() if root user ;)!\n");
void
-yalisys_fastreboot(PyObject *self)
+_sysutils_fastreboot(PyObject *self)
{
if (getuid() != 0)
@@ -125,20 +125,20 @@
-static PyMethodDef yalisys_methods[] = {
- {"mount", (PyCFunction)yalisys_mount, METH_VARARGS, mount__doc__},
- {"umount", (PyCFunction)yalisys_umount, METH_VARARGS, umount__doc__},
- {"eject", (PyCFunction)yalisys_eject, METH_VARARGS, eject__doc__},
- {"fastreboot", (PyCFunction)yalisys_fastreboot, METH_NOARGS, fastreboot__doc__},
+static PyMethodDef _sysutils_methods[] = {
+ {"mount", (PyCFunction)_sysutils_mount, METH_VARARGS, mount__doc__},
+ {"umount", (PyCFunction)_sysutils_umount, METH_VARARGS, umount__doc__},
+ {"eject", (PyCFunction)_sysutils_eject, METH_VARARGS, eject__doc__},
+ {"fastreboot", (PyCFunction)_sysutils_fastreboot, METH_NOARGS, fastreboot__doc__},
{NULL, NULL}
};
PyMODINIT_FUNC
-inityalisys(void)
+init_sysutils(void)
{
PyObject *m;
- m = Py_InitModule("yalisys", yalisys_methods);
+ m = Py_InitModule("_sysutils", _sysutils_methods);
return;
}
Modified: trunk/yali/yali/gui/ScrGoodbye.py
=================================================================
--- trunk/yali/yali/gui/ScrGoodbye.py (original)
+++ trunk/yali/yali/gui/ScrGoodbye.py Sun Jan 14 16:28:50 2007
@@ -18,8 +18,6 @@
__trans = gettext.translation('yali', fallback=True)
_ = __trans.ugettext
-import yalisys
-
import yali.sysutils
import yali.users
import yali.localeutils
@@ -99,12 +97,12 @@
try:
- yalisys.umount(ctx.consts.target_dir + "/home")
+ yali.sysutils.umount(ctx.consts.target_dir + "/home")
except:
pass
- yalisys.umount(ctx.consts.target_dir)
- yalisys.fastreboot()
+ yali.sysutils.umount(ctx.consts.target_dir)
+ yali.sysutils.fastreboot()
# process pending actions defined in other screens.
Modified: trunk/yali/yali/gui/ScrWelcome.py
=================================================================
--- trunk/yali/yali/gui/ScrWelcome.py (original)
+++ trunk/yali/yali/gui/ScrWelcome.py Sun Jan 14 16:28:50 2007
@@ -17,8 +17,7 @@
__trans = gettext.translation('yali', fallback=True)
_ = __trans.ugettext
-
-import yalisys
+import yali.sysutils
from yali.gui.ScreenWidget import ScreenWidget
from yali.gui.Ui.welcomewidget import WelcomeWidget
import yali.gui.context as ctx
@@ -103,7 +102,7 @@
def slotReboot(self):
- yalisys.fastreboot()
+ yali.sysutils.fastreboot()
Modified: trunk/yali/yali/gui/runner.py
=================================================================
--- trunk/yali/yali/gui/runner.py (original)
+++ trunk/yali/yali/gui/runner.py Sun Jan 14 16:28:50 2007
@@ -18,9 +18,9 @@
__trans = gettext.translation('yali', fallback=True)
_ = __trans.ugettext
-import yalisys
import yali
+import yali.sysutils
import yali.gui.context as ctx
from pyaspects.weaver import *
from pyaspects.debuggeraspect import DebuggerAspect
@@ -191,8 +191,8 @@
def slotReboot(self):
try:
- yalisys.umount(ctx.consts.target_dir + "/home")
+ yali.sysutils.umount(ctx.consts.target_dir + "/home")
except:
pass
- yalisys.umount(ctx.consts.target_dir)
- yalisys.fastreboot()
+ yali.sysutils.umount(ctx.consts.target_dir)
+ yali.sysutils.fastreboot()
Modified: trunk/yali/yali/partitionrequest.py
=================================================================
--- trunk/yali/yali/partitionrequest.py (original)
+++ trunk/yali/yali/partitionrequest.py Sun Jan 14 16:28:50 2007
@@ -13,7 +13,6 @@
# partitionrequest.py defines requests (format, mount) on the partitions.
import os
-import yalisys
from yali.exception import *
from yali.constants import consts
@@ -309,7 +308,7 @@
if not os.path.isdir(target):
os.mkdir(target)
- yalisys.mount(source, target, filesystem)
+ yali.sysutils.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 Sun Jan 14 16:28:50 2007
@@ -13,11 +13,11 @@
# sysutils module provides basic system utilities
import os
-import yalisys
from string import ascii_letters
from string import digits
from pmp.sysutils import find_executable
+from yali._sysutils import *
from yali.constants import consts
##
@@ -85,7 +85,7 @@
def eject_cdrom(mount_point=consts.source_dir):
def _eject():
- if not yalisys.eject(mount_point):
+ if not eject(mount_point):
os.system("eject -m %s" % mount_point)
for i in range(3):
_eject()
@@ -140,19 +140,19 @@
try:
if file_system == "fat32":
- yalisys.mount(partition_path, m_dir, "vfat")
+ mount(partition_path, m_dir, "vfat")
else:
- yalisys.mount(partition_path, m_dir, file_system)
+ 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"):
- yalisys.umount(m_dir)
+ umount(m_dir)
return True
else:
- yalisys.umount(m_dir)
+ umount(m_dir)
return False
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi