From uludag-commits at pardus.org.tr Tue Apr 1 10:11:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 10:11:00 +0300 (EEST) Subject: [Uludag-commits] r17531 - trunk/comar/mudur/bin Message-ID: <20080401071100.6A94B7C0050@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 10:11:00 2008 New Revision: 17531 Modified: trunk/comar/mudur/bin/mudur.py Log: * Trigger udev events before local.start * Trigger all udev events if requested Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Tue Apr 1 10:11:00 2008 @@ -682,6 +682,11 @@ curkernel = os.uname()[2] if depkernel != curkernel: run_quiet("sbin/depmod", "-a") + touch("/etc/udevtrigger.mudur") + else: + run_quiet("sbin/depmod", "-a") + touch("/etc/modprobe.mudur") + touch("/etc/udevtrigger.mudur") fn = "/etc/modules.autoload.d/kernel-%s.%s.%s" % (config.kernel[0], config.kernel[1], config.kernel[2]) if not os.path.exists(fn): @@ -1051,13 +1056,19 @@ remoteMount(old_handler) elif sys.argv[1] == "default": + if os.path.exists("/etc/udevtrigger.mudur"): + ui.info(_("Triggering udev events")) + # Trigger all udev events. + run("/sbin/udevtrigger") + os.unlink("/etc/udevtrigger.mudur") + else: + ui.info(_("Triggering udev events which are failed during a previous run")) + # Trigger only the events which are failed during a previous run. + run("/sbin/udevadm", "trigger", "--retry-failed") + if not config.get("safe") and os.path.exists("/etc/conf.d/local.start"): run("/bin/bash", "/etc/conf.d/local.start") - ui.info(_("Triggering udev events which are failed during a previous run")) - # Trigger only the events which are failed during a previous run. - run("/sbin/udevadm", "trigger", "--retry-failed") - startServices() elif sys.argv[1] == "single": From uludag-commits at pardus.org.tr Tue Apr 1 10:11:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 10:11:38 +0300 (EEST) Subject: [Uludag-commits] r17532 - trunk/comar/mudur Message-ID: <20080401071138.B2C907C0050@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 10:11:38 2008 New Revision: 17532 Modified: trunk/comar/mudur/setup.py Log: alpha 4 Modified: trunk/comar/mudur/setup.py ================================================================= --- trunk/comar/mudur/setup.py (original) +++ trunk/comar/mudur/setup.py Tue Apr 1 10:11:38 2008 @@ -15,7 +15,7 @@ import shutil import parser -version = "2.0_alpha3" +version = "2.0_alpha4" distfiles = """ setup.py From uludag-commits at pardus.org.tr Tue Apr 1 10:39:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 10:39:23 +0300 (EEST) Subject: [Uludag-commits] r17533 - trunk/baselayout/etc Message-ID: <20080401073923.4DD1B7C009C@liste.uludag.org.tr> Author: eki Date: Tue Apr 1 10:39:23 2008 New Revision: 17533 Modified: trunk/baselayout/etc/group trunk/baselayout/etc/passwd trunk/baselayout/etc/shadow Log: add dbus user and group, YALI needs this to install Modified: trunk/baselayout/etc/group ================================================================= --- trunk/baselayout/etc/group (original) +++ trunk/baselayout/etc/group Tue Apr 1 10:39:23 2008 @@ -20,5 +20,6 @@ at::25:at tape::26:root video::27:root +dbus:x:101:dbus nogroup::65533: nobody::65534: Modified: trunk/baselayout/etc/passwd ================================================================= --- trunk/baselayout/etc/passwd (original) +++ trunk/baselayout/etc/passwd Tue Apr 1 10:39:23 2008 @@ -14,4 +14,5 @@ ftp:x:21:21::/home/ftp:/bin/false sshd:x:22:22:sshd:/dev/null:/bin/false at:x:25:25:at:/var/spool/cron/atjobs:/bin/false +dbus:x:101:101:D-BUS:/dev/null:/bin/false nobody:x:65534:65534:nobody:/:/bin/false Modified: trunk/baselayout/etc/shadow ================================================================= --- trunk/baselayout/etc/shadow (original) +++ trunk/baselayout/etc/shadow Tue Apr 1 10:39:23 2008 @@ -12,5 +12,6 @@ news:*:9797:0::::: man:*:9797:0::::: games:*:9797:0::::: +dbus:*:9797:0::::: guest:*:9797:0::::: nobody:*:9797:0::::: From uludag-commits at pardus.org.tr Tue Apr 1 11:52:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 11:52:20 +0300 (EEST) Subject: [Uludag-commits] r17534 - trunk/baselayout/etc Message-ID: <20080401085220.3932486454A@liste.uludag.org.tr> Author: caglar Date: Tue Apr 1 11:52:19 2008 New Revision: 17534 Modified: trunk/baselayout/etc/passwd Log: ... Modified: trunk/baselayout/etc/passwd ================================================================= --- trunk/baselayout/etc/passwd (original) +++ trunk/baselayout/etc/passwd Tue Apr 1 11:52:19 2008 @@ -14,5 +14,5 @@ ftp:x:21:21::/home/ftp:/bin/false sshd:x:22:22:sshd:/dev/null:/bin/false at:x:25:25:at:/var/spool/cron/atjobs:/bin/false -dbus:x:101:101:D-BUS:/dev/null:/bin/false +dbus:x:101:101:D-Bus:/dev/null:/bin/false nobody:x:65534:65534:nobody:/:/bin/false From uludag-commits at pardus.org.tr Tue Apr 1 14:05:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 14:05:58 +0300 (EEST) Subject: [Uludag-commits] r17535 - branches/ahenk-1.0/lider/src Message-ID: <20080401110558.B9C608640B4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 14:05:58 2008 New Revision: 17535 Modified: branches/ahenk-1.0/lider/src/ldapmodel.py Log: description field for users and groups Modified: branches/ahenk-1.0/lider/src/ldapmodel.py ================================================================= --- branches/ahenk-1.0/lider/src/ldapmodel.py (original) +++ branches/ahenk-1.0/lider/src/ldapmodel.py Tue Apr 1 14:05:58 2008 @@ -88,6 +88,7 @@ ("home", "homeDirectory", str, i18n("Home"), ldapview.textWidget, "*", {"multi": False, "required": True}), ("uid", "uidNumber", int, i18n("User ID"), ldapview.numberWidget, "*", {"multi": False}), ("gid", "gidNumber", int, i18n("Group ID"), ldapview.numberWidget, "*", {"multi": False}), + ("description", "description", str, i18n("Description"), ldapview.textWidget, "*", {}), ) class GroupModel(ldaputil.LdapClass): @@ -97,4 +98,5 @@ entries = ( ("gid", "gidNumber", int, i18n("Group ID"), ldapview.numberWidget, "*", {"multi": False, "required": True}), ("members", "memberUid", list, i18n("Members"), ldapview.listWidget, "*", {"items": [i18n("Username")]}), + ("description", "description", str, i18n("Description"), ldapview.textWidget, "*", {}), ) From uludag-commits at pardus.org.tr Tue Apr 1 14:17:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 14:17:11 +0300 (EEST) Subject: [Uludag-commits] r17536 - in branches/tasma-dbus/firewall-config: . src Message-ID: <20080401111711.626498644D4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 14:17:11 2008 New Revision: 17536 Added: branches/tasma-dbus/firewall-config/src/handler.py Modified: branches/tasma-dbus/firewall-config/setup.py Log: add handler.py Modified: branches/tasma-dbus/firewall-config/setup.py ================================================================= --- branches/tasma-dbus/firewall-config/setup.py (original) +++ branches/tasma-dbus/firewall-config/setup.py Tue Apr 1 14:17:11 2008 @@ -63,7 +63,7 @@ min_kde_version = "3.5.0", min_qt_version = "3.3.5", license = "GPL", - application_data = ["src/firewall.ui", "src/dialog.ui", "src/firewall-config.py", "src/rules.py", + application_data = ["src/firewall.ui", "src/dialog.ui", "src/firewall-config.py", "src/rules.py", "src/handler.py", ("/usr/kde/3.5/share/icons/hicolor/128x128/apps", ["src/firewall_config.png"]), ("/var/lib/iptables", ["profiles/pardus"]), ], From uludag-commits at pardus.org.tr Tue Apr 1 15:17:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 15:17:11 +0300 (EEST) Subject: [Uludag-commits] r17537 - trunk/comar/mudur/bin Message-ID: <20080401121711.94F767C00D6@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 15:17:11 2008 New Revision: 17537 Modified: trunk/comar/mudur/bin/service.py Log: User friendly error messages Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Tue Apr 1 15:17:11 2008 @@ -280,10 +280,11 @@ elif args[1] in operations and args[0] == "dbus": manage_dbus(args[1], use_color, quiet) - elif args[1] in operations: - manage_service(args[0], args[1], use_color, quiet) - + try: + manage_service(args[0], args[1], use_color, quiet) + except dbus.DBusException, e: + print e.args[0] else: usage() From uludag-commits at pardus.org.tr Tue Apr 1 15:28:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 15:28:45 +0300 (EEST) Subject: [Uludag-commits] r17538 - in branches/yali4/yali4: . gui gui/Ui gui/pics Message-ID: <20080401122845.6F4117C00DB@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Apr 1 15:28:45 2008 New Revision: 17538 Added: branches/yali4/yali4/gui/pics/backardus.png (contents, props changed) Modified: branches/yali4/yali4/data.qrc branches/yali4/yali4/gui/ScrInstall.py branches/yali4/yali4/gui/Ui/main.ui branches/yali4/yali4/gui/pics/welcome.png branches/yali4/yali4/gui/runner.py branches/yali4/yali4/pisiiface.py Log: * Go on 2008 Modified: branches/yali4/yali4/data.qrc ================================================================= --- branches/yali4/yali4/data.qrc (original) +++ branches/yali4/yali4/data.qrc Tue Apr 1 15:28:45 2008 @@ -2,6 +2,7 @@ gui/pics/admin.png gui/pics/background.png + gui/pics/backardus.png gui/pics/background2.png gui/pics/background3.jpg gui/pics/backgroundtile.png Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Tue Apr 1 15:28:45 2008 @@ -145,7 +145,6 @@ def packageInstallFinished(self): - yali4.pisiiface.finalize() self.cur = 0 # fill fstab @@ -200,8 +199,6 @@ if self.hasErrors: return - yali4.pisiiface.finalize() - # trigger next screen. will activate execute() ctx.mainScreen.slotNext() @@ -296,7 +293,6 @@ # Remove cd repository and install add real yali4.pisiiface.switch_to_pardus_repo() - yali4.pisiiface.finalize() qevent = PisiEvent(QEvent.User, EventAllFinished) QCoreApplication.postEvent(self._widget, qevent) Modified: branches/yali4/yali4/gui/Ui/main.ui ================================================================= --- branches/yali4/yali4/gui/Ui/main.ui (original) +++ branches/yali4/yali4/gui/Ui/main.ui Tue Apr 1 15:28:45 2008 @@ -14,7 +14,7 @@ #YaliMain { - background-image:url(':/gui/pics/background.png') + background-image:url(':/gui/pics/backardus.png') } QStackedWidget#mainStack { Modified: branches/yali4/yali4/gui/pics/welcome.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Tue Apr 1 15:28:45 2008 @@ -124,6 +124,8 @@ w = ErrorWidget(tb) else: w = ExceptionWidget(tb) + + print "BACKTRACE: ",tb d = Dialog(title, w, None) d.resize(500,400) d.exec_() Modified: branches/yali4/yali4/pisiiface.py ================================================================= --- branches/yali4/yali4/pisiiface.py (original) +++ branches/yali4/yali4/pisiiface.py Tue Apr 1 15:28:45 2008 @@ -20,23 +20,25 @@ import yali4.postinstall from yali4.constants import consts +repodb = pisi.db.repodb.RepoDB() + def initialize(ui, with_comar=False): options = pisi.config.Options() options.destdir = consts.target_dir options.yes_all = True - # giving "comar = false" isn't enough for pisi - if with_comar: - # wait for chroot_dbus to initialize - # generally we don't need this but I think this is safer - for i in range(20): - try: - bus = dbus.SystemBus() - break - except dbus.DBusException: - time.sleep(1) - pisi.api.pisi.api.set_dbus_sockname("%s/var/run/dbus/system_bus_socket" % options.destdir) - else: - options.ignore_comar = True + # wait for chroot_dbus to initialize + # generally we don't need this but I think this is safer + for i in range(20): + try: + bus = dbus.SystemBus() + break + except dbus.DBusException: + time.sleep(1) + pisi.api.set_dbus_sockname("%s/var/run/dbus/system_bus_socket" % options.destdir) + pisi.api.set_userinterface(ui) + pisi.api.set_options(options) + pisi.api.set_comar(with_comar) + pisi.api.set_signalhandling(False) def add_repo(name, uri): pisi.api.add_repo(name, uri) @@ -44,12 +46,12 @@ def add_cd_repo(): cd_repo_name = consts.cd_repo_name cd_repo_uri = consts.cd_repo_uri - if not pisi.context.repodb.has_repo(cd_repo_name): + if not repodb.has_repo(cd_repo_name): add_repo(cd_repo_name, cd_repo_uri) update_repo(cd_repo_name) def add_remote_repo(name, uri): - if not pisi.context.repodb.has_repo(name): + if not repodb.has_repo(name): add_repo(name, uri) update_repo(name) @@ -68,7 +70,7 @@ pisi.api.remove_repo(name) def finalize(): - pisi.api.finalize() + pass def install(pkg_name_list): pisi.api.install(pkg_name_list) @@ -77,15 +79,13 @@ install(get_available()) def get_available(): - l = pisi.context.packagedb.list_packages() - return l + return pisi.api.list_available() def get_available_len(): return len(get_available()) def get_pending(): - l = pisi.context.installdb.list_pending() - return l + return pisi.db.installdb.InstallDB().list_pending() def get_pending_len(): return len(get_pending()) @@ -99,7 +99,7 @@ def check_package_hash(pkg_name): repo_path = os.path.dirname(consts.cd_repo_uri) - pkg = pisi.context.packagedb.get_package(pkg_name) + pkg = pisi.db.packagedb.PackageDB().get_package(pkg_name) file_name = pisi.util.package_name(pkg.name, pkg.version, pkg.release, From uludag-commits at pardus.org.tr Tue Apr 1 15:36:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 15:36:39 +0300 (EEST) Subject: [Uludag-commits] r17539 - trunk/pisi/pisi Message-ID: <20080401123639.D53DA864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 15:36:39 2008 New Revision: 17539 Modified: trunk/pisi/pisi/api.py Log: Add search_installed Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Tue Apr 1 15:36:39 2008 @@ -227,6 +227,16 @@ packagedb = pisi.db.packagedb.PackageDB() return packagedb.search_package(terms, lang, repo) +def search_installed(terms, lang=None): + """ + Return a list of components that contains all the given terms either in its name, summary or + description -> list_of_strings + @param terms: a list of terms used to search components -> list_of_strings + @param lang: language of the summary and description + """ + installdb = pisi.db.installdb.InstallDB() + return installdb.search_package(terms, lang) + def search_source(terms, lang=None, repo=None): """ Return a list of source packages that contains all the given terms either in its name, summary or From uludag-commits at pardus.org.tr Tue Apr 1 15:36:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 15:36:52 +0300 (EEST) Subject: [Uludag-commits] r17540 - trunk/pisi/pisi Message-ID: <20080401123652.ECB7A864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 15:36:52 2008 New Revision: 17540 Modified: trunk/pisi/pisi/api.py Log: Used by YALI Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Tue Apr 1 15:36:52 2008 @@ -81,6 +81,18 @@ """ ctx.comar_sockname = sockname +def set_signal_handling(enable): + """ + Enable signal handling. Signal handling in pisi mostly used for disabling keyboard interrupts + in critical paths. + Used by YALI + @param enable: Flag indicating signal handling usage + """ + if enable: + ctx.sig = pisi.signalhandler.SignalHandler() + else: + ctx.sig = None + def set_options(options): """ Set various options of pisi From uludag-commits at pardus.org.tr Tue Apr 1 15:37:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 15:37:28 +0300 (EEST) Subject: [Uludag-commits] r17541 - trunk/pisi/pisi Message-ID: <20080401123728.C1CE2864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 15:37:28 2008 New Revision: 17541 Modified: trunk/pisi/pisi/ui.py Log: Default ui should confirm everything for easy usage of pisi (without a need to create own subclass of ui) > import pisi > pisi.api.install(["amsn"]) or else this returns False. Modified: trunk/pisi/pisi/ui.py ================================================================= --- trunk/pisi/pisi/ui.py (original) +++ trunk/pisi/pisi/ui.py Tue Apr 1 15:37:28 2008 @@ -72,7 +72,8 @@ def confirm(self, msg): "ask a yes/no question" - pass + # default ui confirms everything + return True def display_progress(self, **ka): "display progress" From uludag-commits at pardus.org.tr Tue Apr 1 16:05:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:05:29 +0300 (EEST) Subject: [Uludag-commits] r17542 - in trunk/pisi/pisi: . pxml Message-ID: <20080401130529.E6F418649F9@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 16:05:29 2008 New Revision: 17542 Modified: trunk/pisi/pisi/index.py trunk/pisi/pisi/pxml/xmlfile.py Log: Another try to fix: http://liste.pardus.org.tr/gelistirici/2008-February/011133.html Because YALI could not decompress index file to a read-only file system. Modified: trunk/pisi/pisi/index.py ================================================================= --- trunk/pisi/pisi/index.py (original) +++ trunk/pisi/pisi/index.py Tue Apr 1 16:05:29 2008 @@ -48,14 +48,6 @@ return self.distribution.name + self.distribution.repositoryname def read_uri(self, uri, tmpdir, force = False): - # A workaround for the side effect of commit revision 17027 - # Someone should nuke pisi.file.File into pieces - fileuri = pisi.file.File.make_uri(uri) - if fileuri.is_local_file(): - pisi.file.File.download(fileuri, tmpdir, not force, pisi.file.File.auto, pisi.file.File.detached, True) - uri = pisi.file.File.decompress(uri, pisi.file.File.auto) - ## - self.read(uri, tmpDir=tmpdir, sha1sum=not force, compress=pisi.file.File.auto, sign=pisi.file.File.detached, copylocal = True, nodecode = True) Modified: trunk/pisi/pisi/pxml/xmlfile.py ================================================================= --- trunk/pisi/pisi/pxml/xmlfile.py (original) +++ trunk/pisi/pisi/pxml/xmlfile.py Tue Apr 1 16:05:29 2008 @@ -65,9 +65,12 @@ def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None, copylocal = False): + # workaround for repo index files to fix + # rev. 17027 regression (http://liste.pardus.org.tr/gelistirici/2008-February/011133.html) + compressed = uri.endswith(".bz2") or uri.endswith(".gz") uri = pisi.file.File.make_uri(uri) - if uri.is_local_file(): + if uri.is_local_file() and not compressed: # this is a local file localpath = uri.path() else: From uludag-commits at pardus.org.tr Tue Apr 1 16:14:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:14:31 +0300 (EEST) Subject: [Uludag-commits] r17543 - trunk/comar/mudur/bin Message-ID: <20080401131431.3681B864990@liste.uludag.org.tr> Author: eki Date: Tue Apr 1 16:14:30 2008 New Revision: 17543 Modified: trunk/comar/mudur/bin/update-fstab.py Log: fix for new parted Modified: trunk/comar/mudur/bin/update-fstab.py ================================================================= --- trunk/comar/mudur/bin/update-fstab.py (original) +++ trunk/comar/mudur/bin/update-fstab.py Tue Apr 1 16:14:30 2008 @@ -56,7 +56,7 @@ part = disk.next_partition() while part: - if part.fs_type and part.fs_type.name != "linux-swap(new)": + if part.fs_type and part.fs_type.name != "linux-swap": yield dev + str(part.num), part.fs_type.name part = disk.next_partition(part) From uludag-commits at pardus.org.tr Tue Apr 1 16:16:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:16:17 +0300 (EEST) Subject: [Uludag-commits] r17544 - in branches/pisi-devel: . licenses pisi pisi/pxml Message-ID: <20080401131617.B82CF864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 16:16:17 2008 New Revision: 17544 Added: branches/pisi-devel/licenses/IDPL-1 - copied unchanged from r17543, trunk/pisi/licenses/IDPL-1 Modified: branches/pisi-devel/pisi-spec.rng branches/pisi-devel/pisi/api.py branches/pisi-devel/pisi/index.py branches/pisi-devel/pisi/pxml/xmlfile.py branches/pisi-devel/pisi/ui.py Log: Merge with trunk Modified: branches/pisi-devel/pisi-spec.rng ================================================================= --- branches/pisi-devel/pisi-spec.rng (original) +++ branches/pisi-devel/pisi-spec.rng Tue Apr 1 16:16:17 2008 @@ -304,6 +304,7 @@ IBM-J1.5 IBM-J1.6 ICE + IDPL-1 IPL-1 IRPDL ISC Modified: branches/pisi-devel/pisi/api.py ================================================================= --- branches/pisi-devel/pisi/api.py (original) +++ branches/pisi-devel/pisi/api.py Tue Apr 1 16:16:17 2008 @@ -88,6 +88,18 @@ """ ctx.dbus_sockname = sockname +def set_signal_handling(enable): + """ + Enable signal handling. Signal handling in pisi mostly used for disabling keyboard interrupts + in critical paths. + Used by YALI + @param enable: Flag indicating signal handling usage + """ + if enable: + ctx.sig = pisi.signalhandler.SignalHandler() + else: + ctx.sig = None + def set_options(options): """ Set various options of pisi @@ -234,6 +246,16 @@ packagedb = pisi.db.packagedb.PackageDB() return packagedb.search_package(terms, lang, repo) +def search_installed(terms, lang=None): + """ + Return a list of components that contains all the given terms either in its name, summary or + description -> list_of_strings + @param terms: a list of terms used to search components -> list_of_strings + @param lang: language of the summary and description + """ + installdb = pisi.db.installdb.InstallDB() + return installdb.search_package(terms, lang) + def search_source(terms, lang=None, repo=None): """ Return a list of source packages that contains all the given terms either in its name, summary or Modified: branches/pisi-devel/pisi/index.py ================================================================= --- branches/pisi-devel/pisi/index.py (original) +++ branches/pisi-devel/pisi/index.py Tue Apr 1 16:16:17 2008 @@ -48,14 +48,6 @@ return self.distribution.name + self.distribution.repositoryname def read_uri(self, uri, tmpdir, force = False): - # A workaround for the side effect of commit revision 17027 - # Someone should nuke pisi.file.File into pieces - fileuri = pisi.file.File.make_uri(uri) - if fileuri.is_local_file(): - pisi.file.File.download(fileuri, tmpdir, not force, pisi.file.File.auto, pisi.file.File.detached, True) - uri = pisi.file.File.decompress(uri, pisi.file.File.auto) - ## - self.read(uri, tmpDir=tmpdir, sha1sum=not force, compress=pisi.file.File.auto, sign=pisi.file.File.detached, copylocal = True, nodecode = True) Modified: branches/pisi-devel/pisi/pxml/xmlfile.py ================================================================= --- branches/pisi-devel/pisi/pxml/xmlfile.py (original) +++ branches/pisi-devel/pisi/pxml/xmlfile.py Tue Apr 1 16:16:17 2008 @@ -65,9 +65,12 @@ def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None, copylocal = False): + # workaround for repo index files to fix + # rev. 17027 regression (http://liste.pardus.org.tr/gelistirici/2008-February/011133.html) + compressed = uri.endswith(".bz2") or uri.endswith(".gz") uri = pisi.file.File.make_uri(uri) - if uri.is_local_file(): + if uri.is_local_file() and not compressed: # this is a local file localpath = uri.path() else: Modified: branches/pisi-devel/pisi/ui.py ================================================================= --- branches/pisi-devel/pisi/ui.py (original) +++ branches/pisi-devel/pisi/ui.py Tue Apr 1 16:16:17 2008 @@ -72,7 +72,8 @@ def confirm(self, msg): "ask a yes/no question" - pass + # default ui confirms everything + return True def display_progress(self, **ka): "display progress" From uludag-commits at pardus.org.tr Tue Apr 1 16:17:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:17:19 +0300 (EEST) Subject: [Uludag-commits] r17545 - branches/pisi-devel/pisi Message-ID: <20080401131719.DB1D7864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 16:17:19 2008 New Revision: 17545 Modified: branches/pisi-devel/pisi/__init__.py Log: 2.0_alpha4 Modified: branches/pisi-devel/pisi/__init__.py ================================================================= --- branches/pisi-devel/pisi/__init__.py (original) +++ branches/pisi-devel/pisi/__init__.py Tue Apr 1 16:17:19 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "2.0_alpha3" +__version__ = "2.0_alpha4" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Tue Apr 1 16:25:30 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:25:30 +0300 (EEST) Subject: [Uludag-commits] r17546 - branches/yali4/yali4/gui/pics Message-ID: <20080401132530.930F08649F9@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Apr 1 16:25:30 2008 New Revision: 17546 Modified: branches/yali4/yali4/gui/pics/backardus.png Log: * daha koyu.. Modified: branches/yali4/yali4/gui/pics/backardus.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Tue Apr 1 16:29:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:29:45 +0300 (EEST) Subject: [Uludag-commits] r17547 - trunk/pisi/pisi/pxml Message-ID: <20080401132945.A167D8649F9@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 16:29:45 2008 New Revision: 17547 Modified: trunk/pisi/pisi/pxml/xmlfile.py Log: Argh! read_xml gets some times str sometimes URI parameter Modified: trunk/pisi/pisi/pxml/xmlfile.py ================================================================= --- trunk/pisi/pisi/pxml/xmlfile.py (original) +++ trunk/pisi/pisi/pxml/xmlfile.py Tue Apr 1 16:29:45 2008 @@ -65,10 +65,11 @@ def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None, copylocal = False): + uri = pisi.file.File.make_uri(uri) + # workaround for repo index files to fix # rev. 17027 regression (http://liste.pardus.org.tr/gelistirici/2008-February/011133.html) - compressed = uri.endswith(".bz2") or uri.endswith(".gz") - uri = pisi.file.File.make_uri(uri) + compressed = str(uri).endswith(".bz2") or str(uri).endswith(".gz") if uri.is_local_file() and not compressed: # this is a local file From uludag-commits at pardus.org.tr Tue Apr 1 16:33:46 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 16:33:46 +0300 (EEST) Subject: [Uludag-commits] r17548 - branches/pisi-devel/pisi/pxml Message-ID: <20080401133346.16B43864990@liste.uludag.org.tr> Author: faik Date: Tue Apr 1 16:33:45 2008 New Revision: 17548 Modified: branches/pisi-devel/pisi/pxml/xmlfile.py Log: Merge from trunk Modified: branches/pisi-devel/pisi/pxml/xmlfile.py ================================================================= --- branches/pisi-devel/pisi/pxml/xmlfile.py (original) +++ branches/pisi-devel/pisi/pxml/xmlfile.py Tue Apr 1 16:33:45 2008 @@ -65,10 +65,11 @@ def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None, copylocal = False): + uri = pisi.file.File.make_uri(uri) + # workaround for repo index files to fix # rev. 17027 regression (http://liste.pardus.org.tr/gelistirici/2008-February/011133.html) - compressed = uri.endswith(".bz2") or uri.endswith(".gz") - uri = pisi.file.File.make_uri(uri) + compressed = str(uri).endswith(".bz2") or str(uri).endswith(".gz") if uri.is_local_file() and not compressed: # this is a local file From uludag-commits at pardus.org.tr Tue Apr 1 17:25:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 17:25:26 +0300 (EEST) Subject: [Uludag-commits] r17549 - trunk/pardusman Message-ID: <20080401142526.8CFC27C0092@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Apr 1 17:25:26 2008 New Revision: 17549 Modified: trunk/pardusman/pardus-2008.patch Log: * patch update, fixed in baselayout. Modified: trunk/pardusman/pardus-2008.patch ================================================================= --- trunk/pardusman/pardus-2008.patch (original) +++ trunk/pardusman/pardus-2008.patch Tue Apr 1 17:25:26 2008 @@ -1,6 +1,6 @@ Index: src/maker.py =================================================================== ---- src/maker.py (revision 17513) +--- src/maker.py (revision 17548) +++ src/maker.py (working copy) @@ -39,9 +39,12 @@ except OSError: @@ -53,25 +53,9 @@ else: install_packages(project) -@@ -257,16 +260,32 @@ - +@@ -258,15 +261,16 @@ chrun("/sbin/ldconfig") chrun("/sbin/update-environment") -+ # Hack hack hack -+ passwd = file("%s/etc/passwd" % image_dir,"a") -+ passwd.write(""" -+dbus:x:101:101:D-BUS:/dev/null:/bin/false -+hal:x:102:102:Hal:/dev/null:/bin/false -+polkit:x:103:103:PolicyKit:/dev/null:/bin/false -+""") -+ passwd.close() -+ groups = file("%s/etc/group" % image_dir,"a") -+ groups.write(""" -+dbus:x:101:dbus -+hal:x:102:hal -+polkit:x:103:polkit -+""") -+ groups.close() chroot_comar(image_dir) - chrun("/usr/bin/hav call-package System.Package.postInstall baselayout") + chrun("/usr/bin/hav call baselayout System.Package postInstall '' '' '' ''") From uludag-commits at pardus.org.tr Tue Apr 1 19:54:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 19:54:09 +0300 (EEST) Subject: [Uludag-commits] r17550 - in branches/yali4/yali4: . gui Message-ID: <20080401165409.7F7EE7C00F4@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Apr 1 19:54:09 2008 New Revision: 17550 Modified: branches/yali4/yali4/bootloader.py branches/yali4/yali4/constants.py branches/yali4/yali4/filesystem.py branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/context.py branches/yali4/yali4/gui/debugger.py branches/yali4/yali4/partitiontype.py branches/yali4/yali4/pisiiface.py Log: * We dont need to check is file system supported by kernel :) * Use logging system.. * We still have some DBUS problems Houston. Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Tue Apr 1 19:54:09 2008 @@ -23,7 +23,7 @@ import yali4.partitiontype as parttype import yali4.partitionrequest as request from yali4.partitionrequest import partrequests -import yali4.gui.context as ctx +from yali4.constants import consts grub_conf_tmp = """\ default 0 @@ -135,7 +135,11 @@ It also cleans unnecessary options """ s = [] # Get parameters from cmdline. - for i in [x for x in open("/proc/cmdline", "r").read().split() if not x.startswith("init=") and not x.startswith("xorg=") and not x.startswith("yali=") and not x.startswith(ctx.consts.kahyaParam)]: + for i in [x for x in open("/proc/cmdline", "r").read().split() \ + if not x.startswith("init=") \ + and not x.startswith("xorg=") \ + and not x.startswith("yali=") \ + and not x.startswith(consts.kahyaParam)]: if i.startswith("root="): s.append("root=/dev/%s" % (root)) elif i.startswith("mudur="): Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Tue Apr 1 19:54:09 2008 @@ -64,7 +64,7 @@ consts.source_dir = join(consts.mnt_dir, "cdrom") # dbus socket path -consts.dbus_socket_file = consts.target_dir + "/var/run/dbus/system_bus_socket" +consts.dbus_socket_file = join(consts.target_dir, "var/run/dbus/system_bus_socket") # swap file path consts.swap_file_name = ".swap" Modified: branches/yali4/yali4/filesystem.py ================================================================= --- branches/yali4/yali4/filesystem.py (original) +++ branches/yali4/yali4/filesystem.py Tue Apr 1 19:54:09 2008 @@ -60,7 +60,6 @@ _fs_type = None # parted fs type def __init__(self): - self.readSupportedFilesystems() self._fs_type = parted.file_system_type_get(self._name) def openPartition(self, partition): @@ -114,42 +113,16 @@ count += 1 return new_label - def readSupportedFilesystems(self): - """ Check the supported file systems by kernel """ - f = open("/proc/filesystems", 'r') - for line in f.readlines(): - line = line.split() - if line[0] == "nodev": - self._filesystems.append(line[1]) - else: - self._filesystems.append(line[0]) - - # append swap manually - self._filesystems.append("swap") - - # append vfat manually - self._filesystems.append("fat32") - - def isSupported(self): - """ Check if file system is supported by kernel """ - if self.name() in self._filesystems: - return True - return False - def preFormat(self, partition): """ Necessary checks before formatting """ e = "" - if not self.isSupported(): - e = "%s file system is not supported by kernel." %(self.name()) - if not self.isImplemented(): e = "%s file system is not fully implemented." %(self.name()) - if e: raise YaliException, e - #FIXME: use logging system - print "format %s: %s" %(partition.getPath(), self.name()) + import yali4.gui.context as ctx + ctx.debugger.log("Format %s: %s" %(partition.getPath(), self.name())) def setImplemented(self, bool): """ Set if file system is implemented """ Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Tue Apr 1 19:54:09 2008 @@ -35,7 +35,6 @@ from yali4.gui.YaliDialog import WarningDialog from yali4.gui.YaliSteps import YaliSteps from yali4.gui.Ui.goodbyewidget import Ui_GoodByeWidget -from yali4.constants import consts import yali4.gui.context as ctx ## @@ -77,7 +76,6 @@ def execute(self): ctx.mainScreen.disableNext() - self.ui.info.show() try: @@ -95,8 +93,8 @@ self.dialog = WarningDialog(w, self) self.dialog.exec_() - ctx.debugger.log("Trying to eject the CD.") # remove cd... + ctx.debugger.log("Trying to eject the CD.") yali4.sysutils.eject_cdrom() ctx.debugger.log("Yali, fastreboot calling..") @@ -110,14 +108,14 @@ # process pending actions defined in other screens. def processPendingActions(self): + global bus bus = None - def connectToDBus(): global bus for i in range(20): try: ctx.debugger.log("trying to start dbus..") - bus = dbus.bus.BusConnection(address_or_type=consts.dbus_socket_file) + bus = dbus.bus.BusConnection(address_or_type=ctx.consts.dbus_socket_file) break except dbus.DBusException: time.sleep(1) @@ -129,7 +127,6 @@ def setHostName(): global bus obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - # setHostName(hostname) obj.setHostName(ctx.installData.hostName, dbus_interface="tr.org.pardus.comar.Net.Stack") ctx.debugger.log("Hostname set as %s" % ctx.installData.hostName) return True @@ -139,9 +136,7 @@ obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") for u in yali4.users.pending_users: ctx.debugger.log("User %s adding to system" % u.username) - # addUser(id, nick, realname, homedir, shell, passwd, groups) obj.addUser("auto", u.username, u.realname, "", "", u.passwd, u.groups, dbus_interface="tr.org.pardus.comar.User.Manager") - #ctx.debugger.log("RESULT :: %s" % str(comarLink.read_cmd())) # Enable auto-login if u.username == ctx.installData.autoLoginUser: @@ -152,9 +147,7 @@ if not ctx.installData.useYaliFirstBoot: global bus obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - # setUser(uid, realname, homedir, shell, passwd, groups) obj.setUser(0, "", "", "", ctx.installData.rootPassword, "", dbus_interface="tr.org.pardus.comar.User.Manager") - #ctx.debugger.log("RESULT :: %s" % str(comarLink.read_cmd())) return True def writeConsoleData(): @@ -171,17 +164,13 @@ global bus if yali4.sysutils.checkYaliParams(param=ctx.consts.firstBootParam): ctx.debugger.log("OemInstall selected.") - # kdebase off obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") - #ctx.debugger.log("RESULT :: %s" % str(comarLink.read_cmd())) - # yali on obj = bus.get_object("tr.org.pardus.comar", "/package/yali_firstBoot") obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") - #ctx.debugger.log("RESULT :: %s" % str(comarLink.read_cmd())) return True - steps = [{"text":"Trying to connect COMAR Daemon...","operation":connectToComar}, + steps = [{"text":"Trying to connect DBUS...","operation":connectToDBus}, {"text":"Setting Hostname...","operation":setHostName}, {"text":"Setting TimeZone...","operation":yali4.postinstall.setTimeZone}, {"text":"Setting Root Password...","operation":setRootPassword}, Modified: branches/yali4/yali4/gui/context.py ================================================================= --- branches/yali4/yali4/gui/context.py (original) +++ branches/yali4/yali4/gui/context.py Tue Apr 1 19:54:09 2008 @@ -33,9 +33,6 @@ # install data installData = installdata.InstallData() -# icon factory -# iconfactory = yali.gui.iconfactory.IconFactory(consts.pics_dir) - # auto partitioning use_autopart = False Modified: branches/yali4/yali4/gui/debugger.py ================================================================= --- branches/yali4/yali4/gui/debugger.py (original) +++ branches/yali4/yali4/gui/debugger.py Tue Apr 1 19:54:09 2008 @@ -69,7 +69,7 @@ class DebugContainer(QtGui.QTextBrowser): def __init__(self, parent, showTimeStamp=True, sysoutEnabled=True): QtGui.QTextBrowser.__init__(self, parent) - self.setStyleSheet("font-size:8pt;font-family:\"Envy Code R\";") + self.setStyleSheet("font-size:8pt;") self.sysout = "/var/log/yali" self.showTimeStamp = showTimeStamp self.sysoutEnabled = sysoutEnabled Modified: branches/yali4/yali4/partitiontype.py ================================================================= --- branches/yali4/yali4/partitiontype.py (original) +++ branches/yali4/yali4/partitiontype.py Tue Apr 1 19:54:09 2008 @@ -21,9 +21,7 @@ import yali4.filesystem class PartitionType: - filesystem = None - ## # is equal # @param rhs: PartitionType @@ -35,7 +33,6 @@ ## # not an intuitive name but need group home and root :( class __PartitionType(PartitionType): - def __init__(self): # check cmdline for reiserfs support cmdline = open("/proc/cmdline", "r").read() @@ -46,7 +43,6 @@ else: self.filesystem = yali4.filesystem.Ext3FileSystem() - class RootPartitionType(__PartitionType): name = _("Install Root") mountpoint = "/" @@ -55,7 +51,6 @@ parted_flags = [ parted.PARTITION_BOOT ] label = "PARDUS_ROOT" - class HomePartitionType(__PartitionType): name = _("Users' Files") mountpoint = "/home" @@ -64,7 +59,6 @@ parted_flags = [] label = "PARDUS_HOME" - class SwapPartitionType(PartitionType): name = _("Swap") filesystem = yali4.filesystem.SwapFileSystem() Modified: branches/yali4/yali4/pisiiface.py ================================================================= --- branches/yali4/yali4/pisiiface.py (original) +++ branches/yali4/yali4/pisiiface.py Tue Apr 1 19:54:09 2008 @@ -38,7 +38,7 @@ pisi.api.set_userinterface(ui) pisi.api.set_options(options) pisi.api.set_comar(with_comar) - pisi.api.set_signalhandling(False) + pisi.api.set_signal_handling(False) def add_repo(name, uri): pisi.api.add_repo(name, uri) From uludag-commits at pardus.org.tr Tue Apr 1 22:09:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 22:09:25 +0300 (EEST) Subject: [Uludag-commits] r17551 - branches/yali4/yali4/gui Message-ID: <20080401190925.5DCDA7C006B@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Apr 1 22:09:24 2008 New Revision: 17551 Modified: branches/yali4/yali4/gui/ScrGoodbye.py Log: Fix dbus socket path Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Tue Apr 1 22:09:24 2008 @@ -115,7 +115,7 @@ for i in range(20): try: ctx.debugger.log("trying to start dbus..") - bus = dbus.bus.BusConnection(address_or_type=ctx.consts.dbus_socket_file) + bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % ctx.consts.dbus_socket_file) break except dbus.DBusException: time.sleep(1) From uludag-commits at pardus.org.tr Tue Apr 1 23:27:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Apr 2008 23:27:17 +0300 (EEST) Subject: [Uludag-commits] r17552 - in branches/yali4/yali4: . gui Message-ID: <20080401202717.1375E7C00F1@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Apr 1 23:27:16 2008 New Revision: 17552 Modified: branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/ScrInstall.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/postinstall.py Log: * Birtakım fiksler.. Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Tue Apr 1 23:27:16 2008 @@ -127,7 +127,7 @@ def setHostName(): global bus obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - obj.setHostName(ctx.installData.hostName, dbus_interface="tr.org.pardus.comar.Net.Stack") + obj.setHostName(str(ctx.installData.hostName), dbus_interface="tr.org.pardus.comar.Net.Stack") ctx.debugger.log("Hostname set as %s" % ctx.installData.hostName) return True @@ -147,7 +147,7 @@ if not ctx.installData.useYaliFirstBoot: global bus obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - obj.setUser(0, "", "", "", ctx.installData.rootPassword, "", dbus_interface="tr.org.pardus.comar.User.Manager") + obj.setUser(0, "", "", "", str(ctx.installData.rootPassword), "", dbus_interface="tr.org.pardus.comar.User.Manager") return True def writeConsoleData(): Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Tue Apr 1 23:27:16 2008 @@ -283,8 +283,8 @@ try: # run all pending... - yali4.pisiiface.configure_pending() ctx.debugger.log("execute :: yali4.pisiiface.configure_pending() called") + yali4.pisiiface.configure_pending() except Exception, e: # User+10: error qevent = PisiEvent(QEvent.User, EventError) Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Tue Apr 1 23:27:16 2008 @@ -126,6 +126,7 @@ w = ExceptionWidget(tb) print "BACKTRACE: ",tb + ctx.debugger.log(tb) d = Dialog(title, w, None) d.resize(500,400) d.exec_() Modified: branches/yali4/yali4/postinstall.py ================================================================= --- branches/yali4/yali4/postinstall.py (original) +++ branches/yali4/yali4/postinstall.py Tue Apr 1 23:27:16 2008 @@ -15,10 +15,12 @@ import grp from yali4.constants import consts +import yali4.gui.context as ctx def cp(s, d): src = os.path.join(consts.target_dir, s) dst = os.path.join(consts.target_dir, d) + ctx.debugger.log("Copying from '%s' to '%s'" % (src,dst)) shutil.copyfile(src, dst) def touch(f, m=0644): @@ -59,7 +61,8 @@ os.system("/usr/bin/mknod %s/dev/null c 1 3" % consts.target_dir) def setTimeZone(): - cp("usr/share/zoneinfo/%s" % ctx.installdata.timezone, "etc/localtime") + os.system("rm -rf %s" % os.path.join(consts.target_dir, "etc/localtime")) + cp("usr/share/zoneinfo/%s" % ctx.installData.timezone, "etc/localtime") return True def migrate_xorg_conf(keymap="trq"): From uludag-commits at pardus.org.tr Wed Apr 2 02:18:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 02:18:05 +0300 (EEST) Subject: [Uludag-commits] MedHelp 82099 Message-ID: <20080402021816.10195.qmail@ema> Bir HTML eklentisi temizlendi... URL: http://liste.pardus.org.tr/uludag-commits/attachments/20080402/a7cc4a35/attachment.htm From uludag-commits at pardus.org.tr Wed Apr 2 10:36:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 10:36:31 +0300 (EEST) Subject: [Uludag-commits] r17553 - branches/yali4/yali4/gui Message-ID: <20080402073631.424747C0044@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Apr 2 10:36:30 2008 New Revision: 17553 Modified: branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/ScrUsers.py Log: * Dbus needs str or unicode .. Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Wed Apr 2 10:36:30 2008 @@ -137,7 +137,6 @@ for u in yali4.users.pending_users: ctx.debugger.log("User %s adding to system" % u.username) obj.addUser("auto", u.username, u.realname, "", "", u.passwd, u.groups, dbus_interface="tr.org.pardus.comar.User.Manager") - # Enable auto-login if u.username == ctx.installData.autoLoginUser: u.setAutoLogin() Modified: branches/yali4/yali4/gui/ScrUsers.py ================================================================= --- branches/yali4/yali4/gui/ScrUsers.py (original) +++ branches/yali4/yali4/gui/ScrUsers.py Wed Apr 2 10:36:30 2008 @@ -182,10 +182,10 @@ def slotCreateUser(self): u = yali4.users.User() - u.username = self.ui.username.text().toAscii() + u.username = str(self.ui.username.text().toAscii()) # ignore last character. see bug #887 u.realname = unicode(self.ui.realname.text()) - u.passwd = self.ui.pass1.text().toAscii() + u.passwd = str(self.ui.pass1.text().toAscii()) u.groups = ["users", "pnp", "pnpadmin", "removable", "disk", "audio", "video", "power", "dialout"] pix = self.normalUserIcon if self.ui.admin.isChecked(): From uludag-commits at pardus.org.tr Wed Apr 2 16:15:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 16:15:06 +0300 (EEST) Subject: [Uludag-commits] r17554 - in branches/yali4/yali4: . gui Message-ID: <20080402131506.580E67C009A@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Apr 2 16:15:05 2008 New Revision: 17554 Modified: branches/yali4/yali4/bootloader.py branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/gui/GUIRelNotes.py branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/postinstall.py Log: * Son çırpınışlar.. Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Wed Apr 2 16:15:05 2008 @@ -28,7 +28,7 @@ grub_conf_tmp = """\ default 0 timeout 10 -splashimage = (%(grub_root)s)/boot/grub/splash.xpm.gz +gfxmenu /boot/grub/message background 10333C title %(pardus_version)s Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Wed Apr 2 16:15:05 2008 @@ -77,7 +77,7 @@ self.vbox.addWidget(self.tabWidget) self.vbox.addWidget(self.partEdit) - self.connect(self.tabWidget,QtCore.SIGNAL("currentChanged(QWidget*)"),self.updatePartEdit) + self.connect(self.tabWidget,QtCore.SIGNAL("currentChanged(int)"),self.updatePartEdit) self.connect(self.partEdit.ui.formatType,QtCore.SIGNAL("currentIndexChanged(int)"),self.formatTypeChanged) self.connect(self.partEdit.ui.deletePartition,QtCore.SIGNAL("clicked()"),self.slotDeletePart) self.connect(self.partEdit.ui.resizePartition,QtCore.SIGNAL("clicked()"),self.slotResizePart) @@ -93,8 +93,8 @@ ## # GUI Operations # - def updatePartEdit(self, dw): - dw.updatePartEdit() + def updatePartEdit(self): + self.tabWidget.currentWidget().updatePartEdit() def addDisk(self,dw): self.tabWidget.addTab(dw,dw.name) @@ -115,7 +115,7 @@ self.addDevice(dev) self.tabWidget.setCurrentIndex(_cur) - self.updatePartEdit(self.tabWidget.widget(_cur)) + self.updatePartEdit() self.checkRootPartRequest() def checkRootPartRequest(self): Modified: branches/yali4/yali4/gui/GUIRelNotes.py ================================================================= --- branches/yali4/yali4/gui/GUIRelNotes.py (original) +++ branches/yali4/yali4/gui/GUIRelNotes.py Wed Apr 2 16:15:05 2008 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005-2007, TUBITAK/UEKAE +# Copyright (C) 2005-2007,2008, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -29,7 +29,6 @@ def __init__(self, *args): apply(QTextBrowser.__init__, (self,) + args) - self.setSizePolicy( QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)) @@ -39,13 +38,13 @@ raise GUIException, e def find_release_notes(self): - rel_path = join(ctx.consts.source_dir, - "release-notes/releasenotes-" + ctx.consts.lang + ".html") + rel_path = join(ctx.consts.source_dir,"release-notes/releasenotes-" + ctx.consts.lang + ".html") + if not exists(rel_path): rel_path = join(ctx.consts.source_dir, "release-notes/releasenotes-en.html") if exists(rel_path): - return f + return rel_path else: raise GUIException, _("Can't open Release Notes!") Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Wed Apr 2 16:15:05 2008 @@ -20,6 +20,7 @@ import yali4.sysutils from yali4.gui.Ui.main import Ui_YaliMain +from yali4.gui.YaliDialog import Dialog import yali4.gui.context as ctx # Aspect oriented huh ;) Modified: branches/yali4/yali4/postinstall.py ================================================================= --- branches/yali4/yali4/postinstall.py (original) +++ branches/yali4/yali4/postinstall.py Wed Apr 2 16:15:05 2008 @@ -57,8 +57,8 @@ chgrp("var/log/wtmp", "utmp") # create needed device nodes - os.system("/usr/bin/mknod %s/dev/console c 5 1" % consts.target_dir) - os.system("/usr/bin/mknod %s/dev/null c 1 3" % consts.target_dir) + os.system("/bin/mknod %s/dev/console c 5 1" % consts.target_dir) + os.system("/bin/mknod %s/dev/null c 1 3" % consts.target_dir) def setTimeZone(): os.system("rm -rf %s" % os.path.join(consts.target_dir, "etc/localtime")) From uludag-commits at pardus.org.tr Wed Apr 2 20:02:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 20:02:28 +0300 (EEST) Subject: [Uludag-commits] r17555 - branches/pisi-devel/pisi Message-ID: <20080402170228.C10927C00B9@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Apr 2 20:02:28 2008 New Revision: 17555 Modified: branches/pisi-devel/pisi/comariface.py Log: I just don't know what to do with myself... Modified: branches/pisi-devel/pisi/comariface.py ================================================================= --- branches/pisi-devel/pisi/comariface.py (original) +++ branches/pisi-devel/pisi/comariface.py Wed Apr 2 20:02:28 2008 @@ -94,7 +94,7 @@ if script.om == "System.Package": self_post = True elif script.om == "System.Service": - sys_service = False + sys_service = True try: sys_iface.register(object_name, script.om, os.path.join(scriptpath, script.script)) except dbus.DBusException, exception: From uludag-commits at pardus.org.tr Wed Apr 2 20:04:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Apr 2008 20:04:10 +0300 (EEST) Subject: [Uludag-commits] r17556 - trunk/pisi Message-ID: <20080402170410.8B1F47C00B9@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Apr 2 20:04:10 2008 New Revision: 17556 Modified: trunk/pisi/comar-dbus.patch Log: merge from devel branch, patch updated Modified: trunk/pisi/comar-dbus.patch ================================================================= --- trunk/pisi/comar-dbus.patch (original) +++ trunk/pisi/comar-dbus.patch Wed Apr 2 20:04:10 2008 @@ -1,6 +1,6 @@ Index: pisi/comariface.py =================================================================== ---- pisi/comariface.py (revision 17303) +--- pisi/comariface.py (revision 17555) +++ pisi/comariface.py (working copy) @@ -13,6 +13,7 @@ import os @@ -137,7 +137,7 @@ - com.register(script.om, package_name, os.path.join(scriptpath, script.script)) - wait_for_result(com) + elif script.om == "System.Service": -+ sys_service = False ++ sys_service = True + try: + sys_iface.register(object_name, script.om, os.path.join(scriptpath, script.script)) + except dbus.DBusException, exception: @@ -233,9 +233,9 @@ + raise Error, _("Script error: %s") % exception Index: pisi/api.py =================================================================== ---- pisi/api.py (revision 17303) +--- pisi/api.py (revision 17555) +++ pisi/api.py (working copy) -@@ -72,13 +72,20 @@ +@@ -73,13 +73,20 @@ """ ctx.comar = enable @@ -258,11 +258,11 @@ - ctx.comar_sockname = sockname + ctx.dbus_sockname = sockname - def set_options(options): + def set_signal_handling(enable): """ Index: pisi/atomicoperations.py =================================================================== ---- pisi/atomicoperations.py (revision 17303) +--- pisi/atomicoperations.py (revision 17555) +++ pisi/atomicoperations.py (working copy) @@ -152,7 +152,7 @@ # check comar @@ -275,7 +275,7 @@ # check dependencies Index: pisi/context.py =================================================================== ---- pisi/context.py (revision 17303) +--- pisi/context.py (revision 17555) +++ pisi/context.py (working copy) @@ -38,7 +38,8 @@ stderr = None From uludag-commits at pardus.org.tr Thu Apr 3 03:53:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 03:53:55 +0300 (EEST) Subject: [Uludag-commits] r17557 - trunk/tasma/tasma/po Message-ID: <20080403005355.3CCB3864060@liste.uludag.org.tr> Author: pinar Date: Thu Apr 3 03:53:54 2008 New Revision: 17557 Modified: trunk/tasma/tasma/po/tr.po Log: remove fuzzies Modified: trunk/tasma/tasma/po/tr.po ================================================================= --- trunk/tasma/tasma/po/tr.po (original) +++ trunk/tasma/tasma/po/tr.po Thu Apr 3 03:53:54 2008 @@ -35,7 +35,6 @@ msgstr "(c) 2005-2006, TÜBİTAK - UEKAE" #: src/main.cpp:64 -#, fuzzy msgid "(c) 2005-2007, TUBITAK - UEKAE" msgstr "(c) 2005-2006, TÜBİTAK - UEKAE" @@ -75,12 +74,10 @@ msgstr "Açıklama" #: src/main.cpp:66 -#, fuzzy msgid "Developer" msgstr "KDE Geliştiricileri" #: src/tasmamainwin.cpp:89 -#, fuzzy msgid "Displays Information About Current Module" msgstr "Şimdiki Modül Hakkında" From uludag-commits at pardus.org.tr Thu Apr 3 05:29:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 05:29:05 +0300 (EEST) Subject: [Uludag-commits] r17559 - branches/kaptan3/src/screens Message-ID: <20080403022905.D2B727C00D8@liste.uludag.org.tr> Author: pinar Date: Thu Apr 3 05:29:05 2008 New Revision: 17559 Added: branches/kaptan3/src/screens/photodlg.ui Log: camera gui From uludag-commits at pardus.org.tr Thu Apr 3 05:39:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 05:39:45 +0300 (EEST) Subject: [Uludag-commits] r17560 - in branches/kaptan3/src: . screens Message-ID: <20080403023945.46CAE7C00EB@liste.uludag.org.tr> Author: pinar Date: Thu Apr 3 05:39:45 2008 New Revision: 17560 Added: branches/kaptan3/src/screens/ScrPhoto.py Modified: branches/kaptan3/src/kaptan.py branches/kaptan3/src/screens/photodlg.ui Log: photo template Modified: branches/kaptan3/src/kaptan.py ================================================================= --- branches/kaptan3/src/kaptan.py (original) +++ branches/kaptan3/src/kaptan.py Thu Apr 3 05:39:45 2008 @@ -27,13 +27,14 @@ import screens.ScrMouse as ScrMouse import screens.ScrNetwork as ScrNetwork import screens.ScrPanel as ScrPanel -#import screens.ScrSummary as ScrSummary +import screens.ScrPhoto as ScrPhoto import screens.ScrGoodbye as ScrGoodbye import screens.ScrMultiple as ScrMultiple #set avaiable screens avail_screens = [ScrWelcome, ScrMouse, + ScrPhoto, ScrPanel, ScrMultiple, ScrWallpaper, Modified: branches/kaptan3/src/screens/photodlg.ui ================================================================= --- branches/kaptan3/src/screens/photodlg.ui (original) +++ branches/kaptan3/src/screens/photodlg.ui Thu Apr 3 05:39:45 2008 @@ -22,18 +22,24 @@ Photo - + - cameraDisplay + shotButton - 100 - 50 - 310 - 190 + 190 + 230 + 110 + 20 + + AncestorOrigin + + + Shot + @@ -42,11 +48,14 @@ 90 - 310 - 320 - 110 + 270 + 340 + 100 + + AncestorOrigin + Put my photo to: @@ -58,6 +67,9 @@ mailCheckBox + + AncestorOrigin + E-mail clients @@ -66,6 +78,9 @@ imCheckBox + + AncestorOrigin + Instant messengers @@ -74,71 +89,30 @@ kdmCheckBox + + AncestorOrigin + - KDM Login Screen + Login Screen (KDM) - + - layout4 + cameraDisplay 90 - 260 - 320 - 30 + 30 + 340 + 180 - - - unnamed - - - - spacer12 - - - Horizontal - - - Expanding - - - - 41 - 21 - - - - - - shotButton - - - Shot - - - - - spacer13 - - - Horizontal - - - Expanding - - - - 71 - 21 - - - - + + AncestorOrigin + From uludag-commits at pardus.org.tr Thu Apr 3 10:56:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 10:56:10 +0300 (EEST) Subject: [Uludag-commits] r17561 - in branches/yali4/yali4: . gui Message-ID: <20080403075610.470D07C0503@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 10:56:10 2008 New Revision: 17561 Modified: branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/storage.py Log: * In Nomeni Patri Et Fili Spiritus Sancti Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Thu Apr 3 10:56:10 2008 @@ -242,5 +242,5 @@ self.slotReboot) def slotReboot(self): - self.emit(PYSIGNAL("signalOK"), ()) + self.emit(SIGNAL("signalOK"), ()) Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Thu Apr 3 10:56:10 2008 @@ -490,7 +490,7 @@ if os.path.exists(sigfile): sig = file(sigfile).read().strip("\n") else: - sig = "NOT FOUND" + sig = False return sig @@ -514,7 +514,8 @@ raise YaliException, "Inserting EDD Module failed !" for d in os.listdir(self.edd_dir): bios_num = d[9:] - sigs[bios_num] = self.get_edd_sig(bios_num) + if self.get_edd_sig(bios_num): + sigs[bios_num] = self.get_edd_sig(bios_num) return sigs def list_mbr_signatures(self): From uludag-commits at pardus.org.tr Thu Apr 3 11:02:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 11:02:33 +0300 (EEST) Subject: [Uludag-commits] r17562 - branches/yali4/yali4/gui Message-ID: <20080403080233.7A0317C0504@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 11:02:33 2008 New Revision: 17562 Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py Log: * In Nomeni Patri Et Fili Spiritus Sancti Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Thu Apr 3 11:02:33 2008 @@ -107,6 +107,9 @@ ctx.mainScreen.disableNext() self.updateUI() + # Remove it later. + self.ui.accept_auto_1.setEnabled(False) + def scanPartitions(self): self.resizablePartitions = [] self.resizableDisks = [] From uludag-commits at pardus.org.tr Thu Apr 3 12:15:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 12:15:57 +0300 (EEST) Subject: [Uludag-commits] r17563 - branches/yali4/yali4 Message-ID: <20080403091557.1CA3D864911@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 12:15:56 2008 New Revision: 17563 Modified: branches/yali4/yali4/bootloader.py Log: keyword changed. Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Thu Apr 3 12:15:56 2008 @@ -138,7 +138,7 @@ for i in [x for x in open("/proc/cmdline", "r").read().split() \ if not x.startswith("init=") \ and not x.startswith("xorg=") \ - and not x.startswith("yali=") \ + and not x.startswith("yali4=") \ and not x.startswith(consts.kahyaParam)]: if i.startswith("root="): s.append("root=/dev/%s" % (root)) From uludag-commits at pardus.org.tr Thu Apr 3 14:45:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 14:45:40 +0300 (EEST) Subject: [Uludag-commits] r17564 - trunk/pisi/pisi Message-ID: <20080403114540.CDC667C00C2@liste.uludag.org.tr> Author: faik Date: Thu Apr 3 14:45:40 2008 New Revision: 17564 Modified: trunk/pisi/pisi/__init__.py Log: 2.0_alpha4 Modified: trunk/pisi/pisi/__init__.py ================================================================= --- trunk/pisi/pisi/__init__.py (original) +++ trunk/pisi/pisi/__init__.py Thu Apr 3 14:45:40 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "2.0_alpha3" +__version__ = "2.0_alpha4" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Thu Apr 3 14:45:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 14:45:54 +0300 (EEST) Subject: [Uludag-commits] r17565 - trunk/pisi/pisi/db Message-ID: <20080403114554.7A7597C00C7@liste.uludag.org.tr> Author: faik Date: Thu Apr 3 14:45:53 2008 New Revision: 17565 Modified: trunk/pisi/pisi/db/itembyrepo.py Log: give more info about what not found Modified: trunk/pisi/pisi/db/itembyrepo.py ================================================================= --- trunk/pisi/pisi/db/itembyrepo.py (original) +++ trunk/pisi/pisi/db/itembyrepo.py Thu Apr 3 14:45:53 2008 @@ -38,7 +38,7 @@ if self.dbobj.has_key(r) and self.dbobj[r].has_key(item): return r - raise Exception(_("Item not found")) + raise Exception(_("%s repository not found") % str(item)) def get_item_repo(self, item, repo=None): for r in self.item_repos(repo): From uludag-commits at pardus.org.tr Thu Apr 3 14:46:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 14:46:08 +0300 (EEST) Subject: [Uludag-commits] r17566 - in trunk/pisi/pisi: . cli Message-ID: <20080403114608.517847C00C7@liste.uludag.org.tr> Author: faik Date: Thu Apr 3 14:46:07 2008 New Revision: 17566 Modified: trunk/pisi/pisi/api.py trunk/pisi/pisi/cli/configurepending.py Log: Make it possible to give package arguments to "pisi configure-pending" Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Thu Apr 3 14:46:07 2008 @@ -419,12 +419,17 @@ return order -def configure_pending(): +def configure_pending(packages=None): # start with pending packages # configure them in reverse topological order of dependency installdb = pisi.db.installdb.InstallDB() - A = installdb.list_pending() - order = generate_pending_order(A) + + if not packages: + packages = installdb.list_pending() + else: + packages = set(packages) and set(installdb.list_pending()) + + order = generate_pending_order(packages) try: for x in order: if installdb.has_package(x): Modified: trunk/pisi/pisi/cli/configurepending.py ================================================================= --- trunk/pisi/pisi/cli/configurepending.py (original) +++ trunk/pisi/pisi/cli/configurepending.py Thu Apr 3 14:46:07 2008 @@ -43,4 +43,4 @@ def run(self): self.init() - pisi.api.configure_pending() + pisi.api.configure_pending(self.args) From uludag-commits at pardus.org.tr Thu Apr 3 14:48:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 14:48:10 +0300 (EEST) Subject: [Uludag-commits] r17567 - in branches/yali4/yali4: . gui Message-ID: <20080403114810.4739C864911@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 14:48:09 2008 New Revision: 17567 Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/sysutils.py Log: * Release blocker issues fixed. Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Thu Apr 3 14:48:09 2008 @@ -95,6 +95,7 @@ elif x["newSize"]==y["newSize"]: return 0 return 1 self.arp = [] + self.autoPartPartition = None self.resizablePartitions.sort(sortBySize) for partition in self.resizablePartitions: if partition["newSize"] / 2 >= ctx.consts.min_root_size: Modified: branches/yali4/yali4/sysutils.py ================================================================= --- branches/yali4/yali4/sysutils.py (original) +++ branches/yali4/yali4/sysutils.py Thu Apr 3 14:48:09 2008 @@ -142,10 +142,10 @@ def reboot(): print "Rebooting..." try: - umount(ctx.consts.target_dir + "/home") + umount(consts.target_dir + "/home") except: pass - umount(ctx.consts.target_dir) + umount(consts.target_dir) fastreboot() ## Run an external program and capture standard out. From uludag-commits at pardus.org.tr Thu Apr 3 15:43:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 15:43:31 +0300 (EEST) Subject: [Uludag-commits] r17568 - branches/yali4/yali4 Message-ID: <20080403124331.2884A8648CC@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 15:43:30 2008 New Revision: 17568 Modified: branches/yali4/yali4/bootloader.py Log: * Another great fix from sun shine history in photographers valley.. Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Thu Apr 3 15:43:30 2008 @@ -96,10 +96,7 @@ if not install_dev.startswith("/dev/"): install_dev = "/dev/%s" % install_dev - if install_root_path.startswith(install_dev): - _grb = "hd0" - else: - _grb = "hd1" + _grb = self._find_grub_dev(install_root_path) # some paths has own directories like (/dev/cciss/c0d0p1) # it removes /dev/ and gets the device. From uludag-commits at pardus.org.tr Thu Apr 3 16:07:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 16:07:41 +0300 (EEST) Subject: [Uludag-commits] r17569 - in branches/yali4/yali4: . gui Message-ID: <20080403130741.28CDD864972@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Apr 3 16:07:40 2008 New Revision: 17569 Modified: branches/yali4/yali4/bootloader.py branches/yali4/yali4/gui/ScrBootloader.py Log: * another last commit .. Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Thu Apr 3 16:07:40 2008 @@ -96,8 +96,6 @@ if not install_dev.startswith("/dev/"): install_dev = "/dev/%s" % install_dev - _grb = self._find_grub_dev(install_root_path) - # some paths has own directories like (/dev/cciss/c0d0p1) # it removes /dev/ and gets the device. install_root = install_root_path[5:] @@ -112,6 +110,8 @@ 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) + # grub_root is the device on which we install. minor = str(int(filter(lambda u: u.isdigit(), install_root)) -1) grub_root = ",".join([_grb, minor]) Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Thu Apr 3 16:07:40 2008 @@ -169,11 +169,8 @@ if ctx.installData.autoPartDev: # show confirmation dialog w.warning.setText(_(''' -

This action will use your entire disk for Pardus installation and +

This action will use your entire disk for Pardus installation and
all your present data on the selected disk will be lost.

- -

After being sure you had your backup this is generally a safe -and easy way to install Pardus.

 ''')) self.dialog = WarningDialog(w, self) From uludag-commits at pardus.org.tr Thu Apr 3 22:10:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Apr 2008 22:10:38 +0300 (EEST) Subject: [Uludag-commits] r17570 - trunk/planet/gezegen.pardus.org.tr Message-ID: <20080403191038.229757C0502@liste.uludag.org.tr> Author: alper Date: Thu Apr 3 22:10:37 2008 New Revision: 17570 Modified: trunk/planet/gezegen.pardus.org.tr/config.ini Log: new feed Modified: trunk/planet/gezegen.pardus.org.tr/config.ini ================================================================= --- trunk/planet/gezegen.pardus.org.tr/config.ini (original) +++ trunk/planet/gezegen.pardus.org.tr/config.ini Thu Apr 3 22:10:37 2008 @@ -129,9 +129,8 @@ [http://www.tuxmen.com/?feed=rss] name=Ahmet Erdoğan -[http://www.alpersomuncu.com/zangetsu/blog/feed/rss/Pardus/] +[http://www.alpersomuncu.com/blog/category/pardus/feed] name=Alper Somuncu -face=http://www.alpersomuncu.com/image/alper.png [http://www.rkirmizi.net/index.php/category/gezegen/feed] name=Recep Kırmızı From uludag-commits at pardus.org.tr Fri Apr 4 09:09:48 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 09:09:48 +0300 (EEST) Subject: [Uludag-commits] r17571 - branches/kaptan3/src/screens Message-ID: <20080404060948.502B47C0067@liste.uludag.org.tr> Author: pinar Date: Fri Apr 4 09:09:48 2008 New Revision: 17571 Modified: branches/kaptan3/src/screens/ScrPhoto.py Log: kdm login picture Modified: branches/kaptan3/src/screens/ScrPhoto.py ================================================================= --- branches/kaptan3/src/screens/ScrPhoto.py (original) +++ branches/kaptan3/src/screens/ScrPhoto.py Fri Apr 4 09:09:48 2008 @@ -14,6 +14,8 @@ from kdecore import * from kdeui import * import kdedesigner +import os +import Image from screens.Screen import ScreenWidget from screens.photodlg import PhotoWidget @@ -23,18 +25,24 @@ # title and description at the top of the dialog window title = "Photo" desc = "Take your profile photo!..." - icon = "kaptan/pics/icons/photo.png" + icon = "kaptan/pics/icons/camera.png" def __init__(self, *args): apply(PhotoWidget.__init__, (self,) + args) #set background image self.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/middleWithCorner.png"))) + + def captureShot(self): + """capture picture""" + pass def shown(self): pass def execute(self): - pass - - + if self.kdmCheckBox.isChecked(): + self.homeDir = os.path.expanduser("~") + infile = "kaptan/pics/icons/camera.png" + self.picture = Image.open(infile) + self.picture.save(self.homeDir+"/.face.icon" , "PNG") From uludag-commits at pardus.org.tr Fri Apr 4 11:40:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 11:40:29 +0300 (EEST) Subject: [Uludag-commits] r17572 - in branches/yali4/yali4/gui: . Ui Message-ID: <20080404084029.CD464864AC4@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Apr 4 11:40:29 2008 New Revision: 17572 Modified: branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/Ui/goodbyewidget.ui Log: * Pardus est fere promptus Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Fri Apr 4 11:40:29 2008 @@ -135,8 +135,7 @@ if cur == 1: if self.partEdit.ui.partitionSize.maximum() < ctx.consts.min_root_size and not self.partEdit.isPartitionUsed: self.partEdit.ui.formatType.setCurrentIndex(0) - self.partEdit.ui.information.setText( - _("'Install Root' size must be larger than %s MB.") % (ctx.consts.min_root_size)) + self.partEdit.ui.information.setText(_("'Install Root' size must be larger than %s MB.") % (ctx.consts.min_root_size)) else: self.partEdit.ui.partitionSize.setMinimum(ctx.consts.min_root_size) self.partEdit.ui.partitionSlider.setMinimum(ctx.consts.min_root_size) Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Fri Apr 4 11:40:29 2008 @@ -216,7 +216,9 @@ ctx.partrequests.applyAll() ctx.debugger.log("Format Operation Finished") ctx.mainScreen.processEvents() - self.checkSwap() + + # We always need swap .. + self.checkSwap() info.close() Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Fri Apr 4 11:40:29 2008 @@ -66,7 +66,7 @@ self.steps = YaliSteps() - self.ui.info.setText(_('Rebooting system. Please wait!')) + self.ui.info.setText(_('Rebooting system. Please wait!')) self.ui.info.hide() def shown(self): Modified: branches/yali4/yali4/gui/Ui/goodbyewidget.ui ================================================================= --- branches/yali4/yali4/gui/Ui/goodbyewidget.ui (original) +++ branches/yali4/yali4/gui/Ui/goodbyewidget.ui Fri Apr 4 11:40:29 2008 @@ -5,20 +5,20 @@ 0 0 - 463 + 789 514 Form - - + + Qt::Vertical - + 20 40 @@ -31,7 +31,7 @@ Qt::Horizontal - + 40 20 @@ -39,7 +39,7 @@ - + @@ -47,14 +47,17 @@ :/gui/pics/goodbye.png + + Qt::AlignCenter + - + Qt::Horizontal - + 40 20 @@ -62,7 +65,7 @@ - + Qt::Vertical @@ -70,7 +73,7 @@ QSizePolicy::Fixed - + 20 20 @@ -78,48 +81,22 @@ - - - - Qt::Horizontal - - - - 381 - 20 - - - - - + - font:12px Droid Sans; + font:12px Droid Sans; - - - - Qt::Horizontal - - - - 371 - 20 - - - - - + Qt::Vertical - + 20 40 From uludag-commits at pardus.org.tr Fri Apr 4 15:43:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 15:43:34 +0300 (EEST) Subject: [Uludag-commits] r17573 - branches/tasma-dbus/firewall-config/src Message-ID: <20080404124334.29BB78648CC@liste.uludag.org.tr> Author: bahadir.kandemir Date: Fri Apr 4 15:43:33 2008 New Revision: 17573 Modified: branches/tasma-dbus/firewall-config/src/firewall-config.py Log: * remove debug code * get rules if state is on Modified: branches/tasma-dbus/firewall-config/src/firewall-config.py ================================================================= --- branches/tasma-dbus/firewall-config/src/firewall-config.py (original) +++ branches/tasma-dbus/firewall-config/src/firewall-config.py Fri Apr 4 15:43:33 2008 @@ -219,8 +219,6 @@ # Init self.getState() - self.getProfile() - self.getRules() def setupBusses(self): try: @@ -237,7 +235,7 @@ if not path.startswith("/package/"): return script = path[9:] - print script, signal + #print script, signal def listenSignals(self): self.busSys.add_signal_receiver(self.handleSignals, dbus_interface="tr.org.pardus.comar.Net.Filter", member_keyword="signal", path_keyword="path") @@ -273,6 +271,8 @@ mainwidget.frameIncoming.setEnabled(True) mainwidget.frameAdvanced.setEnabled(True) mainwidget.pushNewRule.setEnabled(True) + self.getProfile() + self.getRules() self.setState(self.state) ch = self.callMethod("info", "tr.org.pardus.comar.system.service.get", "System.Service") ch.registerDone(handleState) From uludag-commits at pardus.org.tr Fri Apr 4 15:48:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 15:48:53 +0300 (EEST) Subject: [Uludag-commits] r17574 - branches/tasma-dbus/network-manager Message-ID: <20080404124854.048A08648CC@liste.uludag.org.tr> Author: bahadir.kandemir Date: Fri Apr 4 15:48:53 2008 New Revision: 17574 Modified: branches/tasma-dbus/network-manager/setup.py Log: new release Modified: branches/tasma-dbus/network-manager/setup.py ================================================================= --- branches/tasma-dbus/network-manager/setup.py (original) +++ branches/tasma-dbus/network-manager/setup.py Fri Apr 4 15:48:53 2008 @@ -17,7 +17,7 @@ import shutil import kdedistutils -version = "1.15.6" +version = "2.0.0" distfiles = """ README From uludag-commits at pardus.org.tr Fri Apr 4 15:54:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 15:54:44 +0300 (EEST) Subject: [Uludag-commits] r17575 - branches/tasma-dbus/boot-manager Message-ID: <20080404125444.4BE5A86496B@liste.uludag.org.tr> Author: bahadir.kandemir Date: Fri Apr 4 15:54:43 2008 New Revision: 17575 Modified: branches/tasma-dbus/boot-manager/setup.py Log: 1.0.0 Modified: branches/tasma-dbus/boot-manager/setup.py ================================================================= --- branches/tasma-dbus/boot-manager/setup.py (original) +++ branches/tasma-dbus/boot-manager/setup.py Fri Apr 4 15:54:43 2008 @@ -16,7 +16,7 @@ from distutils.core import Extension import kdedistutils -version = '0.3.3' +version = '1.0.0' distfiles = """ README From uludag-commits at pardus.org.tr Fri Apr 4 15:57:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 15:57:27 +0300 (EEST) Subject: [Uludag-commits] r17576 - branches/tasma-dbus/user-manager Message-ID: <20080404125727.952AE86496B@liste.uludag.org.tr> Author: bahadir.kandemir Date: Fri Apr 4 15:57:27 2008 New Revision: 17576 Modified: branches/tasma-dbus/user-manager/setup.py Log: 2.0.0 Modified: branches/tasma-dbus/user-manager/setup.py ================================================================= --- branches/tasma-dbus/user-manager/setup.py (original) +++ branches/tasma-dbus/user-manager/setup.py Fri Apr 4 15:57:27 2008 @@ -16,7 +16,7 @@ from distutils.core import Extension import kdedistutils -version = "1.2.1" +version = "2.0.0" distfiles = """ README From uludag-commits at pardus.org.tr Fri Apr 4 16:21:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 16:21:57 +0300 (EEST) Subject: [Uludag-commits] r17577 - in branches/yali4/yali4: . gui Message-ID: <20080404132157.622E37C0081@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Apr 4 16:21:56 2008 New Revision: 17577 Modified: branches/yali4/yali4/bootloader.py branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/ScrDateTime.py branches/yali4/yali4/gui/ScrPartitionManual.py branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/storage.py Log: * sparsum comitto Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Fri Apr 4 16:21:56 2008 @@ -193,12 +193,13 @@ def install_grub(self, grub_install_root=None): """ Install GRUB to the given device or partition """ - # grub installation is always hd0 (http://liste.pardus.org.tr/gelistirici/2007-March/005725.html) - # if not explicitly defined... if not grub_install_root.startswith("/dev/"): grub_install_root = "/dev/%s" % grub_install_root + grub_install_root = str(filter(lambda u: not u.isdigit(), + grub_install_root)) + cmd = "%s --root-directory=%s %s" % (yali4.sysutils.find_executable("grub-install"), consts.target_dir, grub_install_root) Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Fri Apr 4 16:21:56 2008 @@ -42,6 +42,7 @@ self.resize(QSize(QRect(0,0,600,80).size()).expandedTo(self.minimumSizeHint())) self.setAutoFillBackground(False) self.diskCount = 1 + self.updateEnabled = True self.setStyleSheet(""" QTabWidget::pane { border-top: 2px solid #FFFFFF; } QTabWidget::tab-bar { left: 5px; } @@ -87,8 +88,10 @@ self.initDevices() - def resizeEvent(self,event): - self.update() + def resizeEvent(self, event): + if self.updateEnabled: + self.update() + self.updateEnabled = False ## # GUI Operations Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Fri Apr 4 16:21:56 2008 @@ -100,6 +100,10 @@ self.connect(self.ui.device_list, SIGNAL("clicked()"), self.slotSelect) + def shown(self): + self.orderedDiskList = yali4.storage.getOrderedDiskList() + ctx.debugger.log("Disks BIOS Boot order : %s " % ','.join(self.orderedDiskList)) + def backCheck(self): if ctx.autoInstall: # we need to go partition auto screen, not manual ;) @@ -234,7 +238,6 @@ ctx.installData.bootLoaderDev = basename(self.device.getPath()) else: if len(yali4.storage.devices) > 1: - self.orderedDiskList = yali4.storage.getOrderedDiskList() ctx.installData.bootLoaderDev = basename(self.orderedDiskList[0]) else: ctx.installData.bootLoaderDev = str(basename(root_part_req.partition().getPath())) Modified: branches/yali4/yali4/gui/ScrDateTime.py ================================================================= --- branches/yali4/yali4/gui/ScrDateTime.py (original) +++ branches/yali4/yali4/gui/ScrDateTime.py Fri Apr 4 16:21:56 2008 @@ -107,4 +107,4 @@ # Store time zone selection we will set it in processPending actions. ctx.installData.timezone = self.ui.timeZoneList.currentItem().text() ctx.debugger.log("Time zone selected as %s " % ctx.installData.timezone) - + return True Modified: branches/yali4/yali4/gui/ScrPartitionManual.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionManual.py (original) +++ branches/yali4/yali4/gui/ScrPartitionManual.py Fri Apr 4 16:21:56 2008 @@ -80,7 +80,7 @@ ctx.mainScreen.disableNext() def update(self): - self.diskList.update() + self.diskList.updateEnabled = True ## # do the work and run requested actions on partitions. Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Fri Apr 4 16:21:56 2008 @@ -59,6 +59,8 @@ self.helpContent.hide() else: self.helpContent.show() + _w = self.mainStack.currentWidget() + _w.update() # show/hide debug window def toggleDebug(self): @@ -84,9 +86,9 @@ def slotNext(self,dryRun=False): if not dryRun: _w = self.mainStack.currentWidget() - _w.execute() - self.stackMove(self.getCur(self.moveInc)) - self.moveInc = 1 + if _w.execute(): + self.stackMove(self.getCur(self.moveInc)) + self.moveInc = 1 # execute previous step def slotBack(self): @@ -105,6 +107,7 @@ self.helpContent.setText(_w.help) # shown functions contain necessary instructions before # showing a stack ( updating gui, disabling some buttons etc. ) + _w.update() _w.shown() # create all widgets and add inside stack Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Fri Apr 4 16:21:56 2008 @@ -543,6 +543,7 @@ # Check for sysfs. Only works for >2.6 kernels. if not os.path.exists("/sys/bus"): raise DeviceError, "sysfs not found!" + # Check for /proc/partitions if not os.path.exists("/proc/partitions"): raise DeviceError, "/proc/partitions not found!" From uludag-commits at pardus.org.tr Fri Apr 4 16:32:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 16:32:56 +0300 (EEST) Subject: [Uludag-commits] r17578 - branches/yali4/yali4/gui Message-ID: <20080404133256.2B26A7C0082@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Apr 4 16:32:55 2008 New Revision: 17578 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * check swap before proceed.. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Fri Apr 4 16:32:55 2008 @@ -191,6 +191,9 @@ 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: @@ -221,9 +224,6 @@ ctx.debugger.log("Format Operation Finished") ctx.mainScreen.processEvents() - # We always need swap .. - self.checkSwap() - info.close() root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, From uludag-commits at pardus.org.tr Fri Apr 4 17:41:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 17:41:23 +0300 (EEST) Subject: [Uludag-commits] r17579 - in branches/yali4: po yali4 yali4/gui yali4/gui/Ui Message-ID: <20080404144123.E9B167C011F@liste.uludag.org.tr> 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 @@ Previous Screen - « Back + Back @@ -569,7 +569,7 @@ Next Screen - Next » + Next 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" From uludag-commits at pardus.org.tr Fri Apr 4 17:53:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 17:53:32 +0300 (EEST) Subject: [Uludag-commits] r17580 - branches/yali4/po Message-ID: <20080404145332.A5C217C0123@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Apr 4 17:53:32 2008 New Revision: 17580 Modified: branches/yali4/po/tr.po Log: * Heta olmuş olabilir. Modified: branches/yali4/po/tr.po ================================================================= --- branches/yali4/po/tr.po (original) +++ branches/yali4/po/tr.po Fri Apr 4 17:53:32 2008 @@ -196,19 +196,19 @@ #: yali4/gui/Ui/datetimewidget.py:101 msgid "HH" -msgstr "SS" +msgstr "" #: yali4/gui/Ui/datetimewidget.py:102 yali4/gui/Ui/datetimewidget.py:104 msgid ":" -msgstr ":" +msgstr "" #: yali4/gui/Ui/datetimewidget.py:103 msgid "mm" -msgstr "dd" +msgstr "" #: yali4/gui/Ui/datetimewidget.py:105 msgid "ss" -msgstr "ss" +msgstr "" #: yali4/gui/Ui/datetimewidget.py:106 msgid "Time Zone" From uludag-commits at pardus.org.tr Fri Apr 4 19:35:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 19:35:57 +0300 (EEST) Subject: [Uludag-commits] r17581 - in branches/yali4: po yali4 yali4/gui Message-ID: <20080404163557.881737C0127@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Apr 4 19:35:57 2008 New Revision: 17581 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/constants.py branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/pisiiface.py Log: * in. Modified: branches/yali4/po/ca.po ================================================================= --- branches/yali4/po/ca.po (original) +++ branches/yali4/po/ca.po Fri Apr 4 19:35:57 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yali\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-03-18 14:13+0100\n" "Last-Translator: Pau Amaro-Seoane \n" "Language-Team: Catala \n" @@ -240,7 +240,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Notes de la versió" @@ -1397,6 +1397,14 @@ msgid "O.K. Go Ahead" msgstr "D'acord. Continua." +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Finestres" Modified: branches/yali4/po/de.po ================================================================= --- branches/yali4/po/de.po (original) +++ branches/yali4/po/de.po Fri Apr 4 19:35:57 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-11-16 00:57+0200\n" "Last-Translator: Mustafa Ölcerman \n" "Language-Team: Deutsch \n" @@ -241,7 +241,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Release-Informationen" @@ -1414,6 +1414,14 @@ msgid "O.K. Go Ahead" msgstr "O.K., forsetzen" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/es.po ================================================================= --- branches/yali4/po/es.po (original) +++ branches/yali4/po/es.po Fri Apr 4 19:35:57 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-10-10 19:20-0400\n" "Last-Translator: Klemens \n" "Language-Team: español \n" @@ -251,7 +251,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Notas de Versión" @@ -1479,6 +1479,14 @@ msgid "O.K. Go Ahead" msgstr "Bien, Hagámoslo" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + # you mean the MS product ? if you wanted to say just "pencereler" the translation should be: "Ventanas" #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" Modified: branches/yali4/po/fr.po ================================================================= --- branches/yali4/po/fr.po (original) +++ branches/yali4/po/fr.po Fri Apr 4 19:35:57 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-10-19 22:35+0200\n" "Last-Translator: Amine Chadly \n" "Language-Team: French \n" @@ -238,7 +238,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Notes de publication" @@ -1415,6 +1415,14 @@ msgid "O.K. Go Ahead" msgstr "O.K. Continuer" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/it.po ================================================================= --- branches/yali4/po/it.po (original) +++ branches/yali4/po/it.po Fri Apr 4 19:35:57 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-11-12 20:52+0100\n" "Last-Translator: Andrea Decorte \n" "Language-Team: Italian \n" @@ -236,7 +236,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Note di rilascio" @@ -1407,6 +1407,14 @@ msgid "O.K. Go Ahead" msgstr "Va bene, prosegui" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/nl.po ================================================================= --- branches/yali4/po/nl.po (original) +++ branches/yali4/po/nl.po Fri Apr 4 19:35:57 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-11-13 19:53+0100\n" "Last-Translator: Willem Gielen \n" "Language-Team: Nederlands \n" @@ -240,7 +240,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Uitgavenotities" @@ -1400,6 +1400,14 @@ msgid "O.K. Go Ahead" msgstr "O.K. Ga verder" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/pl.po ================================================================= --- branches/yali4/po/pl.po (original) +++ branches/yali4/po/pl.po Fri Apr 4 19:35:57 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2006-04-08 12:19+0900\n" "Last-Translator: Piotr Mali?ski \n" "Language-Team: Polish \n" @@ -236,7 +236,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Notki Wydania" @@ -1374,6 +1374,14 @@ msgid "O.K. Go Ahead" msgstr "TAK, Wykonaj" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/pt_BR.po ================================================================= --- branches/yali4/po/pt_BR.po (original) +++ branches/yali4/po/pt_BR.po Fri Apr 4 19:35:57 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: 2007-02-19 22:25-0300\n" "Last-Translator: Pedro Leite \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Türkçe \n" @@ -254,7 +254,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "Sürüm Notları" @@ -1414,6 +1414,14 @@ msgid "O.K. Go Ahead" msgstr "Tamam. Devam Et" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "Yardımı Göster" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "Yardımı Gizle" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "Windows" Modified: branches/yali4/po/yali4.pot ================================================================= --- branches/yali4/po/yali4.pot (original) +++ branches/yali4/po/yali4.pot Fri Apr 4 19:35:57 2008 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-04 17:39+0300\n" +"POT-Creation-Date: 2008-04-04 19:33+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -219,7 +219,7 @@ msgid "Details about the screen" msgstr "" -#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:162 +#: yali4/gui/Ui/main.py:450 yali4/gui/YaliWindow.py:164 msgid "Release Notes" msgstr "" @@ -1084,6 +1084,14 @@ msgid "O.K. Go Ahead" msgstr "" +#: yali4/gui/YaliWindow.py:60 +msgid "Show Help" +msgstr "" + +#: yali4/gui/YaliWindow.py:63 +msgid "Hide Help" +msgstr "" + #: yali4/bootloader.py:190 yali4/bootloader.py:195 msgid "Windows" msgstr "" Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Fri Apr 4 19:35:57 2008 @@ -79,8 +79,11 @@ consts.cd_repo_uri = join(consts.source_dir, "repo/pisi-index.xml.bz2") # pardus repository -consts.pardus_repo_name = "pardus-2007.3" -consts.pardus_repo_uri = "http://paketler.pardus.org.tr/pardus-2007.3/pisi-index.xml.bz2" +consts.pardus_repo_name = "" +consts.pardus_repo_uri = "" + +#consts.pardus_repo_name = "pardus-2007.3" +#consts.pardus_repo_uri = "http://paketler.pardus.org.tr/pardus-2007.3/pisi-index.xml.bz2" # min root partition size consts.min_root_size = 3500 Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Fri Apr 4 19:35:57 2008 @@ -57,8 +57,10 @@ def slotToggleHelp(self): if self.helpContent.isVisible(): self.helpContent.hide() + self.toggleHelp.setText(_("Show Help")) else: self.helpContent.show() + self.toggleHelp.setText(_("Hide Help")) _w = self.mainStack.currentWidget() _w.update() Modified: branches/yali4/yali4/pisiiface.py ================================================================= --- branches/yali4/yali4/pisiiface.py (original) +++ branches/yali4/yali4/pisiiface.py Fri Apr 4 19:35:57 2008 @@ -40,8 +40,9 @@ pisi.api.set_comar(with_comar) pisi.api.set_signal_handling(False) -def add_repo(name, uri): - pisi.api.add_repo(name, uri) +def add_repo(name=None, uri=None): + if name and uri: + pisi.api.add_repo(name, uri) def add_cd_repo(): cd_repo_name = consts.cd_repo_name @@ -56,7 +57,7 @@ update_repo(name) def switch_to_pardus_repo(): - cd_repo_name = consts.cd_repo_name + cd_repo_name = consts.cd_repo_name pardus_repo_name = consts.pardus_repo_name pardus_repo_uri = consts.pardus_repo_uri From uludag-commits at pardus.org.tr Fri Apr 4 20:21:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Apr 2008 20:21:56 +0300 (EEST) Subject: [Uludag-commits] r17582 - trunk/planet/gezegen.pardus.org.tr Message-ID: <20080404172156.459427C011E@liste.uludag.org.tr> Author: serbulent Date: Fri Apr 4 20:21:56 2008 New Revision: 17582 Modified: trunk/planet/gezegen.pardus.org.tr/config.ini Log: ben Modified: trunk/planet/gezegen.pardus.org.tr/config.ini ================================================================= --- trunk/planet/gezegen.pardus.org.tr/config.ini (original) +++ trunk/planet/gezegen.pardus.org.tr/config.ini Fri Apr 4 20:21:56 2008 @@ -152,3 +152,6 @@ [http://www.tetir.net/zangetsu/blog/feed/rss/Pardus/] name=Serdar Soytetir + +[http://nightwalkers.blogspot.com/feeds/posts/default] +name=Serbülent Ünsal From uludag-commits at pardus.org.tr Sat Apr 5 00:43:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 5 Apr 2008 00:43:51 +0300 (EEST) Subject: [Uludag-commits] r17583 - branches/tasma-dbus/network-manager Message-ID: <20080404214351.A59BA1384076@liste.pardus.org.tr> Author: bahadir.kandemir Date: Sat Apr 5 00:43:51 2008 New Revision: 17583 Modified: branches/tasma-dbus/network-manager/comariface.py Log: Don't continue if call fails Modified: branches/tasma-dbus/network-manager/comariface.py ================================================================= --- branches/tasma-dbus/network-manager/comariface.py (original) +++ branches/tasma-dbus/network-manager/comariface.py Sat Apr 5 00:43:51 2008 @@ -216,6 +216,7 @@ iface = dbus.Interface(obj, dbus_interface="tr.org.pardus.comar") except dbus.DBusException, exception: self.errorDBus(exception) + return try: func = getattr(iface, method) return func(*args) From uludag-commits at pardus.org.tr Sun Apr 6 11:55:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 6 Apr 2008 11:55:11 +0300 (EEST) Subject: [Uludag-commits] r17584 - trunk/comar/mudur/po Message-ID: <20080406085511.2B09813840DD@liste.pardus.org.tr> Author: wpmhia Date: Sun Apr 6 11:55:10 2008 New Revision: 17584 Modified: trunk/comar/mudur/po/nl.po Log: Modified: trunk/comar/mudur/po/nl.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Mon Apr 7 14:54:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 7 Apr 2008 14:54:19 +0300 (EEST) Subject: [Uludag-commits] r17585 - in branches/yali4/yali4: . gui Message-ID: <20080407115419.89A0813840E2@liste.pardus.org.tr> Author: gokmen.goksel Date: Mon Apr 7 14:54:18 2008 New Revision: 17585 Modified: branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/ScrKeyboard.py branches/yali4/yali4/localedata.py branches/yali4/yali4/localeutils.py Log: * Keyboard Layout settings redesigned. Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Mon Apr 7 14:54:18 2008 @@ -150,7 +150,7 @@ return True def writeConsoleData(): - yali4.localeutils.write_keymap(ctx.installData.keyData.console) + yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) ctx.debugger.log("Keymap stored.") return True Modified: branches/yali4/yali4/gui/ScrKeyboard.py ================================================================= --- branches/yali4/yali4/gui/ScrKeyboard.py (original) +++ branches/yali4/yali4/gui/ScrKeyboard.py Mon Apr 7 14:54:18 2008 @@ -46,18 +46,21 @@ self.ui = Ui_KeyboardWidget() self.ui.setupUi(self) - # iterate over keyboard list and set default defaultitem = None - for (lang, keymap) in yali4.localedata.getLangsWithKeymaps(): - if isinstance(keymap, list): - for k in keymap: - ki = KeyboardItem(self.ui.keyboard_list, k) - if ctx.consts.lang == lang and not defaultitem: - defaultitem = ki + for country,data in yali4.localedata.locales.items(): + if data["xkbvariant"]: + i = 0 + for variant in data["xkbvariant"]: + _d = dict(data) + _d["xkbvariant"] = variant[0] + _d["name"] = variant[1] + _d["consolekeymap"] = data["consolekeymap"][i] + ki = KeyboardItem(self.ui.keyboard_list, _d) + i+=1 else: - ki = KeyboardItem(self.ui.keyboard_list, keymap) - if ctx.consts.lang == lang and not defaultitem: - defaultitem = ki + ki = KeyboardItem(self.ui.keyboard_list, data) + if ctx.consts.lang == country and not defaultitem: + defaultitem = ki self.ui.keyboard_list.sortItems(Qt.AscendingOrder) self.ui.keyboard_list.setCurrentItem(defaultitem) @@ -74,13 +77,13 @@ def slotLayoutChanged(self,i,y=None): if not i==y: keydata = i.getData() - yali4.localeutils.set_keymap(keydata.X) + yali4.localeutils.set_keymap(keydata["xkblayout"], keydata["xkbvariant"]) class KeyboardItem(QtGui.QListWidgetItem): def __init__(self, parent, keydata): - text = "%s" %(keydata.translation) - QtGui.QListWidgetItem.__init__(self,text,parent) + text = "%s" %(keydata["name"]) + QtGui.QListWidgetItem.__init__(self, text, parent) self._keydata = keydata def getData(self): Modified: branches/yali4/yali4/localedata.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/yali4/yali4/localeutils.py ================================================================= --- branches/yali4/y