[Uludag-commits] r16250 - in branches/yali4: . po tools yali4

uludag-commits at pardus.org.tr uludag-commits at pardus.org.tr
5 Ara 2007 Çar 16:19:31 EET


Author: gokmen.goksel
Date: Wed Dec  5 16:19:30 2007
New Revision: 16250

Added:
   branches/yali4/po/yali4.pot
      - copied unchanged from r16246, branches/yali4/po/yali.pot
Removed:
   branches/yali4/po/yali.pot
Modified:
   branches/yali4/MANIFEST.in
   branches/yali4/README
   branches/yali4/README-TRANSLATORS
   branches/yali4/setup.py
   branches/yali4/tools/show_screen.py
   branches/yali4/tools/update-po.sh
   branches/yali4/yali4/bootloader.py
   branches/yali4/yali4/constants.py
   branches/yali4/yali4/filesystem.py
   branches/yali4/yali4/fstab.py
   branches/yali4/yali4/kahya.py
   branches/yali4/yali4/localedata.py
   branches/yali4/yali4/localeutils.py
   branches/yali4/yali4/partition.py
   branches/yali4/yali4/partitionrequest.py
   branches/yali4/yali4/partitiontype.py
   branches/yali4/yali4/pisiiface.py
   branches/yali4/yali4/postinstall.py
   branches/yali4/yali4/steps.py
   branches/yali4/yali4/storage.py
   branches/yali4/yali4/sysutils.py
   branches/yali4/yali4/users.py
Log:
Another like an arm commit..

Modified: branches/yali4/MANIFEST.in
=================================================================
--- branches/yali4/MANIFEST.in	(original)
+++ branches/yali4/MANIFEST.in	Wed Dec  5 16:19:30 2007
@@ -1,7 +1,7 @@
 recursive-include po *
-recursive-include yali/user_faces *
-recursive-include yali/gui/pics *
-recursive-include yali/gui/slideshow *
-recursive-include yali/gui *.ui
+recursive-include yali4/user_faces *
+recursive-include yali4/gui/pics *
+recursive-include yali4/gui/slideshow *
+recursive-include yali4/gui *.ui
 include . AUTHORS COPYING
 

Modified: branches/yali4/README
=================================================================
--- branches/yali4/README	(original)
+++ branches/yali4/README	Wed Dec  5 16:19:30 2007
@@ -1,3 +1,6 @@
+This is a development version of YALI which is porting to Qt4, one can
+use current YALI (Qt3) from uludag/trunk/yali in svn.
+
 YALI is Yet Another Linux Installer. It is the installer that sets up
 the system by installing packages from the installation media (eg. CD,
 network, Internet) and carrying out the basic configuration. YALI is

Modified: branches/yali4/README-TRANSLATORS
=================================================================
--- branches/yali4/README-TRANSLATORS	(original)
+++ branches/yali4/README-TRANSLATORS	Wed Dec  5 16:19:30 2007
@@ -9,9 +9,9 @@
 
 2. Checkout the latest code of YALI from SVN:
 
-svn co https://svn.pardus.org.tr/uludag/trunk/yali/
+svn co https://svn.pardus.org.tr/uludag/branches/yali4/
 
-3. Go to the top directory (i.e cd yali)
+3. Go to the top directory (i.e cd yali4)
 4. Execute the following:
 
 python tools/show_screen.py [MODULENAME]

Modified: branches/yali4/setup.py
=================================================================
--- branches/yali4/setup.py	(original)
+++ branches/yali4/setup.py	Wed Dec  5 16:19:30 2007
@@ -139,7 +139,7 @@
             print "removing: ", data_dir
             shutil.rmtree(data_dir)
 
-i18n_domain = "yali"
+i18n_domain = "yali4"
 i18n_languages = ["tr",
                   "nl",
                   "it",

Modified: branches/yali4/tools/show_screen.py
=================================================================
--- branches/yali4/tools/show_screen.py	(original)
+++ branches/yali4/tools/show_screen.py	Wed Dec  5 16:19:30 2007
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
 import sys
-sys.path.append("./yali/gui")
-sys.path.append("../yali/gui")
+sys.path.append("./yali4/gui")
+sys.path.append("../yali4/gui")
 from qt import *
 
 

Modified: branches/yali4/tools/update-po.sh
=================================================================
--- branches/yali4/tools/update-po.sh	(original)
+++ branches/yali4/tools/update-po.sh	Wed Dec  5 16:19:30 2007
@@ -4,9 +4,9 @@
 
 set -x
 
-xgettext -L "python" -k__tr -k_ yali/gui/Ui/*.py yali/gui/*.py yali/*.py -o po/yali.pot
+xgettext -L "python" -k__tr -k_ yali4/gui/Ui/*.py yali4/gui/*.py yali4/*.py -o po/yali4.pot
 for lang in $LANGUAGES
 do
-    msgmerge -U $lang po/yali.pot
+    msgmerge -U $lang po/yali4.pot
 done
 

Modified: branches/yali4/yali4/bootloader.py
=================================================================
--- branches/yali4/yali4/bootloader.py	(original)
+++ branches/yali4/yali4/bootloader.py	Wed Dec  5 16:19:30 2007
@@ -14,16 +14,16 @@
 import glob
 
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
-from yali.exception import *
-from yali.constants import consts
-import yali.sysutils
-import yali.partitiontype as parttype
-import yali.partitionrequest as request
-from yali.partitionrequest import partrequests
-import yali.gui.context as ctx
+from yali4.exception import *
+from yali4.constants import consts
+import yali4.sysutils
+import yali4.partitiontype as parttype
+import yali4.partitionrequest as request
+from yali4.partitionrequest import partrequests
+import yali4.gui.context as ctx
 
 grub_conf_tmp = """\
 default 0
@@ -185,7 +185,7 @@
         if not grub_install_root.startswith("/dev/"):
             grub_install_root = "/dev/%s" % grub_install_root
 
-        cmd = "%s --root-directory=%s %s" % (yali.sysutils.find_executable("grub-install"),
+        cmd = "%s --root-directory=%s %s" % (yali4.sysutils.find_executable("grub-install"),
                                              consts.target_dir,
                                              grub_install_root)
         if os.system(cmd) != 0:

Modified: branches/yali4/yali4/constants.py
=================================================================
--- branches/yali4/yali4/constants.py	(original)
+++ branches/yali4/yali4/constants.py	Wed Dec  5 16:19:30 2007
@@ -50,7 +50,7 @@
 
 consts.pardus_version = file("/etc/pardus-release").readlines()[0].strip()
 
-consts.data_dir = "/usr/share/yali"
+consts.data_dir = "/usr/share/yali4"
 
 consts.mnt_dir = "/mnt"
 

Modified: branches/yali4/yali4/filesystem.py
=================================================================
--- branches/yali4/yali4/filesystem.py	(original)
+++ branches/yali4/yali4/filesystem.py	Wed Dec  5 16:19:30 2007
@@ -22,10 +22,10 @@
 import parted
 import math
 
-from yali.exception import *
-import yali.sysutils as sysutils
-import yali.parteddata as parteddata
-import yali.storage
+from yali4.exception import *
+import yali4.sysutils as sysutils
+import yali4.parteddata as parteddata
+import yali4.storage
 
 class FSError(YaliError):
     pass
@@ -104,10 +104,10 @@
     ##
     # check label for existence.
     def labelExists(self, label):
-        if not yali.storage.devices:
-            yali.storage.init_devices()
+        if not yali4.storage.devices:
+            yali4.storage.init_devices()
 
-        for dev in yali.storage.devices:
+        for dev in yali4.storage.devices:
             for part in dev.getPartitions():
                 if label == part.getFSLabel():
                     return True

Modified: branches/yali4/yali4/fstab.py
=================================================================
--- branches/yali4/yali4/fstab.py	(original)
+++ branches/yali4/yali4/fstab.py	Wed Dec  5 16:19:30 2007
@@ -12,7 +12,7 @@
 
 from os.path import join
 
-from yali.constants import consts
+from yali4.constants import consts
 
 class FstabEntry:
     def __init__(self, dev, mp, fs, opts, d="0", p="0"):

Modified: branches/yali4/yali4/kahya.py
=================================================================
--- branches/yali4/yali4/kahya.py	(original)
+++ branches/yali4/yali4/kahya.py	Wed Dec  5 16:19:30 2007
@@ -3,9 +3,9 @@
 
 import re
 import sys
-import yali.yalireadpiks as yaliReadPiks
-from yali.localedata import *
-from yali.users import *
+import yali4.yalireadpiks as yaliReadPiks
+from yali4.localedata import *
+from yali4.users import *
 
 class userErrors:
     def __init__(self):

Modified: branches/yali4/yali4/localedata.py
=================================================================
--- branches/yali4/yali4/localedata.py	(original)
+++ branches/yali4/yali4/localedata.py	Wed Dec  5 16:19:30 2007
@@ -11,7 +11,7 @@
 #
 
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
 

Modified: branches/yali4/yali4/localeutils.py
=================================================================
--- branches/yali4/yali4/localeutils.py	(original)
+++ branches/yali4/yali4/localeutils.py	Wed Dec  5 16:19:30 2007
@@ -12,18 +12,18 @@
 
 import os
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
-import yali.localedata
-from yali.constants import consts
+import yali4.localedata
+from yali4.constants import consts
 
 def write_locale_from_cmdline():
     locale_file_path = os.path.join(consts.target_dir, "etc/env.d/03locale")
     f = open(locale_file_path, "w")
 
-    f.write("LANG=%s\n" % yali.localedata.locales[consts.lang]["locale"])
-    f.write("LC_ALL=%s\n" % yali.localedata.locales[consts.lang]["locale"])
+    f.write("LANG=%s\n" % yali4.localedata.locales[consts.lang]["locale"])
+    f.write("LC_ALL=%s\n" % yali4.localedata.locales[consts.lang]["locale"])
 
 def set_keymap(keymap):
     os.system("setxkbmap -layout %s" % keymap)

Modified: branches/yali4/yali4/partition.py
=================================================================
--- branches/yali4/yali4/partition.py	(original)
+++ branches/yali4/yali4/partition.py	Wed Dec  5 16:19:30 2007
@@ -13,12 +13,12 @@
 import os
 
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
 import parted
-import yali.parteddata as parteddata
-import yali.filesystem
+import yali4.parteddata as parteddata
+import yali4.filesystem
 
 
 ##
@@ -44,7 +44,7 @@
         return self._fs_ready
 
     def setFileSystemType(self, fs_type):
-        if isinstance(fs_type, yali.filesystem.FileSystem):
+        if isinstance(fs_type, yali4.filesystem.FileSystem):
             fs_type = fs_type.getFSType()
 
         self._partition.set_system(fs_type)
@@ -129,7 +129,7 @@
         return self._fsname
 
     def getFSLabel(self):
-        fs = yali.filesystem.get_filesystem(self.getFSName())
+        fs = yali4.filesystem.get_filesystem(self.getFSName())
         try:
             return fs.getLabel(self)
         except AttributeError, e:

Modified: branches/yali4/yali4/partitionrequest.py
=================================================================
--- branches/yali4/yali4/partitionrequest.py	(original)
+++ branches/yali4/yali4/partitionrequest.py	Wed Dec  5 16:19:30 2007
@@ -14,10 +14,10 @@
 
 import os
 
-from yali.exception import *
-from yali.constants import consts
-import yali.partitiontype as parttype
-import yali.sysutils
+from yali4.exception import *
+from yali4.constants import consts
+import yali4.partitiontype as parttype
+import yali4.sysutils
 
 class RequestException(YaliException):
     pass
@@ -43,8 +43,8 @@
             r.applyRequest()
 
         # we need to trigger udev for our new labels
-        yali.sysutils.run("/sbin/udevtrigger")
-        yali.sysutils.run("/sbin/udevsettle", "--timeout=180")
+        yali4.sysutils.run("/sbin/udevtrigger")
+        yali4.sysutils.run("/sbin/udevsettle", "--timeout=180")
 
 
         # then mount request
@@ -327,7 +327,7 @@
         if not os.path.isdir(target):
             os.mkdir(target)
 
-        yali.sysutils.mount(source, target, filesystem)
+        yali4.sysutils.mount(source, target, filesystem)
         
         mtab_entry = "%s %s %s rw 0 0\n" % (source,
                                             target,
@@ -355,10 +355,10 @@
     def applyRequest(self):
 
         # see #832
-        if yali.sysutils.mem_total() > 512:
-            yali.sysutils.swap_as_file(consts.swap_file_path, 300)
+        if yali4.sysutils.mem_total() > 512:
+            yali4.sysutils.swap_as_file(consts.swap_file_path, 300)
         else:
-            yali.sysutils.swap_as_file(consts.swap_file_path, 600)
+            yali4.sysutils.swap_as_file(consts.swap_file_path, 600)
         
         PartRequest.applyRequest(self)
 

Modified: branches/yali4/yali4/partitiontype.py
=================================================================
--- branches/yali4/yali4/partitiontype.py	(original)
+++ branches/yali4/yali4/partitiontype.py	Wed Dec  5 16:19:30 2007
@@ -15,10 +15,10 @@
 import parted
 
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
-import yali.filesystem
+import yali4.filesystem
 
 class PartitionType:
 
@@ -38,11 +38,11 @@
         # check cmdline for reiserfs support
         cmdline = open("/proc/cmdline", "r").read()
         if cmdline.find("enable_reiserfs") >= 0:
-            self.filesystem = yali.filesystem.ReiserFileSystem()
+            self.filesystem = yali4.filesystem.ReiserFileSystem()
         elif cmdline.find("enable_xfs") >= 0:
-            self.filesystem = yali.filesystem.XFSFileSystem()
+            self.filesystem = yali4.filesystem.XFSFileSystem()
         else:
-            self.filesystem = yali.filesystem.Ext3FileSystem()
+            self.filesystem = yali4.filesystem.Ext3FileSystem()
 
 
 class RootPartitionType(__PartitionType):
@@ -65,7 +65,7 @@
 
 class SwapPartitionType(PartitionType):
     name = _("Swap")
-    filesystem = yali.filesystem.SwapFileSystem()
+    filesystem = yali4.filesystem.SwapFileSystem()
     mountpoint = None
     mountoptions = "sw"
     parted_type = parted.PARTITION_PRIMARY

Modified: branches/yali4/yali4/pisiiface.py
=================================================================
--- branches/yali4/yali4/pisiiface.py	(original)
+++ branches/yali4/yali4/pisiiface.py	Wed Dec  5 16:19:30 2007
@@ -22,8 +22,8 @@
 import pisi.util
 import pisi.context as ctx
 
-import yali.postinstall
-from yali.constants import consts
+import yali4.postinstall
+from yali4.constants import consts
 
 def initialize(ui, with_comar=False):
 

Modified: branches/yali4/yali4/postinstall.py
=================================================================
--- branches/yali4/yali4/postinstall.py	(original)
+++ branches/yali4/yali4/postinstall.py	Wed Dec  5 16:19:30 2007
@@ -14,7 +14,7 @@
 import shutil
 import grp
 
-from yali.constants import consts
+from yali4.constants import consts
 
 # necessary things after a full install
 

Modified: branches/yali4/yali4/steps.py
=================================================================
--- branches/yali4/yali4/steps.py	(original)
+++ branches/yali4/yali4/steps.py	Wed Dec  5 16:19:30 2007
@@ -17,7 +17,7 @@
 # 'preparation before install', 'system installation' and 'basic
 # setup'. Each stage can have different number of screens though...
 
-from yali.exception import YaliError, YaliException
+from yali4.exception import YaliError, YaliException
 
 class Steps:
 

Modified: branches/yali4/yali4/storage.py
=================================================================
--- branches/yali4/yali4/storage.py	(original)
+++ branches/yali4/yali4/storage.py	Wed Dec  5 16:19:30 2007
@@ -26,11 +26,11 @@
 import struct
 import binascii
 
-from yali.parteddata import *
-from yali.partition import Partition, FreeSpace
-from yali.exception import YaliError, YaliException
-import yali.sysutils as sysutils
-import yali.filesystem
+from yali4.parteddata import *
+from yali4.partition import Partition, FreeSpace
+from yali4.exception import YaliError, YaliException
+import yali4.sysutils as sysutils
+import yali4.filesystem
 
 class DeviceError(YaliError):
     pass
@@ -344,9 +344,9 @@
 
         if isinstance(fs, str):
             # a string... get the corresponding FileSystem object
-            fs = yali.filesystem.get_filesystem(fs)
+            fs = yali4.filesystem.get_filesystem(fs)
 
-        if isinstance(fs, yali.filesystem.FileSystem):
+        if isinstance(fs, yali4.filesystem.FileSystem):
             fs = fs.getFSType()
         else:
             fs = None
@@ -420,9 +420,9 @@
 
         if isinstance(fs, str):
             # a string... get the corresponding FileSystem object
-            fs = yali.filesystem.get_filesystem(fs)
+            fs = yali4.filesystem.get_filesystem(fs)
 
-        if not isinstance(fs, yali.filesystem.FileSystem):
+        if not isinstance(fs, yali4.filesystem.FileSystem):
             raise DeviceError, "filesystem is None, can't resize"
 
         print dir(fs)

Modified: branches/yali4/yali4/sysutils.py
=================================================================
--- branches/yali4/yali4/sysutils.py	(original)
+++ branches/yali4/yali4/sysutils.py	Wed Dec  5 16:19:30 2007
@@ -18,8 +18,8 @@
 from pardus.sysutils import find_executable
 from pardus.procutils import run
 
-from yali._sysutils import *
-from yali.constants import consts
+from yali4._sysutils import *
+from yali4.constants import consts
 
 ##
 # run comar daemon in chroot

Modified: branches/yali4/yali4/users.py
=================================================================
--- branches/yali4/yali4/users.py	(original)
+++ branches/yali4/yali4/users.py	Wed Dec  5 16:19:30 2007
@@ -18,7 +18,7 @@
 import os
 
 from string import ascii_letters, digits
-from yali.constants import consts
+from yali4.constants import consts
 
 # a set of User instances waiting...
 # we'll add these users at the last step of the installation.


Uludag-commits mesaj listesiyle ilgili daha fazla bilgi