From uludag-commits at pardus.org.tr Thu May 1 11:50:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 11:50:58 +0300 (EEST) Subject: [Uludag-commits] r17857 - trunk/tasma/package-manager/src Message-ID: <20080501085058.790C813841BC@liste.pardus.org.tr> Author: faik Date: Thu May 1 11:50:58 2008 New Revision: 17857 Modified: trunk/tasma/package-manager/src/Notifier.py trunk/tasma/package-manager/src/package-manager.py Log: duplicate dbus.mainloop.qt3 Modified: trunk/tasma/package-manager/src/Notifier.py ================================================================= --- trunk/tasma/package-manager/src/Notifier.py (original) +++ trunk/tasma/package-manager/src/Notifier.py Thu May 1 11:50:58 2008 @@ -18,7 +18,6 @@ def __init__(self): QObject.__init__(self) - dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) bus = dbus.SessionBus() try: object = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Thu May 1 11:50:58 2008 @@ -140,8 +140,6 @@ global kapp global packageToInstall - dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) - about_data = AboutData() KCmdLineArgs.init(sys.argv,about_data) KCmdLineArgs.addCmdLineOptions ([("install ", I18N_NOOP("Package to install")), @@ -153,6 +151,9 @@ return kapp = KUniqueApplication(True, True, True) + + dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) + debug = False args = KCmdLineArgs.parsedArgs() From uludag-commits at pardus.org.tr Thu May 1 12:57:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 12:57:33 +0300 (EEST) Subject: [Uludag-commits] r17858 - trunk/staj-projeleri/migration/migration Message-ID: <20080501095733.2787C13841FA@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 12:57:32 2008 New Revision: 17858 Modified: trunk/staj-projeleri/migration/migration/wizard.py Log: Fix setNextEnabled bug when no user found Modified: trunk/staj-projeleri/migration/migration/wizard.py ================================================================= --- trunk/staj-projeleri/migration/migration/wizard.py (original) +++ trunk/staj-projeleri/migration/migration/wizard.py Thu May 1 12:57:32 2008 @@ -55,7 +55,6 @@ # User page: self.userpage = UserPage(self) self.addPage(self.userpage, i18n("Selecting User")) - self.addUsers() # Empty Options page: self.optionspage = QWidget(self) self.addPage(self.optionspage, i18n("Selecting Options")) @@ -68,6 +67,7 @@ # Connections: self.connect(self.helpButton(), SIGNAL("clicked()"), self.slotHelp) self.connect(self.kapp, SIGNAL("aboutToQuit()"), self.slotQuit) + self.addUsers() def slotHelp(self): self.helpwin = HelpDialog("migration", i18n("Migration Tool Help"), self) @@ -139,7 +139,6 @@ self.users = partition.allUsers() if len(self.users) == 0: self.userpage.usersBox.setEnabled(False) - self.userpage = UserPage(self) self.setNextEnabled(self.userpage, False) logging.error("No User") for user in self.users: From uludag-commits at pardus.org.tr Thu May 1 12:58:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 12:58:50 +0300 (EEST) Subject: [Uludag-commits] r17859 - trunk/staj-projeleri/migration/migration Message-ID: <20080501095850.F125613841FA@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 12:58:50 2008 New Revision: 17859 Modified: trunk/staj-projeleri/migration/migration/wizard.py Log: fix BUG #7078 by saving migration.log into home dir Modified: trunk/staj-projeleri/migration/migration/wizard.py ================================================================= --- trunk/staj-projeleri/migration/migration/wizard.py (original) +++ trunk/staj-projeleri/migration/migration/wizard.py Thu May 1 12:58:50 2008 @@ -43,7 +43,7 @@ logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%H:%M:%S', - filename='/tmp/migration.log', + filename=os.path.expanduser('~/migration.log'), filemode='w') logging.info("Migration Tool Started") # i18n: From uludag-commits at pardus.org.tr Thu May 1 13:22:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 13:22:36 +0300 (EEST) Subject: [Uludag-commits] r17860 - in trunk/staj-projeleri/migration: . migration Message-ID: <20080501102236.7979D1384122@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 13:22:36 2008 New Revision: 17860 Modified: trunk/staj-projeleri/migration/migration/migration.py trunk/staj-projeleri/migration/setup.py Log: increment version number Modified: trunk/staj-projeleri/migration/migration/migration.py ================================================================= --- trunk/staj-projeleri/migration/migration/migration.py (original) +++ trunk/staj-projeleri/migration/migration/migration.py Thu May 1 13:22:36 2008 @@ -24,7 +24,7 @@ about = KAboutData( "migration", I18N_NOOP("Migration Tool"), - "0.8.4", + "0.8.5", I18N_NOOP("A wizard to transfer files and settings from existing operating systems"), KAboutData.License_GPL, '(C) 2006-2007 UEKAE/TÜBİTAK', Modified: trunk/staj-projeleri/migration/setup.py ================================================================= --- trunk/staj-projeleri/migration/setup.py (original) +++ trunk/staj-projeleri/migration/setup.py Thu May 1 13:22:36 2008 @@ -15,7 +15,7 @@ import shutil import kdedistutils -version = "0.8.4" +version = "0.8.5" distfiles = """ README From uludag-commits at pardus.org.tr Thu May 1 13:45:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 13:45:31 +0300 (EEST) Subject: [Uludag-commits] r17861 - branches/yali4/yali4 Message-ID: <20080501104531.826DF13841FE@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 13:45:31 2008 New Revision: 17861 Modified: branches/yali4/yali4/filesystem.py branches/yali4/yali4/storage.py branches/yali4/yali4/sysutils.py Log: * Please wait while resizing.. Modified: branches/yali4/yali4/filesystem.py ================================================================= --- branches/yali4/yali4/filesystem.py (original) +++ branches/yali4/yali4/filesystem.py Thu May 1 13:45:31 2008 @@ -211,8 +211,7 @@ cmd_path = sysutils.find_executable("dumpe2fs") if not cmd_path: - e = "Command not found to get information about %s" %(partition) - raise FSError, e + raise FSError, "Command not found to get information about %s" % (partition.getPath()) lines = os.popen("%s -h %s" % (cmd_path, partition.getPath())).readlines() @@ -227,17 +226,16 @@ cmd_path = sysutils.find_executable("e2fsck") if not cmd_path: - e = "Command not found to resize %s filesystem" %(self.name()) - raise FSError, e + raise FSError, "Command not found to resize %s filesystem" % (self.name()) - cmd = "%s -f %s" % (cmd_path, partition.getPath()) + res = sysutils.execClear("e2fsck", + ["-f", "-p", "-C", "0", partition.getPath()], + stdout="/tmp/resize.log", + stderr="/tmp/resize.log") + + if res >= 4: + raise FSError, "FSCheck failed on %s" % (partition.getPath()) - try: - p = os.popen(cmd) - o = p.readlines() - p.close() - except: - return False return True def resize(self, size_mb, partition): @@ -248,20 +246,16 @@ cmd_path = sysutils.find_executable("resize2fs") if not cmd_path: - e = "Command not found to resize %s filesystem" %(self.name()) - raise FSError, e + raise FSError, "Command not found to resize %s filesystem" % (self.name()) - cmd = "%s %s %sM" % (cmd_path, partition.getPath(), str(size_mb)) + res = sysutils.execClear("resize2fs", + ["-f", partition.getPath(), "%sM" %(size_mb)], + stdout="/tmp/resize.log", + stderr="/tmp/resize.log") + if res: + raise FSError, "Resize failed on %s" % (partition.getPath()) - if self.preResize(partition): - try: - p = os.popen(cmd) - o = p.readlines() - p.close() - except: - return False - return True - return False + return True def getLabel(self, partition): return sysutils.e2fslabel(partition.getPath()) @@ -439,7 +433,7 @@ self.setImplemented(True) def check_resize(self, size_mb, partition): - #don't do anything, just check + # don't do anything, just check cmd = "/usr/sbin/ntfsresize -n -f -s %dM %s" %(size_mb, partition.getPath()) p = os.popen(cmd) if p.close(): @@ -449,13 +443,19 @@ def resize(self, size_mb, partition): if size_mb < self.minResizeMB(partition): return False - cmd = "/usr/sbin/ntfsresize -f -s %dM %s" %(size_mb, partition.getPath()) - try: - p = os.popen(cmd, "w") - p.write("y\n") - p.close() - except: - return False + + p = os.pipe() + os.write(p[1], "y\n") + os.close(p[1]) + + res = sysutils.execClear("ntfsresize", + ["-f","-s", "%sM" % (size_mb), partition.getPath()], + stdin = p[0], + stdout = "/tmp/resize.log", + stderr = "/tmp/resize.log") + if res: + raise FSError, "Resize failed on %s " % (partition.getPath()) + return True def setLabel(self, partition, label): Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Thu May 1 13:45:31 2008 @@ -23,6 +23,7 @@ import parted import os import glob +import time import struct import binascii @@ -460,7 +461,7 @@ ptype = PARTITION_LOGICAL else: ptype = PARTITION_PRIMARY - + time.sleep(3) self.deletePartition(part) self.commit() np = self.addPartitionFromStart(ptype, fs_name, start, size_mb) Modified: branches/yali4/yali4/sysutils.py ================================================================= --- branches/yali4/yali4/sysutils.py (original) +++ branches/yali4/yali4/sysutils.py Thu May 1 13:45:31 2008 @@ -148,6 +148,67 @@ umount(consts.target_dir) fastreboot() +# Shamelessly stolen from Anaconda :) +def execClear(command, argv, stdin = 0, stdout = 1, stderr = 2): + import yali4.gui.context as ctx + + argv = list(argv) + if type(stdin) == type("string"): + if os.access(stdin, os.R_OK): + stdin = open(stdin) + else: + stdin = 0 + if type(stdout) == type("string"): + stdout = open(stdout, "w") + if type(stderr) == type("string"): + stderr = open(stderr, "w") + if stdout is not None and type(stdout) != int: + stdout.write("Running... %s\n" %([command] + argv,)) + + p = os.pipe() + childpid = os.fork() + if not childpid: + os.close(p[0]) + os.dup2(p[1], 1) + os.dup2(stderr.fileno(), 2) + os.dup2(stdin, 0) + os.close(stdin) + os.close(p[1]) + stderr.close() + + os.execvp(command, [command] + argv) + os._exit(1) + + os.close(p[1]) + + while 1: + try: + s = os.read(p[0], 1) + except OSError, args: + (num, str) = args + if (num != 4): + raise IOError, args + + stdout.write(s) + ctx.mainScreen.processEvents() + + if len(s) < 1: + break + + try: + (pid, status) = os.waitpid(childpid, 0) + except OSError, (num, msg): + ctx.debugger.log("exception from waitpid: %s %s" %(num, msg)) + + if status is None: + return 0 + + if os.WIFEXITED(status): + return os.WEXITSTATUS(status) + + return 1 + + ## Run an external program and capture standard out. # @param command The command to run. # @param argv A list of arguments. From uludag-commits at pardus.org.tr Thu May 1 14:44:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 14:44:40 +0300 (EEST) Subject: [Uludag-commits] r17862 - branches/yali4/yali4/gui Message-ID: <20080501114441.102B313841E7@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 14:44:40 2008 New Revision: 17862 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * typo :( Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Thu May 1 14:44:40 2008 @@ -280,7 +280,7 @@ dev_path = root_part_req.partition().getPath() if dev_path.find("cciss") > 0: # HP Smart array controller (something like /dev/cciss/c0d0p1) - ctx.installData.bootLoaderDev = basename(dev_path)[:-2] + ctx.installData.bootLoaderDev = dev_path[:-2] else: ctx.installData.bootLoaderDev = str(filter(lambda u: not u.isdigit(), basename(dev_path))) From uludag-commits at pardus.org.tr Thu May 1 15:16:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 15:16:27 +0300 (EEST) Subject: [Uludag-commits] r17863 - trunk/comar/comar/etc Message-ID: <20080501121627.518A91384200@liste.pardus.org.tr> Author: faik Date: Thu May 1 15:16:27 2008 New Revision: 17863 Modified: trunk/comar/comar/etc/model.xml Log: no access_label for now Modified: trunk/comar/comar/etc/model.xml ================================================================= --- trunk/comar/comar/etc/model.xml (original) +++ trunk/comar/comar/etc/model.xml Thu May 1 15:16:27 2008 @@ -451,46 +451,46 @@ - + - + - + - + - - + + - + - + - + - + - + - + - + - + From uludag-commits at pardus.org.tr Thu May 1 16:20:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:20:27 +0300 (EEST) Subject: [Uludag-commits] r17864 - branches/buildfarm-devel Message-ID: <20080501132027.3E4262474012@liste.pardus.org.tr> Author: caglar Date: Thu May 1 16:20:26 2008 New Revision: 17864 Modified: branches/buildfarm-devel/config.py branches/buildfarm-devel/main.py Log: horrible hack for seperating -debug packages from main repository Modified: branches/buildfarm-devel/config.py ================================================================= --- branches/buildfarm-devel/config.py (original) +++ branches/buildfarm-devel/config.py Thu May 1 16:20:26 2008 @@ -15,6 +15,7 @@ workDir = "/var/pisi/" outputDir = "/var/cache/pisi/buildlogs/" binaryPath = "/var/cache/pisi/packages/" +binaryDebugPath = "/var/cache/pisi/packages-debug/" localPspecRepo = "%s/exampleRepo" % os.getcwd() logFile = "/var/cache/pisi/buildfarm.log" Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Thu May 1 16:20:26 2008 @@ -25,6 +25,7 @@ import mailer import qmanager import pisiinterface +import pisi.util """ Gettext Support """ import gettext @@ -69,6 +70,9 @@ try: try: (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) + print + print newBinaryPackages, oldBinaryPackages + print except Exception, e: qmgr.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) @@ -102,17 +106,18 @@ mailer.info(_("Queue finished without a problem!...\n\n\nNew binary packages are;\n\n%s\n\nnow in repository...") % "\n".join(packageList)) logger.raw() + generateIndex(config.binaryPath) + generateIndex(config.binaryDebugPath) + +def generateIndex(repositoryPath = config.binaryPath): logger.raw() logger.info(_("Generating PiSi Index...")) current = os.getcwd() - os.chdir(config.binaryPath) + os.chdir(repositoryPath) os.system("/usr/bin/pisi index %s . --skip-signing --skip-sources" % config.localPspecRepo) logger.info(_("PiSi Index generated...")) - #FIXME: will be enableb after some internal tests - #os.system("rsync -avze ssh --delete . pisi.pardus.org.tr:/var/www/paketler.uludag.org.tr/htdocs/pardus-1.1/") - # Check packages containing binaries and libraries broken by any package update os.system("/usr/bin/revdep-rebuild --force") # FIXME: if there is any broken package, mail /root/.revdep-rebuild.4_names file @@ -150,37 +155,49 @@ remove = os.remove copy = shutil.copy - def moveOldPackage(package): + def moveOldPackage(package, debug = False): logger.info(_("*** Old package '%s' is processing") % (package)) if exists(join(config.binaryPath, package)): - remove(join(config.binaryPath, package)) + if debug: + remove(join(config.binaryDebugPath, package)) + else: + remove(join(config.binaryPath, package)) if exists(join(config.workDir, package)): remove(join(config.workDir, package)) - def moveNewPackage(package): + def moveNewPackage(package, debug = False): logger.info(_("*** New package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) - def moveUnchangedPackage(package): + def moveUnchangedPackage(package, debug = False): logger.info(_("*** Unchanged package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) for package in newPackages: if package: - moveNewPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveNewPackage(package, isDebug) for package in oldPackages: if package: - moveOldPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveOldPackage(package, isDebug) for package in unchangedPackages: if package: - moveUnchangedPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveUnchangedPackage(package, isDebug) def removeBinaryPackageFromWorkDir(package): join = os.path.join @@ -190,6 +207,7 @@ def create_directories(): directories = [config.workDir, config.binaryPath, + config.binaryDebugPath, config.localPspecRepo, config.outputDir] From uludag-commits at pardus.org.tr Thu May 1 16:23:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:23:00 +0300 (EEST) Subject: [Uludag-commits] r17865 - branches/buildfarm-devel Message-ID: <20080501132300.795A91384205@liste.pardus.org.tr> Author: caglar Date: Thu May 1 16:23:00 2008 New Revision: 17865 Modified: branches/buildfarm-devel/main.py Log: ignore Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Thu May 1 16:23:00 2008 @@ -70,9 +70,6 @@ try: try: (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) - print - print newBinaryPackages, oldBinaryPackages - print except Exception, e: qmgr.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) From uludag-commits at pardus.org.tr Thu May 1 16:39:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:39:00 +0300 (EEST) Subject: [Uludag-commits] r17866 - trunk/pisi/licenses Message-ID: <20080501133900.78C7E138420B@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 1 16:39:00 2008 New Revision: 17866 Added: trunk/pisi/licenses/xiph Log: add xiph license From uludag-commits at pardus.org.tr Thu May 1 16:40:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:40:34 +0300 (EEST) Subject: [Uludag-commits] r17867 - trunk/pisi Message-ID: <20080501134034.EF6FE138420B@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 1 16:40:34 2008 New Revision: 17867 Modified: trunk/pisi/pisi-spec.rng Log: add xiph license Modified: trunk/pisi/pisi-spec.rng ================================================================= --- trunk/pisi/pisi-spec.rng (original) +++ trunk/pisi/pisi-spec.rng Thu May 1 16:40:34 2008 @@ -988,6 +988,7 @@ xhost xineramaproto xinit + xiph xkbcomp xkbdata xkbevd From uludag-commits at pardus.org.tr Thu May 1 16:44:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:44:59 +0300 (EEST) Subject: [Uludag-commits] r17868 - in branches/yali4/yali4: gui/Ui gui/pics images Message-ID: <20080501134500.050C1138420B@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 16:44:59 2008 New Revision: 17868 Modified: branches/yali4/yali4/gui/Ui/main.ui branches/yali4/yali4/gui/pics/backardus.png branches/yali4/yali4/gui/pics/helpBack.png branches/yali4/yali4/gui/pics/logo.png branches/yali4/yali4/gui/pics/pardus.png branches/yali4/yali4/gui/pics/welcome.png branches/yali4/yali4/images/checkbox_checked.png branches/yali4/yali4/images/checkbox_checked_hover.png branches/yali4/yali4/images/checkbox_checked_pressed.png branches/yali4/yali4/images/checkbox_unchecked.png branches/yali4/yali4/images/checkbox_unchecked_hover.png branches/yali4/yali4/images/checkbox_unchecked_pressed.png branches/yali4/yali4/images/down_arrow.png branches/yali4/yali4/images/down_arrow_disabled.png branches/yali4/yali4/images/pushbutton.png branches/yali4/yali4/images/pushbutton_hover.png branches/yali4/yali4/images/pushbutton_pressed.png branches/yali4/yali4/images/radiobutton_checked.png branches/yali4/yali4/images/radiobutton_checked_hover.png branches/yali4/yali4/images/radiobutton_checked_pressed.png branches/yali4/yali4/images/radiobutton_unchecked.png branches/yali4/yali4/images/radiobutton_unchecked_hover.png branches/yali4/yali4/images/radiobutton_unchecked_pressed.png branches/yali4/yali4/images/spindown.png branches/yali4/yali4/images/spindown_hover.png branches/yali4/yali4/images/spindown_off.png branches/yali4/yali4/images/spindown_pressed.png branches/yali4/yali4/images/spinup.png branches/yali4/yali4/images/spinup_hover.png branches/yali4/yali4/images/spinup_off.png branches/yali4/yali4/images/spinup_pressed.png branches/yali4/yali4/images/up_arrow.png branches/yali4/yali4/images/up_arrow_disabled.png Log: * New theme, shiny colors, new logo .. oscar goes to Gokhaan .. Modified: branches/yali4/yali4/gui/Ui/main.ui ================================================================= --- branches/yali4/yali4/gui/Ui/main.ui (original) +++ branches/yali4/yali4/gui/Ui/main.ui Thu May 1 16:44:59 2008 @@ -16,7 +16,7 @@ #YaliMain { background-image:url(':/gui/pics/backardus.png') } - +/* QStackedWidget#mainStack { border-style: outset; border-width: 2px; @@ -24,18 +24,18 @@ border-color: beige; background-image:url(':/gui/pics/trans.png'); } - +*/ QTextBrowser#helpContent { - border-style: outset; border-width: 2px; border-top-right-radius:8px; border-bottom-right-radius:8px; border-color: beige; border-left:none; background-image:url(':/gui/pics/helpBack.png'); + background-repeat:no-repeat; padding:5px; padding-top:7px; - font: 8px; + font: 9px; } /* Make text in message boxes selectable. */ Modified: branches/yali4/yali4/gui/pics/backardus.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/helpBack.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/logo.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/pardus.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/welcome.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/down_arrow.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/down_arrow_disabled.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_off.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_off.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/up_arrow.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/up_arrow_disabled.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Thu May 1 19:36:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 19:36:21 +0300 (EEST) Subject: [Uludag-commits] r17869 - in trunk/sysinfo/sysinfo/about: . images Message-ID: <20080501163621.90CA2138420B@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 19:36:21 2008 New Revision: 17869 Modified: trunk/sysinfo/sysinfo/about/images/background.png trunk/sysinfo/sysinfo/about/style.css Log: * 2008 Theme. Modified: trunk/sysinfo/sysinfo/about/images/background.png ================================================================= Binary files. No diff available. Modified: trunk/sysinfo/sysinfo/about/style.css ================================================================= --- trunk/sysinfo/sysinfo/about/style.css (original) +++ trunk/sysinfo/sysinfo/about/style.css Thu May 1 19:36:21 2008 @@ -11,7 +11,7 @@ letter-spacing: .1em; color: #fff; margin-left: 180px; - margin-top:30px; + margin-top:37px; } body>h3 { @@ -19,7 +19,7 @@ padding: 0px 0px 5px 180px; font-size: 9pt; font-weight: normal; - letter-spacing: .2em; + letter-spacing: .1em; } div#container1 { From uludag-commits at pardus.org.tr Fri May 2 00:35:42 2008 From: uludag-commits at pardus.org.tr (VIAGRA ® Official Site) Date: Fri, 2 May 2008 00:35:42 +0300 (EEST) Subject: [Uludag-commits] Dear uludag-commits@pardus.org.tr May 86% 0FF Message-ID: <20080502043542.2998.qmail@x1w45yhuxqmbhja> Bir HTML eklentisi temizlendi... URL: http://liste.pardus.org.tr/uludag-commits/attachments/20080502/cd75c830/attachment.htm From uludag-commits at pardus.org.tr Fri May 2 03:25:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 03:25:13 +0300 (EEST) Subject: [Uludag-commits] r17870 - trunk/comar/mudur/po Message-ID: <20080502002513.31D2E247400D@liste.pardus.org.tr> Author: mustafaoe Date: Fri May 2 03:25:12 2008 New Revision: 17870 Modified: trunk/comar/mudur/po/de.po Log: German translations updated Modified: trunk/comar/mudur/po/de.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Fri May 2 09:39:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 09:39:28 +0300 (EEST) Subject: [Uludag-commits] r17871 - trunk/pisi/pisi Message-ID: <20080502063928.B71F61384195@liste.pardus.org.tr> Author: faik Date: Fri May 2 09:39:28 2008 New Revision: 17871 Modified: trunk/pisi/pisi/signalhandler.py Log: This is for manager.py for where oldhandler is None. Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 09:39:28 2008 @@ -38,7 +38,7 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldhandler = self.signals[sig].oldhandler + oldhandler = self.signals[sig].oldhandler if self.signals[sig].oldhandler else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] signal.signal(sig, oldhandler) From uludag-commits at pardus.org.tr Fri May 2 09:40:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 09:40:44 +0300 (EEST) Subject: [Uludag-commits] r17872 - trunk/pisi/pisi Message-ID: <20080502064044.BFC5213841AD@liste.pardus.org.tr> Author: faik Date: Fri May 2 09:40:44 2008 New Revision: 17872 Modified: trunk/pisi/pisi/signalhandler.py Log: make it readable Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 09:40:44 2008 @@ -38,7 +38,8 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldhandler = self.signals[sig].oldhandler if self.signals[sig].oldhandler else signal.SIG_DFL + oldie = self.signals[sig].oldhandler + oldhandler = oldie if oldie else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] signal.signal(sig, oldhandler) From uludag-commits at pardus.org.tr Fri May 2 11:00:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 11:00:42 +0300 (EEST) Subject: [Uludag-commits] r17873 - trunk/pisi/pisi/operations Message-ID: <20080502080042.B098F13841F0@liste.pardus.org.tr> Author: faik Date: Fri May 2 11:00:42 2008 New Revision: 17873 Modified: trunk/pisi/pisi/operations/history.py Log: Sistem Hatası: Program Sonlandırıldı. : need more than 2 values to unpack Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/bin/pisi", line 80, in cli.run_command() File "/usr/lib/pardus/pisi/cli/pisicli.py", line 136, in run_command self.command.run() File "/usr/lib/pardus/pisi/cli/history.py", line 89, in run self.takeback(opno) File "/usr/lib/pardus/pisi/cli/history.py", line 60, in takeback pisi.api.takeback(operation) File "/usr/lib/pardus/pisi/api.py", line 348, in takeback pisi.operations.history.takeback(operation) File "/usr/lib/pardus/pisi/operations/history.py", line 120, in takeback beinstalled, beremoved, configs = __listactions(actions) File "/usr/lib/pardus/pisi/operations/history.py", line 44, in __listactions action, pkginfo, operation = actions[pkg] Modified: trunk/pisi/pisi/operations/history.py ================================================================= --- trunk/pisi/pisi/operations/history.py (original) +++ trunk/pisi/pisi/operations/history.py Fri May 2 11:00:42 2008 @@ -104,7 +104,7 @@ if pkg.operation in ["upgrade", "downgrade", "remove"]: actions[pkg.name] = ("install", pkg.before, operation.no) if pkg.operation == "install": - actions[pkg.name] = ("remove", None) + actions[pkg.name] = ("remove", None, operation.no) return actions From uludag-commits at pardus.org.tr Fri May 2 11:31:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 11:31:07 +0300 (EEST) Subject: [Uludag-commits] r17874 - trunk/comar/comar/etc Message-ID: <20080502083108.40F5A13840BD@liste.pardus.org.tr> Author: faik Date: Fri May 2 11:31:07 2008 New Revision: 17874 Modified: trunk/comar/comar/etc/model.xml Log: notify -> status Modified: trunk/comar/comar/etc/model.xml ================================================================= --- trunk/comar/comar/etc/model.xml (original) +++ trunk/comar/comar/etc/model.xml Fri May 2 11:31:07 2008 @@ -498,7 +498,7 @@ - + From uludag-commits at pardus.org.tr Fri May 2 12:05:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 12:05:24 +0300 (EEST) Subject: [Uludag-commits] r17875 - trunk/tasma/package-manager/src Message-ID: <20080502090524.8C2EB1384222@liste.pardus.org.tr> Author: faik Date: Fri May 2 12:05:23 2008 New Revision: 17875 Modified: trunk/tasma/package-manager/src/ComarIface.py trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/MainWidget.py Log: On going comar 2.0 changes Modified: trunk/tasma/package-manager/src/ComarIface.py ================================================================= --- trunk/tasma/package-manager/src/ComarIface.py (original) +++ trunk/tasma/package-manager/src/ComarIface.py Fri May 2 12:05:23 2008 @@ -11,6 +11,7 @@ # Please read the COPYING file from qt import QMutex, SIGNAL +from kdeui import KMessageBox # DBus import dbus @@ -19,10 +20,10 @@ from handler import CallHandler class ComarIface: - def __init__(self): + def __init__(self, handler=None): + self.handler = handler # tray and package-manager synchronization self.com_lock = QMutex() - # setup dbus stuff self.setupBusses() self.setupSignals() @@ -42,22 +43,27 @@ def handleSignals(self, *args, **kwargs): signal = kwargs["signal"] # use args here - pass + if self.handler: + self.handler(signal, args) def busError(self, exception): - KMessageBox.error(self, str(exception), i18n("D-Bus Error")) + KMessageBox.error(self, str(exception), "D-Bus Error") self.setupBusses() + def comarAuthError(self, exception): + KMessageBox.error(self, str(exception), "COMAR Auth Error") + def comarError(self, exception): - KMessageBox.error(self, str(exception), i18n("COMAR Error")) + KMessageBox.error(self, str(exception), "COMAR Error") def callMethod(self, method, action, handler, *args): + print "Method: %s Action: %s" % (method, action) ch = CallHandler("pisi", "System.Manager", method, action, self.sysBus, self.sesBus) ch.registerError(self.comarError) - ch.registerAuthError(self.comarError) + ch.registerAuthError(self.comarAuthError) ch.registerDBusError(self.busError) if handler: Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Fri May 2 12:05:23 2008 @@ -22,69 +22,58 @@ class Commander(QObject): def __init__(self, parent): QObject.__init__(self) - self.parent = parent - try: - self.comar = ComarIface.ComarIface() + self.comar = ComarIface.ComarIface(self.handler) except: parent.showErrorMessage("Cannot connect to Comar daemon") - def wait_comar(self): - # FIXME - return True - - def slotComar(self, sock): - try: - reply = self.comar.com.read_cmd() - except: - if not self.wait_comar(): - self.comar.com_lock.unlock() - self.parent.showErrorMessage(i18n("Can't connect to Comar daemon")) - self.parent.resetState() - self.parent.refreshState() - else: - self.comar = ComarIface.ComarIface() - return - - if reply.command == "notify": - (notification, script, data) = (reply.notify, reply.script, reply.data) - data = unicode(data) + def handler(self, signal, data): + print "Signal: ", signal + print "Data: ", data + if signal == "finished": + command = data[0] + self.comar.com_lock.unlock() + self.parent.finished(command) + elif signal == "progress": + self.parent.displayProgress(data) + elif signal == "notify": + notification = data[0] + args = data[1:] if len(data) > 1 else None if notification == "System.Manager.error": self.comar.com_lock.unlock() - self.parent.showErrorMessage(data) + self.parent.showErrorMessage(args) self.parent.resetState() self.parent.refreshState() elif notification == "System.Manager.notify": - self.parent.pisiNotify(data) - elif notification == "System.Manager.progress": - self.parent.displayProgress(data) + self.parent.pisiNotify(args) elif notification == "System.Manager.finished": self.comar.com_lock.unlock() - self.parent.finished(data) + self.parent.finished(args) elif notification == "System.Manager.updatingRepo": pass elif notification == "System.Manager.warning": self.comar.com_lock.unlock() - self.parent.showWarningMessage(data) + self.parent.showWarningMessage(args) self.parent.resetState() self.parent.refreshState() else: - print "Got notification : %s , for script : %s , with data : %s" % (notification, script, data) + print "Got notification : %s with data : %s" % (signal, data) + # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If # some misbehaviour is seen, comar.log is always there to look. - elif reply.command == "error": + elif signal == "error": self.comar.com_lock.unlock() self.parent.finished("System.Manager.cancelled") return - elif reply.command == "denied": + elif signal == "denied": self.comar.com_lock.unlock() self.parent.finished("System.Manager.cancelled") self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) - elif reply.command == "fail": - if reply.data == "System.Manager.cancelled": + elif signal == "fail": + if data == "System.Manager.cancelled": self.comar.com_lock.unlock() - self.parent.finished(reply.data) + self.parent.finished(data) return self.comar.com_lock.unlock() @@ -92,9 +81,10 @@ self.parent.resetState() self.parent.refreshState() + #FIXME: What replaces this in new Comar api # do not show any error if it is the interval check - if not reply.id == ID_TRAY_INTERVAL_CHECK: - self.parent.showErrorMessage(unicode(reply.data)) + # if not reply.id == ID_TRAY_INTERVAL_CHECK: + # self.parent.showErrorMessage(unicode(reply.data)) # if an error occured communicating with comar and components are not ready we should warn if not PisiIface.get_components(): @@ -170,6 +160,7 @@ self.comar.setCache(enabled, limit) def checkCacheLimits(self): + print "checkCacheLimits called" config = PisiIface.read_config("/etc/pisi/pisi.conf") cache = config.get("general", "package_cache") Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Fri May 2 12:05:23 2008 @@ -585,7 +585,6 @@ self.componentsList.setSelected(self.componentsList.firstChild(),True) def displayProgress(self, data): - data = data.split(",") operation = data[0] if operation in ["updatingrepo", "rebuilding-db"]: @@ -626,7 +625,7 @@ self.progressDialog.totalSize = int(data[1]) - int(data[2]) self.progressDialog.updateTotalOperationPercent() self.progressDialog.updateStatus() - + elif operation in ["installing"]: self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) self.progressDialog.updatePackageInfo() @@ -678,8 +677,7 @@ PisiIface.reloadPisi() # after every operation check package cache limits - if command not in ["System.Manager.clearCache", - "System.Manager.setRepositories"]: + if command not in ["System.Manager.clearCache", "System.Manager.setRepositories"]: self.command.checkCacheLimits() self.basket.empty() From uludag-commits at pardus.org.tr Fri May 2 14:59:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 14:59:52 +0300 (EEST) Subject: [Uludag-commits] r17876 - trunk/tasma/package-manager/src Message-ID: <20080502115952.8EAF4138418C@liste.pardus.org.tr> Author: faik Date: Fri May 2 14:59:52 2008 New Revision: 17876 Modified: trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/MainWidget.py Log: comar 2.0 changes continues Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Fri May 2 14:59:52 2008 @@ -31,68 +31,63 @@ def handler(self, signal, data): print "Signal: ", signal print "Data: ", data + args = data[1:] if len(data) > 1 else None + if signal == "finished": command = data[0] self.comar.com_lock.unlock() self.parent.finished(command) elif signal == "progress": self.parent.displayProgress(data) - elif signal == "notify": - notification = data[0] - args = data[1:] if len(data) > 1 else None - if notification == "System.Manager.error": - self.comar.com_lock.unlock() - self.parent.showErrorMessage(args) - self.parent.resetState() - self.parent.refreshState() - elif notification == "System.Manager.notify": - self.parent.pisiNotify(args) - elif notification == "System.Manager.finished": - self.comar.com_lock.unlock() - self.parent.finished(args) - elif notification == "System.Manager.updatingRepo": - pass - elif notification == "System.Manager.warning": - self.comar.com_lock.unlock() - self.parent.showWarningMessage(args) - self.parent.resetState() - self.parent.refreshState() - else: - print "Got notification : %s with data : %s" % (signal, data) - - # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If - # some misbehaviour is seen, comar.log is always there to look. elif signal == "error": self.comar.com_lock.unlock() - self.parent.finished("System.Manager.cancelled") - return - elif signal == "denied": - self.comar.com_lock.unlock() - self.parent.finished("System.Manager.cancelled") - self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) - elif signal == "fail": - if data == "System.Manager.cancelled": - self.comar.com_lock.unlock() - self.parent.finished(data) - return - + self.parent.showErrorMessage(args) + self.parent.resetState() + self.parent.refreshState() + elif signal == "status": + operation = data[0] + self.parent.pisiNotify(operation, args) + elif notification == "warning": self.comar.com_lock.unlock() - self.parent.finished() + self.parent.showWarningMessage(args) self.parent.resetState() self.parent.refreshState() - - #FIXME: What replaces this in new Comar api - # do not show any error if it is the interval check - # if not reply.id == ID_TRAY_INTERVAL_CHECK: - # self.parent.showErrorMessage(unicode(reply.data)) - - # if an error occured communicating with comar and components are not ready we should warn - if not PisiIface.get_components(): - self.parent.repoNotReady() else: - # paranoia - self.comar.com_lock.unlock() - pass + print "Got notification : %s with data : %s" % (signal, data) + +# # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If +# # some misbehaviour is seen, comar.log is always there to look. +# elif signal == "error": +# self.comar.com_lock.unlock() +# self.parent.finished("System.Manager.cancelled") +# return +# elif signal == "denied": +# self.comar.com_lock.unlock() +# self.parent.finished("System.Manager.cancelled") +# self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) +# elif signal == "fail": +# if data == "System.Manager.cancelled": +# self.comar.com_lock.unlock() +# self.parent.finished(data) +# return + +# self.comar.com_lock.unlock() +# self.parent.finished() +# self.parent.resetState() +# self.parent.refreshState() + +# #FIXME: What replaces this in new Comar api +# # do not show any error if it is the interval check +# # if not reply.id == ID_TRAY_INTERVAL_CHECK: +# # self.parent.showErrorMessage(unicode(reply.data)) + +# # if an error occured communicating with comar and components are not ready we should warn +# if not PisiIface.get_components(): +# self.parent.repoNotReady() +# else: +# # paranoia +# self.comar.com_lock.unlock() +# pass def startUpdate(self, repo = None, id=0): if repo is None: Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Fri May 2 14:59:52 2008 @@ -586,7 +586,6 @@ def displayProgress(self, data): operation = data[0] - if operation in ["updatingrepo", "rebuilding-db"]: self.progressDialog.setOperationDescription(i18n(str(data[2]))) percent = data[1] @@ -607,31 +606,29 @@ self.progressDialog.updateTotalDownloaded(pkgDownSize=data[5], pkgTotalSize=data[6]) self.progressDialog.updateTotalOperationPercent() - def pisiNotify(self, data): - data = data.split(",") - operation = data[0] + def pisiNotify(self, operation, args): # operation is now cancellable if operation in ["started"]: self.progressDialog.enableCancel() elif operation in ["removing"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) self.progressDialog.updatePackageInfo() elif operation in ["cached"]: # progressDialog.totalSize is the to be downloaded size by package-manager. # And that is (totalDownloadSize - alreadyCachedSize) - self.progressDialog.totalSize = int(data[1]) - int(data[2]) + self.progressDialog.totalSize = int(args[0]) - int(args[1]) self.progressDialog.updateTotalOperationPercent() self.progressDialog.updateStatus() elif operation in ["installing"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) self.progressDialog.updatePackageInfo() elif operation in ["extracting", "configuring"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) elif operation in ["removed", "installed", "upgraded"]: # Bug 4030 @@ -650,7 +647,7 @@ elif operation in ["updatingrepo"]: self.progressDialog.setCurrentOperation(i18n("Updating Repository")) - self.progressDialog.setOperationDescription(i18n('Downloading package list of %1').arg(data[1])) + self.progressDialog.setOperationDescription(i18n('Downloading package list of %1').arg(args[0])) def showWarningMessage(self, message, warning=None): if not warning: From uludag-commits at pardus.org.tr Fri May 2 15:47:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 15:47:51 +0300 (EEST) Subject: [Uludag-commits] r17877 - trunk/tasma/package-manager/src Message-ID: <20080502124751.6910413841F6@liste.pardus.org.tr> Author: faik Date: Fri May 2 15:47:50 2008 New Revision: 17877 Modified: trunk/tasma/package-manager/src/Globals.py Log: dont know why but should be fixed later Modified: trunk/tasma/package-manager/src/Globals.py ================================================================= --- trunk/tasma/package-manager/src/Globals.py (original) +++ trunk/tasma/package-manager/src/Globals.py Fri May 2 15:47:50 2008 @@ -40,5 +40,7 @@ packageToInstall = pack def processEvents(): + return + #FIXME: package-manager freezes after this if app: app.processEvents(QEventLoop.ExcludeUserInput) From uludag-commits at pardus.org.tr Fri May 2 16:42:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:42:51 +0300 (EEST) Subject: [Uludag-commits] r17878 - trunk/pisi/pisi Message-ID: <20080502134251.A947B13841FB@liste.pardus.org.tr> Author: faik Date: Fri May 2 16:42:51 2008 New Revision: 17878 Modified: trunk/pisi/pisi/signalhandler.py Log: alright no 2.5 syntax Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 16:42:51 2008 @@ -38,11 +38,9 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldie = self.signals[sig].oldhandler - oldhandler = oldie if oldie else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] - signal.signal(sig, oldhandler) + signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) if pending: raise exception[sig] From uludag-commits at pardus.org.tr Fri May 2 16:56:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:56:50 +0300 (EEST) Subject: [Uludag-commits] r17879 - trunk/tasma/tasma/applnk/desktop Message-ID: <20080502135650.9DDE9138421F@liste.pardus.org.tr> Author: pinar Date: Fri May 2 16:56:49 2008 New Revision: 17879 Removed: trunk/tasma/tasma/applnk/desktop/tasmagtk.desktop Log: remove tasmagtk.desktop. it's in gtk-qt-engine now. From uludag-commits at pardus.org.tr Fri May 2 16:57:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:57:21 +0300 (EEST) Subject: [Uludag-commits] r17880 - trunk/tasma/tasma/applnk/desktop Message-ID: <20080502135721.E49E01384221@liste.pardus.org.tr> Author: pinar Date: Fri May 2 16:57:21 2008 New Revision: 17880 Added: trunk/tasma/tasma/applnk/desktop/tasmadesktopbehavior.desktop Modified: trunk/tasma/tasma/applnk/desktop/CMakeLists.txt Log: BUG:FIXED:7026 Modified: trunk/tasma/tasma/applnk/desktop/CMakeLists.txt ================================================================= --- trunk/tasma/tasma/applnk/desktop/CMakeLists.txt (original) +++ trunk/tasma/tasma/applnk/desktop/CMakeLists.txt Fri May 2 16:57:21 2008 @@ -10,12 +10,12 @@ tasmacomponentchooser.desktop tasmacrypto.desktop tasmadesktop.desktop + tasmadesktopbehavior.desktop tasmadesktoppath.desktop tasmadisplay.desktop tasmafiletypes.desktop tasmafonts.desktop tasmafontinstaller.desktop - tasmagtk.desktop tasmaicons.desktop tasmajoystick.desktop tasmakamera.desktop From uludag-commits at pardus.org.tr Fri May 2 19:58:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 19:58:27 +0300 (EEST) Subject: [Uludag-commits] r17881 - in trunk/tasma/tasma: . src Message-ID: <20080502165827.EBF6213841F0@liste.pardus.org.tr> Author: pinar Date: Fri May 2 19:58:27 2008 New Revision: 17881 Modified: trunk/tasma/tasma/AUTHORS trunk/tasma/tasma/src/main.cpp Log: update about data Modified: trunk/tasma/tasma/AUTHORS ================================================================= --- trunk/tasma/tasma/AUTHORS (original) +++ trunk/tasma/tasma/AUTHORS Fri May 2 19:58:27 2008 @@ -1,8 +1,9 @@ Current Maintainer: -İsmail Dönmez +Pınar Yanardağ -Old Maintainer: +Old Maintainers: +İsmail Dönmez Barış Metin TV Module Maintainer: Modified: trunk/tasma/tasma/src/main.cpp ================================================================= --- trunk/tasma/tasma/src/main.cpp (original) +++ trunk/tasma/tasma/src/main.cpp Fri May 2 19:58:27 2008 @@ -59,7 +59,7 @@ int main( int argc, char *argv[] ) { KLocale::setMainCatalogue( "tasma" ); - KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.2", + KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.3", I18N_NOOP( "Pardus Configuration Center" ), KAboutData::License_GPL, I18N_NOOP( "(c) 2005-2008, TUBITAK - UEKAE" ) ); aboutData.addAuthor( "Pınar Yanardağ", I18N_NOOP( "Current Maintainer" ), "pinar at pardus.org.tr" ); From uludag-commits at pardus.org.tr Fri May 2 20:03:49 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 20:03:49 +0300 (EEST) Subject: [Uludag-commits] r17882 - trunk/tasma/tasma/src Message-ID: <20080502170349.E722E13841F0@liste.pardus.org.tr> Author: pinar Date: Fri May 2 20:03:49 2008 New Revision: 17882 Modified: trunk/tasma/tasma/src/aboutview.cpp trunk/tasma/tasma/src/aboutview.h trunk/tasma/tasma/src/main.cpp trunk/tasma/tasma/src/main.h trunk/tasma/tasma/src/tasmamainwin.cpp trunk/tasma/tasma/src/tasmamainwin.h trunk/tasma/tasma/src/tcategoryview.cpp trunk/tasma/tasma/src/tcategoryview.h trunk/tasma/tasma/src/ticonview.cpp trunk/tasma/tasma/src/ticonview.h trunk/tasma/tasma/src/tlistviewtooltip.cpp trunk/tasma/tasma/src/tlistviewtooltip.h trunk/tasma/tasma/src/tmodulecategorylist.cpp trunk/tasma/tasma/src/tmodulecategorylist.h trunk/tasma/tasma/src/tmodulegroup.cpp trunk/tasma/tasma/src/tmodulegroup.h trunk/tasma/tasma/src/tmoduleview.cpp trunk/tasma/tasma/src/tmoduleview.h Log: remove copyright years. not necessary anymore. Modified: trunk/tasma/tasma/src/aboutview.cpp ================================================================= --- trunk/tasma/tasma/src/aboutview.cpp (original) +++ trunk/tasma/tasma/src/aboutview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/aboutview.h ================================================================= --- trunk/tasma/tasma/src/aboutview.h (original) +++ trunk/tasma/tasma/src/aboutview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/main.cpp ================================================================= --- trunk/tasma/tasma/src/main.cpp (original) +++ trunk/tasma/tasma/src/main.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) 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 @@ -61,7 +61,7 @@ KLocale::setMainCatalogue( "tasma" ); KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.3", I18N_NOOP( "Pardus Configuration Center" ), KAboutData::License_GPL, - I18N_NOOP( "(c) 2005-2008, TUBITAK - UEKAE" ) ); + I18N_NOOP( "(c) TUBITAK - UEKAE" ) ); aboutData.addAuthor( "Pınar Yanardağ", I18N_NOOP( "Current Maintainer" ), "pinar at pardus.org.tr" ); aboutData.addAuthor( "İsmail Dönmez", I18N_NOOP( "Developer" ), "ismail at pardus.org.tr" ); aboutData.addAuthor( "Barış Metin", I18N_NOOP( "Old Maintainer & Original Author" ), "baris at pardus.org.tr" ); Modified: trunk/tasma/tasma/src/main.h ================================================================= --- trunk/tasma/tasma/src/main.h (original) +++ trunk/tasma/tasma/src/main.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tasmamainwin.cpp ================================================================= --- trunk/tasma/tasma/src/tasmamainwin.cpp (original) +++ trunk/tasma/tasma/src/tasmamainwin.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tasmamainwin.h ================================================================= --- trunk/tasma/tasma/src/tasmamainwin.h (original) +++ trunk/tasma/tasma/src/tasmamainwin.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tcategoryview.cpp ================================================================= --- trunk/tasma/tasma/src/tcategoryview.cpp (original) +++ trunk/tasma/tasma/src/tcategoryview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tcategoryview.h ================================================================= --- trunk/tasma/tasma/src/tcategoryview.h (original) +++ trunk/tasma/tasma/src/tcategoryview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/ticonview.cpp ================================================================= --- trunk/tasma/tasma/src/ticonview.cpp (original) +++ trunk/tasma/tasma/src/ticonview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/ticonview.h ================================================================= --- trunk/tasma/tasma/src/ticonview.h (original) +++ trunk/tasma/tasma/src/ticonview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tlistviewtooltip.cpp ================================================================= --- trunk/tasma/tasma/src/tlistviewtooltip.cpp (original) +++ trunk/tasma/tasma/src/tlistviewtooltip.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2008 TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tlistviewtooltip.h ================================================================= --- trunk/tasma/tasma/src/tlistviewtooltip.h (original) +++ trunk/tasma/tasma/src/tlistviewtooltip.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2008 TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tmodulecategorylist.cpp ================================================================= --- trunk/tasma/tasma/src/tmodulecategorylist.cpp (original) +++ trunk/tasma/tasma/src/tmodulecategorylist.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tmodulecategorylist.h ================================================================= --- trunk/tasma/tasma/src/tmodulecategorylist.h (original) +++ trunk/tasma/tasma/src/tmodulecategorylist.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tmodulegroup.cpp ================================================================= --- trunk/tasma/tasma/src/tmodulegroup.cpp (original) +++ trunk/tasma/tasma/src/tmodulegroup.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tmodulegroup.h ================================================================= --- trunk/tasma/tasma/src/tmodulegroup.h (original) +++ trunk/tasma/tasma/src/tmodulegroup.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 Modified: trunk/tasma/tasma/src/tmoduleview.cpp ================================================================= --- trunk/tasma/tasma/src/tmoduleview.cpp (original) +++ trunk/tasma/tasma/src/tmoduleview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE Copyright (c) 1999 Matthias Hoelzer-Kluepfel This program is free software; you can redistribute it and/or modify Modified: trunk/tasma/tasma/src/tmoduleview.h ================================================================= --- trunk/tasma/tasma/src/tmoduleview.h (original) +++ trunk/tasma/tasma/src/tmoduleview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) 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 From uludag-commits at pardus.org.tr Sat May 3 00:19:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 3 May 2008 00:19:55 +0300 (EEST) Subject: [Uludag-commits] r17883 - trunk/tasma/display-manager/src Message-ID: <20080502211955.7C622247400F@liste.pardus.org.tr> Author: pinar Date: Sat May 3 00:19:55 2008 New Revision: 17883 Modified: trunk/tasma/display-manager/src/display-manager.py Log: disable dual mode if there's only one output Modified: trunk/tasma/display-manager/src/display-manager.py ================================================================= --- trunk/tasma/display-manager/src/display-manager.py (original) +++ trunk/tasma/display-manager/src/display-manager.py Sat May 3 00:19:55 2008 @@ -89,6 +89,10 @@ for resolution in self.screenModes[output]: self.comboBoxResolution.insertItem(resolution) + # disable dual mode if there's only one output + if len(self.displayConfiguration.outputs) <= 1: + self.checkBoxDualMode.setEnabled(0) + # remove later. self.displayConfiguration.secondaryScr = "VGA" From uludag-commits at pardus.org.tr Sat May 3 15:28:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 3 May 2008 15:28:29 +0300 (EEST) Subject: [Uludag-commits] r17884 - trunk/pisi/pisi Message-ID: <20080503122829.4938E1384186@liste.pardus.org.tr> Author: caglar Date: Sat May 3 15:28:28 2008 New Revision: 17884 Modified: trunk/pisi/pisi/signalhandler.py Log: caglar at zangetsu ~ $ pisi lu -d DEBUG: InstallDB initialized in 0.192210912704. DEBUG: RepoDB initialized in 0.000102996826172. DEBUG: PackageDB initialized in 1.3199570179. DEBUG: ComponentDB initialized in 0.4158411026. Yükseltilecek paket yok. Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/lib/python2.4/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/pardus/pisi/__init__.py", line 68, in _cleanup ctx.enable_keyboard_interrupts() File "/usr/lib/pardus/pisi/context.py", line 53, in enable_keyboard_interrupts sig and sig.enable_signal(signal.SIGINT) File "/usr/lib/pardus/pisi/signalhandler.py", line 43, in enable_signal signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) KeyError: 2 Error in sys.exitfunc: Sistem Hatası: Program Sonlandırıldı. exceptions.KeyError: 2 Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/lib/python2.4/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/pardus/pisi/__init__.py", line 68, in _cleanup ctx.enable_keyboard_interrupts() File "/usr/lib/pardus/pisi/context.py", line 53, in enable_keyboard_interrupts sig and sig.enable_signal(signal.SIGINT) File "/usr/lib/pardus/pisi/signalhandler.py", line 43, in enable_signal signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Sat May 3 15:28:28 2008 @@ -38,9 +38,13 @@ def enable_signal(self, sig): if sig in self.signals.keys(): + if self.signals[sig].oldhandler: + oldhandler = self.signals[sig].oldhandler + else: + oldhandler = signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] - signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) + signal.signal(sig, oldhandler) if pending: raise exception[sig] From uludag-commits at pardus.org.tr Sun May 4 02:17:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 02:17:52 +0300 (EEST) Subject: [Uludag-commits] r17885 - trunk/tasma/display-manager/src Message-ID: <20080503231752.224891384186@liste.pardus.org.tr> Author: fatih Date: Sun May 4 02:17:51 2008 New Revision: 17885 Modified: trunk/tasma/display-manager/src/displayconfig.py Log: support fglrx Modified: trunk/tasma/display-manager/src/displayconfig.py ================================================================= --- trunk/tasma/display-manager/src/displayconfig.py (original) +++ trunk/tasma/display-manager/src/displayconfig.py Sun May 4 02:17:51 2008 @@ -19,6 +19,23 @@ link = ComarLink() +def fglrxOutputInfo(): + connected_outputs = [] + enabled_outputs = [] + + out, err = capture("aticonfig", "--query-monitor") + + lines = out.splitlines() + for line in lines: + if "Connected monitors" in line: + outputs = line.split(": ")[1] + connected_outputs = outputs.split(", ") + elif "Enabled monitors" in line: + outputs = line.split(": ")[1] + enabled_outputs = outputs.split(", ") + + return connected_outputs, enabled_outputs + class DisplayConfig: def __init__(self): self._rriface = randriface.RandRIface() @@ -26,13 +43,14 @@ self._bus = link.activeDeviceID() self._info = zorg.config.getDeviceInfo(self._bus) - self._flags = self._info.probe_result.get("flags", "").split(",") - self._randr12 = "randr12" in self._flags - self.outputs = self._info.probe_result["outputs"].split(",") self.modes = {} self.current_modes = {} + self._flags = self._info.probe_result.get("flags", "").split(",") + #self._randr12 = "randr12" in self._flags + self._randr12 = len(self._rriface.outputs) > 1 + if self._randr12: for output in self.outputs: modes = self._rriface.getResolutions(output) @@ -42,8 +60,21 @@ self.current_modes[output] = current if current else self.modes[output][0] else: + if self._info.driver == "fglrx": + connected_outputs, enabled_outputs = fglrxOutputInfo() + + for out in connected_outputs: + if out not in self.outputs: + self.outputs.append(out) + for output in self.outputs: - pass + if self._info.probe_result.has_key("%s-modes" % output): + modes = self._info.probe_result["%s-modes" % output].split(",") + else: + modes = ["1024x768", "800x600", "640x480"] + + self.modes[output] = modes + self.current_modes[output] = self._info.modes.get(output, "800x600") self.primaryScr = self._info.active_outputs[0] self.secondaryScr = None From uludag-commits at pardus.org.tr Sun May 4 02:53:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 02:53:39 +0300 (EEST) Subject: [Uludag-commits] r17886 - in trunk: pisi/po tasma/package-manager/po Message-ID: <20080503235339.C9583138418B@liste.pardus.org.tr> Author: klemens Date: Sun May 4 02:53:39 2008 New Revision: 17886 Modified: trunk/pisi/po/es.po trunk/tasma/package-manager/po/es.po Log: some minor improvements in the spanish language files (kh) Modified: trunk/pisi/po/es.po ================================================================= --- trunk/pisi/po/es.po (original) +++ trunk/pisi/po/es.po Sun May 4 02:53:39 2008 @@ -6,12 +6,13 @@ # Christian Faure , 2007. # klemens , 2007. # Klemens Haeckel , 2008. +# Klemens Haeckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "POT-Creation-Date: 2008-01-31 16:42+EET\n" -"PO-Revision-Date: 2008-02-17 07:50-0300\n" -"Last-Translator: Klemens Haeckel \n" +"PO-Revision-Date: 2008-05-03 19:12-0400\n" +"Last-Translator: Klemens Haeckel \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -818,7 +819,7 @@ #: pisi/atomicoperations.py:161 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" -"los paquetes %s no se puede instalar hasta que instale los paquetes " +"paquete %s no se puede instalar hasta que instale los paquetes " "requeridos" # check this ?? - probably ok, but see the context @@ -1204,15 +1205,15 @@ #: pisi/cli/graph.py:70 msgid "Plotting packages in repository %s" -msgstr "Ploteando paquetes de repositorio %s" +msgstr "graficando paquetes de repositorio %s" #: pisi/cli/graph.py:73 msgid "Plotting a graph of relations among all repository packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" +msgstr "graficando las relaciones entre todos los paquetes en repositorio" #: pisi/cli/graph.py:87 msgid "Plotting a graph of relations among all installed packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes instalados" +msgstr "graficando las relaciones entre todos los paquetes instalados" #: pisi/cli/help.py:49 msgid "" Modified: trunk/tasma/package-manager/po/es.po ================================================================= --- trunk/tasma/package-manager/po/es.po (original) +++ trunk/tasma/package-manager/po/es.po Sun May 4 02:53:39 2008 @@ -1,4 +1,4 @@ -# translation of es.po to español +# translation of es.po to Spanish # translation of es.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -7,14 +7,15 @@ # klemens , 2007. # Christian Faure , 2007. # Faik Uygur , 2007. +# Klemens Haeckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-26 16:27+0200\n" -"PO-Revision-Date: 2007-12-03 22:14-0300\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: español \n" +"PO-Revision-Date: 2008-05-03 19:19-0400\n" +"Last-Translator: Klemens Haeckel \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,8 +46,11 @@ msgstr "Abortando operación..." #: src/Progress.py:127 src/Progress.py:131 +# example: %1=downloading, %2=firefox +# 080503 changed the word order, to make grammer sound better +# maybe just skip the word "package" / paquete ?? msgid "Now %1 %2 package" -msgstr "Ahora paquete %1 %2" +msgstr "Ahora %1 paquete %2" #: src/Progress.py:141 msgid "installed" From uludag-commits at pardus.org.tr Sun May 4 23:21:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 23:21:04 +0300 (EEST) Subject: [Uludag-commits] r17887 - in trunk/python-modules/pardus-python: . pardus po Message-ID: <20080504202104.E76631384122@liste.pardus.org.tr> Author: fatih Date: Sun May 4 23:21:04 2008 New Revision: 17887 Added: trunk/python-modules/pardus-python/pardus/localedata.py trunk/python-modules/pardus-python/po/ trunk/python-modules/pardus-python/po/pardus-python.pot Modified: trunk/python-modules/pardus-python/setup.py Log: add localedata module. mudur, zorg and yali can use it. Modified: trunk/python-modules/pardus-python/setup.py ================================================================= --- trunk/python-modules/pardus-python/setup.py (original) +++ trunk/python-modules/pardus-python/setup.py Sun May 4 23:21:04 2008 @@ -17,6 +17,8 @@ pardus/*.c pardus/xorg/*.py pardus/xorg/*.c + po/*.po + po/*.pot tools/*.py MODULES README @@ -52,9 +54,24 @@ self.install_platlib = '$base/lib/pardus' self.install_purelib = '$base/lib/pardus' install.finalize_options(self) - + def run(self): install.run(self) + self.installi18n() + + def installi18n(self): + for name in os.listdir('po'): + if not name.endswith('.po'): + continue + lang = name[:-3] + print "Installing '%s' translations..." % lang + os.popen("msgfmt po/%s.po -o po/%s.mo" % (lang, lang)) + if not self.root: + self.root = "/" + destpath = os.path.join(self.root, "usr/share/locale/%s/LC_MESSAGES" % lang) + if not os.path.exists(destpath): + os.makedirs(destpath) + shutil.copy("po/%s.mo" % lang, os.path.join(destpath, "pardus-python.mo")) setup(name="pardus", version=pardus.versionString(), From uludag-commits at pardus.org.tr Mon May 5 00:15:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 00:15:51 +0300 (EEST) Subject: [Uludag-commits] r17888 - trunk/PolicyKit-kde/src Message-ID: <20080504211551.A431E138409C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 00:15:51 2008 New Revision: 17888 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: * Remove unnecessary QVariant header * Define 30 seconds timeout in header Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 00:15:51 2008 @@ -15,7 +15,6 @@ #include //kde and qt headers -#include #include #include #include @@ -49,8 +48,8 @@ if (KCmdLineArgs::parsedArgs()->isSet("-exit")) { //exit, if no-exit option is not set - Debug::printWarning("no-exit option is not set, setting timer to exit in 30 seconds..."); - QTimer::singleShot(30000, this, SLOT(quitSlot(void))); + Debug::printWarning(QString("no-exit option is not set, setting timer to exit in %1 seconds...").arg(POLICYKITKDE_TIMEOUT / 1000)); + QTimer::singleShot(POLICYKITKDE_TIMEOUT, this, SLOT(quitSlot(void))); } else Debug::printDebug("no-exit option is set, not quiting"); Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 00:15:51 2008 @@ -13,6 +13,7 @@ #define SERVICE_H #define POLICYKITKDE_MAX_TRY 3 +#define POLICYKITKDE_TIMEOUT 30000 #include From uludag-commits at pardus.org.tr Mon May 5 02:41:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 02:41:20 +0300 (EEST) Subject: [Uludag-commits] r17889 - trunk/PolicyKit-kde/src Message-ID: <20080504234120.C6BC913840DF@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 02:41:20 2008 New Revision: 17889 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: use exit timer as class member to stop it when needed Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 02:41:20 2008 @@ -49,7 +49,10 @@ { //exit, if no-exit option is not set Debug::printWarning(QString("no-exit option is not set, setting timer to exit in %1 seconds...").arg(POLICYKITKDE_TIMEOUT / 1000)); - QTimer::singleShot(POLICYKITKDE_TIMEOUT, this, SLOT(quitSlot(void))); + + exitTimer = new QTimer(); + exitTimer->connect(exitTimer, SIGNAL(timeout()), this, SLOT(quitSlot(void))); + exitTimer->start(POLICYKITKDE_TIMEOUT, true); } else Debug::printDebug("no-exit option is set, not quiting"); @@ -108,9 +111,13 @@ void PolicyService::quitSlot() { Debug::printWarning("Timeout limit reached and no-exit option is not set, quiting..."); - KApplication::kApplication()->quit(); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + delete exitTimer; //TODO: Do last jobs + + KApplication::kApplication()->quit(); } PolicyService::~PolicyService() @@ -455,6 +462,10 @@ void PolicyService::obtainAuthorization(const QString& actionId, const uint wid, const uint pid, const QDBusMessage& messageToReply) { + //stop exitTimer during authentication, and restart when it is finished + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + exitTimer->stop(); + PolKitAction *action = polkit_action_new(); if (action == NULL) { @@ -550,7 +561,7 @@ throw msg; } - // This workaround used for to aviod ourself from a race condition, + // This workaround used for to avoid ourself from a race condition, // polkit_grant_done must return before the following privilege check QApplication::eventLoop()->exec(); @@ -573,6 +584,9 @@ reply << QDBusData::fromBool(m_gainedPrivilege); m_sessionBus.send(reply); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + exitTimer->start(POLICYKITKDE_TIMEOUT, true); } #include "service.moc" Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 02:41:20 2008 @@ -24,6 +24,7 @@ #include #include #include +#include #include "qdbusconnection.h" #include "qdbusobject.h" @@ -66,6 +67,7 @@ bool m_inputBogus; static PolicyService* m_self; QString m_uniqueSessionName; + QTimer *exitTimer; QMap m_contextwatches; QMap m_grantwatches; From uludag-commits at pardus.org.tr Mon May 5 02:45:18 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 02:45:18 +0300 (EEST) Subject: [Uludag-commits] r17890 - trunk/PolicyKit-kde/src Message-ID: <20080504234518.3606513840DF@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 02:45:17 2008 New Revision: 17890 Modified: trunk/PolicyKit-kde/src/service.cpp Log: delete object in destructor Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 02:45:17 2008 @@ -112,9 +112,6 @@ { Debug::printWarning("Timeout limit reached and no-exit option is not set, quiting..."); - if (KCmdLineArgs::parsedArgs()->isSet("-exit")) - delete exitTimer; - //TODO: Do last jobs KApplication::kApplication()->quit(); @@ -124,6 +121,9 @@ { Debug::printDebug(QString("Unregistering object: %1").arg(POLICYKITKDE_OBJECTNAME)); m_sessionBus.unregisterObject(POLICYKITKDE_OBJECTNAME); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + delete exitTimer; } bool PolicyService::handleMethodCall(const QDBusMessage& message) From uludag-commits at pardus.org.tr Mon May 5 10:53:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 10:53:59 +0300 (EEST) Subject: [Uludag-commits] r17891 - trunk/PolicyKit-kde/src Message-ID: <20080505075400.0F1CC1384142@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 10:53:59 2008 New Revision: 17891 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: Fix cancel problem Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 10:53:59 2008 @@ -64,9 +64,10 @@ m_error = NULL; m_grant = NULL; m_dialog = NULL; - bool m_authInProgress = false; - bool m_gainedPrivilege = false; - bool m_inputBogus = false; + m_authInProgress = false; + m_gainedPrivilege = false; + m_inputBogus = false; + m_cancelled = false; m_uniqueSessionName = m_sessionBus.uniqueName(); Debug::printDebug("Registering object: /"); @@ -180,6 +181,7 @@ Debug::printWarning(QString("Session bus name owner changed: service name='%1', old owner='%2', new owner='%3'").arg(msg[0].toString()).arg(msg[1].toString()).arg(msg[2].toString())); //TODO: exit if not busy + //polkit_grant_cancel_auth (grant); } } @@ -416,6 +418,8 @@ if (result == QDialog::Rejected) { Debug::printDebug("polkit_grant_prompt: Dialog cancelled"); + m_cancelled = true; + polkit_grant_cancel_auth (m_grant); return NULL; } @@ -438,7 +442,7 @@ void PolicyService::polkit_grant_error_message(PolKitGrant *grant, const char *error, void *data) { - Debug::printDebug(QString("polkit_grant_error_message: %1").arg(error)); + Debug::printError(QString("polkit_grant_error_message: %1").arg(error)); } void PolicyService::polkit_grant_text_info(PolKitGrant *grant, const char *info, void *data) @@ -464,7 +468,10 @@ { //stop exitTimer during authentication, and restart when it is finished if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + { + Debug::printDebug("Authentication is in progress, stopping timer"); exitTimer->stop(); + } PolKitAction *action = polkit_action_new(); if (action == NULL) @@ -553,6 +560,7 @@ // explicitly set to false before every try m_gainedPrivilege = false; m_inputBogus = false; + m_cancelled = false; if (!polkit_grant_initiate_auth (m_grant, action, caller)) { @@ -565,7 +573,7 @@ // polkit_grant_done must return before the following privilege check QApplication::eventLoop()->exec(); - if (!m_gainedPrivilege && !m_inputBogus) + if (!m_gainedPrivilege && !m_inputBogus && !m_cancelled) { Debug::printDebug("obtain_authorization: Authentication failure, trying again..."); polkit_grant_unref (m_grant); @@ -586,7 +594,10 @@ m_sessionBus.send(reply); if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + { + Debug::printDebug("Authentication finished, starting timer again"); exitTimer->start(POLICYKITKDE_TIMEOUT, true); + } } #include "service.moc" Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 10:53:59 2008 @@ -65,6 +65,7 @@ bool m_authInProgress; bool m_gainedPrivilege; bool m_inputBogus; + bool m_cancelled; static PolicyService* m_self; QString m_uniqueSessionName; QTimer *exitTimer; From uludag-commits at pardus.org.tr Mon May 5 11:08:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:08:33 +0300 (EEST) Subject: [Uludag-commits] r17892 - in trunk/PolicyKit-kde: . src Message-ID: <20080505080833.6A0CD1384142@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 11:08:33 2008 New Revision: 17892 Modified: trunk/PolicyKit-kde/TODO trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/service.cpp Log: Fix session checkbox disabled problem Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 11:08:33 2008 @@ -1,6 +1,4 @@ IMPORTANT: -* Handle cancelling -* Fix disabling of keep session label * Fix admin user selection support (another eventloop solution may be required) * Fix override_type function Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 11:08:33 2008 @@ -179,7 +179,10 @@ } if (res == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION || res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION) + { cbRemember->hide(); + cbSession->setEnabled(true); + } m_type = res; Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 11:08:33 2008 @@ -585,7 +585,7 @@ if (m_grant) polkit_grant_unref (m_grant); - Debug::printDebug(QString("obtain_authorization returning %1").arg(m_gainedPrivilege)); + Debug::printDebug(QString("obtain_authorization: privilege: %1 input_bogus: %2, cancelled: %3").arg(m_gainedPrivilege).arg(m_inputBogus).arg(m_cancelled)); //send dbus reply QDBusMessage reply = QDBusMessage::methodReply(messageToReply); From uludag-commits at pardus.org.tr Mon May 5 11:27:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:27:21 +0300 (EEST) Subject: [Uludag-commits] r17893 - trunk/tasma/display-manager/src Message-ID: <20080505082721.9209A1384179@liste.pardus.org.tr> Author: pinar Date: Mon May 5 11:27:21 2008 New Revision: 17893 Modified: trunk/tasma/display-manager/src/dm_mainview.ui Log: extended/cloned option Modified: trunk/tasma/display-manager/src/dm_mainview.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Mon May 5 11:40:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:40:01 +0300 (EEST) Subject: [Uludag-commits] r17894 - in trunk/python-modules/pardus-python: po tools Message-ID: <20080505084001.E06A913840E3@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:40:01 2008 New Revision: 17894 Added: trunk/python-modules/pardus-python/po/ca.po trunk/python-modules/pardus-python/po/de.po trunk/python-modules/pardus-python/po/es.po trunk/python-modules/pardus-python/po/fr.po trunk/python-modules/pardus-python/po/it.po trunk/python-modules/pardus-python/po/nl.po trunk/python-modules/pardus-python/po/pl.po trunk/python-modules/pardus-python/po/pt_BR.po (contents, props changed) trunk/python-modules/pardus-python/po/tr.po trunk/python-modules/pardus-python/tools/pygettext.py - copied unchanged from r17892, trunk/pisi/tools/pygettext.py trunk/python-modules/pardus-python/tools/update-po.sh - copied, changed from r17892, trunk/pisi/tools/update-po.sh Modified: trunk/python-modules/pardus-python/po/pardus-python.pot Log: add translations Modified: trunk/python-modules/pardus-python/po/pardus-python.pot ================================================================= --- trunk/python-modules/pardus-python/po/pardus-python.pot (original) +++ trunk/python-modules/pardus-python/po/pardus-python.pot Mon May 5 11:40:01 2008 @@ -1,20 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR ORGANIZATION # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 22:51+0300\n" +"POT-Creation-Date: 2008-05-05 11:36+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: ENCODING\n" +"Generated-By: pygettext.py 1.5\n" + #: pardus/localedata.py:46 msgid "Turkish" @@ -163,3 +162,4 @@ #: pardus/localedata.py:254 msgid "Vietnamese" msgstr "" + Copied: trunk/python-modules/pardus-python/tools/update-po.sh (from r17892, trunk/pisi/tools/update-po.sh) ================================================================= --- trunk/pisi/tools/update-po.sh (original) +++ trunk/python-modules/pardus-python/tools/update-po.sh Mon May 5 11:40:01 2008 @@ -1,8 +1,6 @@ -find pisi -iname '*.py' | grep -v pisi/cli/commands.py >exclude -python tools/pygettext.py -D -X exclude -o po/pisi.pot pisi pisi-cli scripts /usr/lib/python2.4/optparse.py +python tools/pygettext.py -o po/pardus-python.pot pardus for lang in po/*.po do - msgmerge -U $lang po/pisi.pot + msgmerge -U $lang po/pardus-python.pot done -rm exclude From uludag-commits at pardus.org.tr Mon May 5 11:41:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:41:20 +0300 (EEST) Subject: [Uludag-commits] r17895 - trunk/python-modules/pardus-python/po Message-ID: <20080505084121.0D11413840E6@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:41:20 2008 New Revision: 17895 Modified: trunk/python-modules/pardus-python/po/pt_BR.po (props changed) Log: remove svn:executable From uludag-commits at pardus.org.tr Mon May 5 11:45:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:45:54 +0300 (EEST) Subject: [Uludag-commits] r17896 - trunk/python-modules/pardus-python Message-ID: <20080505084554.45F39138417A@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:45:54 2008 New Revision: 17896 Modified: trunk/python-modules/pardus-python/setup.py (contents, props changed) Log: set executable Modified: trunk/python-modules/pardus-python/setup.py ================================================================= --- trunk/python-modules/pardus-python/setup.py (original) +++ trunk/python-modules/pardus-python/setup.py Mon May 5 11:45:54 2008 @@ -20,6 +20,7 @@ po/*.po po/*.pot tools/*.py + tools/*.sh MODULES README """ From uludag-commits at pardus.org.tr Mon May 5 11:54:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:54:06 +0300 (EEST) Subject: [Uludag-commits] r17897 - trunk/python-modules/pardus-python/pardus Message-ID: <20080505085407.0AC9613840F3@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:54:06 2008 New Revision: 17897 Modified: trunk/python-modules/pardus-python/pardus/__init__.py Log: bump Modified: trunk/python-modules/pardus-python/pardus/__init__.py ================================================================= --- trunk/python-modules/pardus-python/pardus/__init__.py (original) +++ trunk/python-modules/pardus-python/pardus/__init__.py Mon May 5 11:54:06 2008 @@ -10,7 +10,7 @@ # Please read the COPYING file. # -__version__ = "0.2" +__version__ = "0.3" __all__ = ["csapi", "deviceutils", @@ -18,6 +18,7 @@ "fileutils", "grubutils", "iniutils", + "localedata", "netutils", "netfilterutils", "shellutils", From uludag-commits at pardus.org.tr Mon May 5 12:12:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:12:32 +0300 (EEST) Subject: [Uludag-commits] r17898 - trunk/PolicyKit-kde/src Message-ID: <20080505091232.E1D7713840C8@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:12:32 2008 New Revision: 17898 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/service.cpp Log: override grant type function implemented Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 12:12:32 2008 @@ -104,12 +104,12 @@ QString msg; switch(m_type) { - //TODO: Authentication as one of the users below... + //TODO: Add user selection support case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS: msg = i18n("An application is attempting to perform an action that requires privileges." - " Authentication as the super user is required to perform this action."); + " Authentication as the super user is required to perform this action."); break; default: msg = i18n("An application is attempting to perform an action that requires privileges." Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 12:12:32 2008 @@ -17,6 +17,7 @@ //kde and qt headers #include #include +#include #include #include #include @@ -390,7 +391,7 @@ if (dialogResult == QDialog::Rejected) { - Debug::printDebug("polkit_grant_select_admin_user: Dialog rejected"); + Debug::printDebug("polkit_grant_select_admin_user: Dialog cancelled"); return NULL; } else @@ -403,8 +404,7 @@ char *PolicyService::polkit_grant_prompt(const QString &prompt, bool echo) { - //TODO: check prompt - // + //TODO: check prompt like polkit-gnome m_dialog->setPrompt(prompt); @@ -452,8 +452,58 @@ PolKitResult PolicyService::polkit_grant_override_grant_type(PolKitGrant *grant, PolKitResult result, void *data) { - Debug::printDebug("In polkit_grant_override_grant_type"); - return result; + Debug::printDebug("In polkit_grant_override_grant_type..."); + + PolKitResult overridden = result; + bool keepSession = m_self->m_dialog->cbSession->isChecked(); + bool keepAlways = m_self->m_dialog->cbRemember->isChecked(); + + Debug::printDebug(QString("polkit_grant_override_grant_type: keep session: %1, keep always: %2").arg(keepSession).arg(keepAlways)); + + switch(result) + { + // result can not be overridden if keepsession or keepalways do not exist + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_ONE_SHOT: + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_ONE_SHOT: + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH: + overridden = result; + + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: + //if keepsession is available but user does not select it, override result with adminauth + if (!keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH; + else + overridden = result; + break; + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS: + //if keepalways and keepsession options are available but user does not select them, override result with adminauth + if (!keepAlways && !keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH; + else if (keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION; + else + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS; + break; + + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION: + if (!keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH; + break; + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: + if (!keepAlways && !keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH; + else if (keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION; + else + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS; + break; + default: + Debug::printWarning("polkit_grant_override_grant_type: Unexpected PolKitResult type"); + } + + Debug::printDebug(QString("polkit_grant_override_grant_type: default type = %1, overridden type = %2").arg(polkit_result_to_string_representation(result)).arg(polkit_result_to_string_representation(overridden))); + return overridden; } void PolicyService::polkit_grant_done(PolKitGrant *grant, polkit_bool_t gained_privilege, polkit_bool_t invalid_data, void *data) From uludag-commits at pardus.org.tr Mon May 5 12:13:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:13:38 +0300 (EEST) Subject: [Uludag-commits] r17899 - trunk/PolicyKit-kde Message-ID: <20080505091338.49899138416C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:13:37 2008 New Revision: 17899 Modified: trunk/PolicyKit-kde/TODO Log: update TODO Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 12:13:37 2008 @@ -1,6 +1,5 @@ IMPORTANT: * Fix admin user selection support (another eventloop solution may be required) -* Fix override_type function LESS IMPORTANT: * Inform user that authentication is not granted From uludag-commits at pardus.org.tr Mon May 5 12:21:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:21:17 +0300 (EEST) Subject: [Uludag-commits] r17900 - trunk/PolicyKit-kde/src Message-ID: <20080505092117.60BED138416C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:21:17 2008 New Revision: 17900 Modified: trunk/PolicyKit-kde/src/authdialog.cpp Log: Change 'remember session' to a meaningful message Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 12:21:17 2008 @@ -182,6 +182,7 @@ { cbRemember->hide(); cbSession->setEnabled(true); + cbSession->setText(i18n("Remember authorization for this session")); } m_type = res; From uludag-commits at pardus.org.tr Mon May 5 12:30:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:30:51 +0300 (EEST) Subject: [Uludag-commits] r17901 - trunk/comar/mudur Message-ID: <20080505093051.27F83138411B@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon May 5 12:30:50 2008 New Revision: 17901 Modified: trunk/comar/mudur/setup.py Log: alpha8 Modified: trunk/comar/mudur/setup.py ================================================================= --- trunk/comar/mudur/setup.py (original) +++ trunk/comar/mudur/setup.py Mon May 5 12:30:50 2008 @@ -15,7 +15,7 @@ import shutil import parser -version = "2.0_alpha7" +version = "2.0_alpha8" distfiles = """ setup.py From uludag-commits at pardus.org.tr Mon May 5 14:15:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:15:00 +0300 (EEST) Subject: [Uludag-commits] r17902 - in tags/RELEASE/pardus-python-0.3: . pardus Message-ID: <20080505111500.68BD7138413E@liste.pardus.org.tr> Author: fatih Date: Mon May 5 14:14:59 2008 New Revision: 17902 Added: tags/RELEASE/pardus-python-0.3/ - copied from r17895, trunk/python-modules/pardus-python/ tags/RELEASE/pardus-python-0.3/pardus/__init__.py - copied unchanged from r17897, trunk/python-modules/pardus-python/pardus/__init__.py tags/RELEASE/pardus-python-0.3/setup.py - copied unchanged from r17896, trunk/python-modules/pardus-python/setup.py Log: tag From uludag-commits at pardus.org.tr Mon May 5 14:16:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:16:36 +0300 (EEST) Subject: [Uludag-commits] r17903 - trunk/PolicyKit-kde Message-ID: <20080505111636.9DE88138413E@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 14:16:35 2008 New Revision: 17903 Modified: trunk/PolicyKit-kde/TODO Log: one more todo Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 14:16:35 2008 @@ -2,6 +2,7 @@ * Fix admin user selection support (another eventloop solution may be required) LESS IMPORTANT: +* Do not send same DBus exceptions to all errors * Inform user that authentication is not granted * Use polkit_grant_cancel_auth in handler of DBus signal NameOwnerChanged * Show details about the application request for authorization From uludag-commits at pardus.org.tr Mon May 5 14:29:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:29:58 +0300 (EEST) Subject: [Uludag-commits] r17904 - trunk/baselayout/etc/skel Message-ID: <20080505112958.28AD813840E4@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:29:57 2008 New Revision: 17904 Modified: trunk/baselayout/etc/skel/.bashrc Log: Ok this is final fix, profiles were not being loaded correctly on nonlogin shells. Ubuntu etc. are doing it this way, so I gave up and did the same solution :( Modified: trunk/baselayout/etc/skel/.bashrc ================================================================= --- trunk/baselayout/etc/skel/.bashrc (original) +++ trunk/baselayout/etc/skel/.bashrc Mon May 5 14:29:57 2008 @@ -50,3 +50,11 @@ export GTK2_RC_FILES=$HOME/.gtkrc-2.0 +for sh in /etc/profile.d/*.sh ; do + if [ -r "$sh" ] ; then + . "$sh" + fi +done +unset sh + + From uludag-commits at pardus.org.tr Mon May 5 14:36:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:36:53 +0300 (EEST) Subject: [Uludag-commits] r17905 - trunk/baselayout/etc Message-ID: <20080505113653.7FDE2138412D@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:36:53 2008 New Revision: 17905 Modified: trunk/baselayout/etc/profile Log: tab -> space Modified: trunk/baselayout/etc/profile ================================================================= --- trunk/baselayout/etc/profile (original) +++ trunk/baselayout/etc/profile Mon May 5 14:36:53 2008 @@ -7,7 +7,7 @@ # Load environment settings from profile.env, which is created by # env-update from the files in /etc/env.d if [ -e /etc/profile.env ] ; then - . /etc/profile.env + . /etc/profile.env fi # 077 would be more secure, but 022 is generally quite realistic @@ -22,9 +22,9 @@ # This way the evaluation can be short-circuited and calling whoami is # avoided. if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" else - PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" + PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" fi export PATH unset ROOTPATH @@ -34,31 +34,31 @@ export EDITOR if [ -n "${BASH_VERSION}" ] ; then - # including color. We leave out color here because not all - # terminals support it. - if [ -f /etc/bash/bashrc ] ; then - # Bash login shells run only /etc/profile - # Bash non-login shells run only /etc/bash/bashrc - # Since we want to run /etc/bash/bashrc regardless, we source it - # from here. It is unfortunate that there is no way to do - # this *after* the user's .bash_profile runs (without putting - # it in the user's dot-files), but it shouldn't make any - # difference. - . /etc/bash/bashrc - else - PS1='\u@\h \w \$ ' - fi + # including color. We leave out color here because not all + # terminals support it. + if [ -f /etc/bash/bashrc ] ; then + # Bash login shells run only /etc/profile + # Bash non-login shells run only /etc/bash/bashrc + # Since we want to run /etc/bash/bashrc regardless, we source it + # from here. It is unfortunate that there is no way to do + # this *after* the user's .bash_profile runs (without putting + # it in the user's dot-files), but it shouldn't make any + # difference. + . /etc/bash/bashrc + else + PS1='\u@\h \w \$ ' + fi else - # Setup a bland default prompt. Since this prompt should be useable - # on color and non-color terminals, as well as shells that don't - # understand sequences such as \h, don't put anything special in it. - PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " + # Setup a bland default prompt. Since this prompt should be useable + # on color and non-color terminals, as well as shells that don't + # understand sequences such as \h, don't put anything special in it. + PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " fi - for sh in /etc/profile.d/*.sh ; do if [ -r "$sh" ] ; then . "$sh" fi done unset sh + From uludag-commits at pardus.org.tr Mon May 5 14:38:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:38:00 +0300 (EEST) Subject: [Uludag-commits] r17906 - trunk/baselayout/etc/skel Message-ID: <20080505113800.33A43138412D@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:37:59 2008 New Revision: 17906 Modified: trunk/baselayout/etc/skel/.bashrc Log: tab -> space Modified: trunk/baselayout/etc/skel/.bashrc ================================================================= --- trunk/baselayout/etc/skel/.bashrc (original) +++ trunk/baselayout/etc/skel/.bashrc Mon May 5 14:37:59 2008 @@ -7,8 +7,8 @@ # past this point for scp and rcp, and it's important to refrain from # outputting anything in those cases. if [[ $- != *i* ]]; then - # Shell is non-interactive. Be done now - return + # Shell is non-interactive. Be done now + return fi # Shell is interactive. It is okay to produce output at this point, @@ -17,9 +17,9 @@ # colors for ls, etc. Prefer ~/.dir_colors #64489 if [[ -f ~/.dir_colors ]]; then - eval `dircolors -b ~/.dir_colors` + eval `dircolors -b ~/.dir_colors` else - eval `dircolors -b /etc/DIR_COLORS` + eval `dircolors -b /etc/DIR_COLORS` fi alias d="ls --color" @@ -40,12 +40,12 @@ # Change the window title of X terminals case $TERM in - xterm*|rxvt|Eterm|eterm) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - ;; - screen) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' - ;; + xterm*|rxvt|Eterm|eterm) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' + ;; + screen) + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' + ;; esac export GTK2_RC_FILES=$HOME/.gtkrc-2.0 From uludag-commits at pardus.org.tr Mon May 5 16:29:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 16:29:47 +0300 (EEST) Subject: [Uludag-commits] r17907 - trunk/tasma/package-manager/src Message-ID: <20080505132948.144FF1384142@liste.pardus.org.tr> Author: faik Date: Mon May 5 16:29:47 2008 New Revision: 17907 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/PackageCache.py trunk/tasma/package-manager/src/PisiIface.py Log: try to get rid of packagecache... pisi has its own cache Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Mon May 5 16:29:47 2008 @@ -58,7 +58,6 @@ self.command = None self.state = install_state self.basket = Basket.Basket() - self.packageCache = PackageCache.PackageCache() self.command = Commander.Commander(self) self.settings = Settings.Settings(Globals.config()) @@ -175,7 +174,6 @@ self.basketAction.setEnabled(False) self.operateAction.setEnabled(False) self.searchLine.clear() - self.packageCache.clearCache() self.parent.showNewAction.setChecked(False) self.parent.showInstalledAction.setChecked(False) self.parent.showUpgradeAction.setEnabled(True) @@ -262,7 +260,6 @@ self.parent.showInstalledAction.setChecked(False) ## - self.packageCache.clearCache() upgradables = PisiIface.get_upgradable_packages() self.createComponentList(upgradables, True) self.operateAction.setText(i18n("Upgrade Package(s)")) @@ -298,7 +295,7 @@ Globals.setWaitCursor() try: # fetch packages including metadata from cache - packagesWithMeta = [self.packageCache.get_package(package) for package in self.componentDict[item].packages] + packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in self.componentDict[item].packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: @@ -503,13 +500,6 @@ self.componentsList.clear() self.componentDict.clear() - # populate package cache for accessing package metadata quickly - if self.packageCache.isEmpty() and packages: - if self.state == remove_state: - self.packageCache.populateCache(packages, inInstalled = True) - else: - self.packageCache.populateCache(packages) - # eliminate components that are not visible to users. This is achieved by a tag in component.xmls componentNames = [cname for cname in PisiIface.get_components() if PisiIface.is_component_visible(cname)] @@ -577,7 +567,7 @@ item = KListViewItem(self.componentsList) item.setText(0,i18n("Search Results")) item.setPixmap(0, KGlobal.iconLoader().loadIcon("find",KIcon.Desktop,KIcon.SizeMedium)) - packagesWithMeta = [self.packageCache.get_package(package) for package in packages] + packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: @@ -711,7 +701,7 @@ def searchPackage(self): query = unicode(self.searchLine.text()) if query: - result = self.packageCache.searchInPackages(query.split()) + result = PisiIface.search_package(query.split(), self.state == install_state) self.createSearchResults(result) else: self.timer.stop() Modified: trunk/tasma/package-manager/src/PackageCache.py ================================================================= --- trunk/tasma/package-manager/src/PackageCache.py (original) +++ trunk/tasma/package-manager/src/PackageCache.py Mon May 5 16:29:47 2008 @@ -11,42 +11,16 @@ # Please read the COPYING file import PisiIface -from kdecore import i18n -import Icons - -class Package: - def __init__(self, name, summary, description, version, icon_path, size, homepage, repo): - self.name = name - self.summary = summary - self.description = description - self.version = version - self.icon_path = icon_path - self.size = self._sizer(size) - self.homepage = homepage - self.repo = repo - - def _sizer(self, size): - if size: - tpl = PisiIface.humanize(size) - return "%.0f %s" % (tpl[0], tpl[1]) - else: - return i18n("N\A") - - def __str__(self): - return self.name - - def lower(self): - return self.name.lower() class PackageCache: def __init__(self): - self.packages = {} + pass def clearCache(self): - self.packages.clear() + pass def isEmpty(self): - return not self.packages + pass def populateCache(self, packages, inInstalled = False): for pkg_name in packages: Modified: trunk/tasma/package-manager/src/PisiIface.py ================================================================= --- trunk/tasma/package-manager/src/PisiIface.py (original) +++ trunk/tasma/package-manager/src/PisiIface.py Mon May 5 16:29:47 2008 @@ -80,4 +80,15 @@ def get_conflicts(packages): return pisi.api.get_conflicts(packages) +def get_package(package, installed=False): + if installed: + return get_installed_package(package) + else: + return get_repo_package(package) + +def search_package(terms, installed=False): + if installed: + return pisi.api.search_installed(terms) + else: + return pisi.api.serach_package(terms) From uludag-commits at pardus.org.tr Mon May 5 16:45:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 16:45:14 +0300 (EEST) Subject: [Uludag-commits] r17908 - trunk/PolicyKit-kde/src Message-ID: <20080505134514.ED507138412D@liste.pardus.org.tr> Author: caglar Date: Mon May 5 16:45:14 2008 New Revision: 17908 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: steal keyboard from GTK apps also Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 16:45:14 2008 @@ -44,7 +44,7 @@ */ AuthDialog::AuthDialog(QString &header) : AuthDialogUI( NULL, NULL, true, Qt::WType_Popup), - m_currentY( 0 ) + m_currentY( 0 ), grabKeyboard( false ) { KIconLoader* iconloader = KGlobal::iconLoader(); lblPixmap->setPixmap(iconloader->loadIcon("lock", KIcon::Desktop)); @@ -72,6 +72,25 @@ { } +void AuthDialog::paintEvent(QPaintEvent* ev) +{ + // Grab keyboard when widget is mapped to screen + // It might be a little weird to do it here, but it works! + if(!grabKeyboard) + { + lePassword->grabKeyboard(); + grabKeyboard = true; + } + QDialog::paintEvent( ev ); +} + +void AuthDialog::hideEvent(QHideEvent* ev) +{ + lePassword->releaseKeyboard(); + grabKeyboard = false; + QDialog::hideEvent( ev ); +} + void AuthDialog::setHeader(const QString &header) { lblHeader->setText("

" + header + "

"); Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Mon May 5 16:45:14 2008 @@ -35,6 +35,10 @@ void setHeader(const QString &); void setPrompt(const QString &); +protected: + virtual void hideEvent( QHideEvent* ); + virtual void paintEvent( QPaintEvent* ); + private slots: void slotPaintEffect(); void slotGrab(); @@ -50,6 +54,8 @@ QImage m_grabbed; QPixmap m_root; QTime m_passed; + + bool grabKeyboard; }; #endif // AUTHDIALOG_H From uludag-commits at pardus.org.tr Mon May 5 17:31:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 17:31:38 +0300 (EEST) Subject: [Uludag-commits] r17909 - trunk/PolicyKit-kde/src Message-ID: <20080505143138.944E71384105@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 17:31:38 2008 New Revision: 17909 Modified: trunk/PolicyKit-kde/src/service.cpp Log: Fix selfauth problem Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 17:31:38 2008 @@ -468,7 +468,7 @@ case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: case POLKIT_RESULT_ONLY_VIA_SELF_AUTH: overridden = result; - + break; case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: //if keepsession is available but user does not select it, override result with adminauth if (!keepSession) From uludag-commits at pardus.org.tr Mon May 5 17:45:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 17:45:26 +0300 (EEST) Subject: [Uludag-commits] r17910 - trunk/PolicyKit-kde/src Message-ID: <20080505144526.86158138411E@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 17:45:26 2008 New Revision: 17910 Modified: trunk/PolicyKit-kde/src/authdialog.cpp Log: Do not show keep* checkboxes in oneshot dialogs Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 17:45:26 2008 @@ -191,7 +191,10 @@ res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS) setPasswordFor(false); - if (res == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH || res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH) + if (res == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH || \ + res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH || \ + res == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_ONE_SHOT || \ + res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_ONE_SHOT) { cbRemember->hide(); cbSession->hide(); From uludag-commits at pardus.org.tr Mon May 5 17:57:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 17:57:38 +0300 (EEST) Subject: [Uludag-commits] r17911 - trunk/PolicyKit-kde/src Message-ID: <20080505145738.69E7A13840E2@liste.pardus.org.tr> Author: caglar Date: Mon May 5 17:57:38 2008 New Revision: 17911 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: pressing Esc closes the dialog Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 17:57:38 2008 @@ -81,14 +81,25 @@ lePassword->grabKeyboard(); grabKeyboard = true; } - QDialog::paintEvent( ev ); + QDialog::paintEvent(ev); } void AuthDialog::hideEvent(QHideEvent* ev) { lePassword->releaseKeyboard(); grabKeyboard = false; - QDialog::hideEvent( ev ); + QDialog::hideEvent(ev); +} + +void AuthDialog::keyPressEvent(QKeyEvent* e) +{ + // pressing Esc closes the dialog + if (e->state() == 0 && e->key() == Key_Escape) + { + emit reject(); + return; + } + QDialog::keyPressEvent(e); } void AuthDialog::setHeader(const QString &header) Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Mon May 5 17:57:38 2008 @@ -36,8 +36,9 @@ void setPrompt(const QString &); protected: - virtual void hideEvent( QHideEvent* ); - virtual void paintEvent( QPaintEvent* ); + virtual void keyPressEvent(QKeyEvent*); + virtual void hideEvent(QHideEvent*); + virtual void paintEvent(QPaintEvent*); private slots: void slotPaintEffect(); From uludag-commits at pardus.org.tr Mon May 5 17:59:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 17:59:00 +0300 (EEST) Subject: [Uludag-commits] r17912 - trunk/PolicyKit-kde Message-ID: <20080505145900.9CFE913840E2@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 17:59:00 2008 New Revision: 17912 Modified: trunk/PolicyKit-kde/TODO Log: gooo Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 17:59:00 2008 @@ -7,7 +7,6 @@ * Use polkit_grant_cancel_auth in handler of DBus signal NameOwnerChanged * Show details about the application request for authorization * Check if authentication is in progress, when a new request arrived -* Check one_shot stuff * Control XID and add 'transient for' * Add vendor icon support * Check "Password: " prompt like polkit-gnome From uludag-commits at pardus.org.tr Mon May 5 18:49:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 18:49:34 +0300 (EEST) Subject: [Uludag-commits] r17913 - trunk/tasma/display-manager/src Message-ID: <20080505154934.5DBC3138410F@liste.pardus.org.tr> Author: pinar Date: Mon May 5 18:49:33 2008 New Revision: 17913 Modified: trunk/tasma/display-manager/src/dm_mainview.ui Log: gui fixes Modified: trunk/tasma/display-manager/src/dm_mainview.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Mon May 5 20:26:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 20:26:19 +0300 (EEST) Subject: [Uludag-commits] r17914 - branches/tasma-dbus/network-manager Message-ID: <20080505172619.327D9138411A@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon May 5 20:26:18 2008 New Revision: 17914 Modified: branches/tasma-dbus/network-manager/browser.py Log: Do not ignore reply Modified: branches/tasma-dbus/network-manager/browser.py ================================================================= --- branches/tasma-dbus/network-manager/browser.py (original) +++ branches/tasma-dbus/network-manager/browser.py Mon May 5 20:26:18 2008 @@ -123,7 +123,7 @@ self.view.setEnabled(False) ch = comlink.callHandler(self.conn.script, "Net.Link", "setState", "tr.org.pardus.comar.net.link.setstate") - ch.callNoReply(self.conn.name, state) + ch.call(self.conn.name, state) self.view.setEnabled(True) def slotDelete(self): From uludag-commits at pardus.org.tr Mon May 5 22:13:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 22:13:19 +0300 (EEST) Subject: [Uludag-commits] r17915 - trunk/PolicyKit-kde/src Message-ID: <20080505191319.888B713840DD@liste.pardus.org.tr> Author: caglar Date: Mon May 5 22:13:19 2008 New Revision: 17915 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: this is much more cleaner and works for all cases... Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 22:13:19 2008 @@ -43,7 +43,7 @@ * TRUE to construct a modal dialog. */ AuthDialog::AuthDialog(QString &header) - : AuthDialogUI( NULL, NULL, true, Qt::WType_Popup), + : AuthDialogUI( NULL, 0, TRUE, WType_Popup), m_currentY( 0 ), grabKeyboard( false ) { KIconLoader* iconloader = KGlobal::iconLoader(); @@ -52,6 +52,9 @@ pbCancel->setIconSet(iconloader->loadIconSet("cancel", KIcon::Small, 0, false)); lePassword->setFocus(); + // Grab keyboard when widget is mapped to screen + lePassword->grabKeyboard(); + cbUsers->hide(); setHeader(header); @@ -72,23 +75,12 @@ { } -void AuthDialog::paintEvent(QPaintEvent* ev) -{ - // Grab keyboard when widget is mapped to screen - // It might be a little weird to do it here, but it works! - if(!grabKeyboard) - { - lePassword->grabKeyboard(); - grabKeyboard = true; - } - QDialog::paintEvent(ev); -} - -void AuthDialog::hideEvent(QHideEvent* ev) +bool AuthDialog::focusNextPrevChild (bool next) { - lePassword->releaseKeyboard(); - grabKeyboard = false; - QDialog::hideEvent(ev); + bool ret = QWidget::focusNextPrevChild(next); + QWidget::keyboardGrabber()->releaseKeyboard(); + QWidget::focusWidget()->grabKeyboard(); + return ret; } void AuthDialog::keyPressEvent(QKeyEvent* e) Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Mon May 5 22:13:19 2008 @@ -37,8 +37,7 @@ protected: virtual void keyPressEvent(QKeyEvent*); - virtual void hideEvent(QHideEvent*); - virtual void paintEvent(QPaintEvent*); + virtual bool focusNextPrevChild (bool); private slots: void slotPaintEffect(); From uludag-commits at pardus.org.tr Mon May 5 22:15:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 22:15:03 +0300 (EEST) Subject: [Uludag-commits] r17916 - trunk/PolicyKit-kde/src Message-ID: <20080505191503.E240813840DD@liste.pardus.org.tr> Author: caglar Date: Mon May 5 22:15:03 2008 New Revision: 17916 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: cleanup Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 22:15:03 2008 @@ -44,7 +44,7 @@ */ AuthDialog::AuthDialog(QString &header) : AuthDialogUI( NULL, 0, TRUE, WType_Popup), - m_currentY( 0 ), grabKeyboard( false ) + m_currentY( 0 ) { KIconLoader* iconloader = KGlobal::iconLoader(); lblPixmap->setPixmap(iconloader->loadIcon("lock", KIcon::Desktop)); Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Mon May 5 22:15:03 2008 @@ -54,8 +54,6 @@ QImage m_grabbed; QPixmap m_root; QTime m_passed; - - bool grabKeyboard; }; #endif // AUTHDIALOG_H From uludag-commits at pardus.org.tr Tue May 6 02:28:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 02:28:08 +0300 (EEST) Subject: [Uludag-commits] r17917 - in branches/kaptan3/src: . screens Message-ID: <20080505232808.D5AD813840E7@liste.pardus.org.tr> Author: pinar Date: Tue May 6 02:28:08 2008 New Revision: 17917 Modified: branches/kaptan3/src/kaptan.py branches/kaptan3/src/screens/goodbyedlg.ui Log: small fixes Modified: branches/kaptan3/src/kaptan.py ================================================================= --- branches/kaptan3/src/kaptan.py (original) +++ branches/kaptan3/src/kaptan.py Tue May 6 02:28:08 2008 @@ -55,7 +55,12 @@ def __init__(self, *args): apply(kaptanUi.__init__, (self,) + args) - self.logDir = os.path.join( os.path.expanduser("~"), ".kde/share/apps/kaptan/") + self.logPath = os.path.join(os.path.expanduser("~"), ".kde/share/apps/kaptan/") + + if not os.path.exists(self.logPath): + os.mkdir(self.logPath) + + self.logDir = os.path.join(self.logPath) # start logging: logging.basicConfig(level=logging.DEBUG, Modified: branches/kaptan3/src/screens/goodbyedlg.ui ================================================================= --- branches/kaptan3/src/screens/goodbyedlg.ui (original) +++ branches/kaptan3/src/screens/goodbyedlg.ui Tue May 6 02:28:08 2008 @@ -18,28 +18,11 @@ Goodbye - + unnamed - - - spacer6 - - - Vertical - - - Expanding - - - - 20 - 16 - - - - + textGoodbye @@ -50,7 +33,7 @@ <p>Congratulations! You have finished all steps. You can now continue using Pardus and try applications below.</p> - + groupBoxMigration @@ -141,7 +124,7 @@ - + groupBoxTasma @@ -259,7 +242,7 @@ - + groupBoxHelp @@ -377,7 +360,7 @@ - + groupBoxFeedback @@ -498,7 +481,24 @@ - + + + spacer6 + + + Vertical + + + Expanding + + + + 20 + 16 + + + + From uludag-commits at pardus.org.tr Tue May 6 08:59:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 08:59:34 +0300 (EEST) Subject: [Uludag-commits] r17918 - trunk/PolicyKit-kde/src Message-ID: <20080506055934.A589913840ED@liste.pardus.org.tr> Author: caglar Date: Tue May 6 08:59:34 2008 New Revision: 17918 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: focus problems continues... Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Tue May 6 08:59:34 2008 @@ -51,10 +51,6 @@ pbOK->setIconSet(iconloader->loadIconSet("ok", KIcon::Small, 0, false)); pbCancel->setIconSet(iconloader->loadIconSet("cancel", KIcon::Small, 0, false)); - lePassword->setFocus(); - // Grab keyboard when widget is mapped to screen - lePassword->grabKeyboard(); - cbUsers->hide(); setHeader(header); @@ -75,6 +71,14 @@ { } +void AuthDialog::paintEvent(QPaintEvent* ev) +{ + lePassword->setFocus(); + // Grab keyboard when widget is mapped to screen + lePassword->grabKeyboard(); + QDialog::paintEvent(ev); +} + bool AuthDialog::focusNextPrevChild (bool next) { bool ret = QWidget::focusNextPrevChild(next); Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Tue May 6 08:59:34 2008 @@ -38,6 +38,7 @@ protected: virtual void keyPressEvent(QKeyEvent*); virtual bool focusNextPrevChild (bool); + virtual void paintEvent(QPaintEvent*); private slots: void slotPaintEffect(); From uludag-commits at pardus.org.tr Tue May 6 09:41:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 09:41:29 +0300 (EEST) Subject: [Uludag-commits] r17919 - in branches/yali4/yali4/gui: . pics Message-ID: <20080506064129.5561E1384106@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 09:41:29 2008 New Revision: 17919 Modified: branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/gui/pics/logo.png Log: * update the logo.. Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Tue May 6 09:41:29 2008 @@ -44,7 +44,8 @@ self.moveInc = 1 # Dont need help as default - self.slotToggleHelp() + self.helpContent.hide() + self.toggleHelp.setText(_("Show Help")) # Main Slots QObject.connect(self.debugShortCut, SIGNAL("activated()"), self.toggleDebug) Modified: branches/yali4/yali4/gui/pics/logo.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Tue May 6 10:03:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 10:03:45 +0300 (EEST) Subject: [Uludag-commits] r17920 - trunk/python-modules/python-polkit Message-ID: <20080506070345.99C7A1384106@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 10:03:40 2008 New Revision: 17920 Added: trunk/python-modules/python-polkit/ trunk/python-modules/python-polkit/pypolkit.c trunk/python-modules/python-polkit/setup.py (contents, props changed) trunk/python-modules/python-polkit/test.py (contents, props changed) Log: Python binding for PolicyKit - initial commit From uludag-commits at pardus.org.tr Tue May 6 10:24:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 10:24:17 +0300 (EEST) Subject: [Uludag-commits] r17921 - trunk/tasma/package-manager/src Message-ID: <20080506072417.70B501384106@liste.pardus.org.tr> Author: faik Date: Tue May 6 10:24:17 2008 New Revision: 17921 Modified: trunk/tasma/package-manager/src/MainWidget.py Log: wrong get_package param passed Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Tue May 6 10:24:17 2008 @@ -294,8 +294,8 @@ def refreshComponentList(self, item): Globals.setWaitCursor() try: - # fetch packages including metadata from cache - packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in self.componentDict[item].packages] + # fetch packages including metadata from cache + packagesWithMeta = [PisiIface.get_package(package, self.state != install_state) for package in self.componentDict[item].packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: @@ -567,7 +567,7 @@ item = KListViewItem(self.componentsList) item.setText(0,i18n("Search Results")) item.setPixmap(0, KGlobal.iconLoader().loadIcon("find",KIcon.Desktop,KIcon.SizeMedium)) - packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in packages] + packagesWithMeta = [PisiIface.get_package(package, self.state != install_state) for package in packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: From uludag-commits at pardus.org.tr Tue May 6 11:13:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 11:13:51 +0300 (EEST) Subject: [Uludag-commits] r17922 - trunk/python-modules/python-polkit Message-ID: <20080506081351.AC85D13840E7@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 11:13:51 2008 New Revision: 17922 Modified: trunk/python-modules/python-polkit/pypolkit.c trunk/python-modules/python-polkit/test.py Log: auth_list_all(), auth_list_uid(uid) methods Modified: trunk/python-modules/python-polkit/pypolkit.c ================================================================= --- trunk/python-modules/python-polkit/pypolkit.c (original) +++ trunk/python-modules/python-polkit/pypolkit.c Tue May 6 11:13:51 2008 @@ -26,9 +26,9 @@ //! Init policy cache PolKitPolicyCache * -pk_init() +pk_init_cache() { - PolKitError *pk_error; + PolKitError *pk_error = NULL; PolKitContext *pk_context = polkit_context_new(); // Init context @@ -52,6 +52,18 @@ return pk_cache; } +//! Init auth db +PolKitAuthorizationDB * +pk_init_authdb() +{ + PolKitContext *pk_context = polkit_context_new(); + + // Get auth db + PolKitAuthorizationDB *pk_auth = polkit_context_get_authorization_db(pk_context); + + return pk_auth; +} + //! Callback function that fills action list. static polkit_bool_t pk_action_list_cb(PolKitPolicyCache *policy_cache, PolKitPolicyFileEntry *entry, void *user_data) @@ -67,7 +79,7 @@ static PyObject * pk_action_list(PyObject *self, PyObject *args) { - PolKitPolicyCache *pk_cache = pk_init(); + PolKitPolicyCache *pk_cache = pk_init_cache(); if (pk_cache == NULL) { return NULL; } @@ -100,7 +112,7 @@ return NULL; } - PolKitPolicyCache *pk_cache = pk_init(); + PolKitPolicyCache *pk_cache = pk_init_cache(); if (pk_cache == NULL) { return NULL; } @@ -133,10 +145,76 @@ return dict; } +//! Callback function that fills auth list. +static polkit_bool_t +pk_auth_list_uid_cb(PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data) +{ + // Append entry to the list + PyList_Append((PyObject*) user_data, PyString_FromString(polkit_authorization_get_action_id(auth))); + + // Continue to iterate + return FALSE; +} + +//! Returns granted authorizations +static PyObject * +pk_auth_list_uid(PyObject *self, PyObject *args) +{ + int uid; + if (!PyArg_ParseTuple(args, "i", &uid)) { + return NULL; + } + + PolKitAuthorizationDB *pk_auth = pk_init_authdb(); + PolKitError *pk_error = NULL; + + PyObject *list = PyList_New(0); + polkit_authorization_db_foreach_for_uid(pk_auth, uid, pk_auth_list_uid_cb, list, &pk_error); + + if (polkit_error_is_set(pk_error)) { + PyErr_SetString(PK_Error, polkit_error_get_error_name(pk_error)); + polkit_error_free(pk_error); + return NULL; + } + + return list; +} + +//! Callback function that fills auth list. +static polkit_bool_t +pk_auth_list_all_cb(PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data) +{ + // Append entry to the list + PyList_Append((PyObject*) user_data, PyString_FromString(polkit_authorization_get_action_id(auth))); + + // Continue to iterate + return FALSE; +} + +//! Returns granted authorizations +static PyObject * +pk_auth_list_all(PyObject *self, PyObject *args) +{ + PolKitAuthorizationDB *pk_auth = pk_init_authdb(); + PolKitError *pk_error = NULL; + + PyObject *list = PyList_New(0); + polkit_authorization_db_foreach(pk_auth, pk_auth_list_all_cb, list, &pk_error); + + if (polkit_error_is_set(pk_error)) { + PyErr_SetString(PK_Error, polkit_error_get_error_name(pk_error)); + polkit_error_free(pk_error); + return NULL; + } + return list; +} + //! pypolkit methods static PyMethodDef polkit_methods[] = { {"action_list", (PyCFunction) pk_action_list, METH_NOARGS, "Lists all actions."}, {"action_info", (PyCFunction) pk_action_info, METH_VARARGS, "Get action details."}, + {"auth_list_uid", (PyCFunction) pk_auth_list_uid, METH_VARARGS, "List granted authorizations for specified UID."}, + {"auth_list_all", (PyCFunction) pk_auth_list_all, METH_NOARGS, "List granted authorizations."}, {NULL, NULL, 0, NULL} }; Modified: trunk/python-modules/python-polkit/test.py ================================================================= --- trunk/python-modules/python-polkit/test.py (original) +++ trunk/python-modules/python-polkit/test.py Tue May 6 11:13:51 2008 @@ -3,6 +3,20 @@ import pypolkit +print "= " * 20 + +i = 0 for action_id in pypolkit.action_list(): print pypolkit.action_info(action_id) print "- " * 20 + i += 1 + if i > 5: + break + +print "= " * 20 + +print pypolkit.auth_list_uid(1000) + +print "= " * 20 + +print pypolkit.auth_list_all() From uludag-commits at pardus.org.tr Tue May 6 11:29:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 11:29:35 +0300 (EEST) Subject: [Uludag-commits] r17923 - trunk/python-modules/python-polkit Message-ID: <20080506082935.1A60E13840E7@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 11:29:34 2008 New Revision: 17923 Modified: trunk/python-modules/python-polkit/pypolkit.c Log: - auth_list_* methods show details - PK constants - cleanup Modified: trunk/python-modules/python-polkit/pypolkit.c ================================================================= --- trunk/python-modules/python-polkit/pypolkit.c (original) +++ trunk/python-modules/python-polkit/pypolkit.c Tue May 6 11:29:34 2008 @@ -147,10 +147,27 @@ //! Callback function that fills auth list. static polkit_bool_t -pk_auth_list_uid_cb(PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data) +pk_auth_list_cb(PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data) { - // Append entry to the list - PyList_Append((PyObject*) user_data, PyString_FromString(polkit_authorization_get_action_id(auth))); + PyObject *dict = PyDict_New(); + + // Authorization type + PyDict_SetItemString(dict, "type", PyInt_FromLong((long) polkit_authorization_type(auth))); + + // UID + PyDict_SetItemString(dict, "uid", PyInt_FromLong((long) polkit_authorization_get_uid(auth))); + + // Action ID + PyDict_SetItemString(dict, "action_id", PyString_FromString(polkit_authorization_get_action_id(auth))); + + // Time of grant + PyDateTime_IMPORT; + time_t rawtime = polkit_authorization_get_time_of_grant(auth); + struct tm *timeinfo = localtime(&rawtime); + PyDict_SetItemString(dict, "date", PyDateTime_FromDateAndTime(1900 + timeinfo->tm_year, timeinfo->tm_mon, timeinfo->tm_mday, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, 0)); + + // Append tuple to userlist + PyList_Append((PyObject*)user_data, dict); // Continue to iterate return FALSE; @@ -169,7 +186,7 @@ PolKitError *pk_error = NULL; PyObject *list = PyList_New(0); - polkit_authorization_db_foreach_for_uid(pk_auth, uid, pk_auth_list_uid_cb, list, &pk_error); + polkit_authorization_db_foreach_for_uid(pk_auth, uid, pk_auth_list_cb, list, &pk_error); if (polkit_error_is_set(pk_error)) { PyErr_SetString(PK_Error, polkit_error_get_error_name(pk_error)); @@ -180,17 +197,6 @@ return list; } -//! Callback function that fills auth list. -static polkit_bool_t -pk_auth_list_all_cb(PolKitAuthorizationDB *authdb, PolKitAuthorization *auth, void *user_data) -{ - // Append entry to the list - PyList_Append((PyObject*) user_data, PyString_FromString(polkit_authorization_get_action_id(auth))); - - // Continue to iterate - return FALSE; -} - //! Returns granted authorizations static PyObject * pk_auth_list_all(PyObject *self, PyObject *args) @@ -199,7 +205,7 @@ PolKitError *pk_error = NULL; PyObject *list = PyList_New(0); - polkit_authorization_db_foreach(pk_auth, pk_auth_list_all_cb, list, &pk_error); + polkit_authorization_db_foreach(pk_auth, pk_auth_list_cb, list, &pk_error); if (polkit_error_is_set(pk_error)) { PyErr_SetString(PK_Error, polkit_error_get_error_name(pk_error)); @@ -224,6 +230,15 @@ { PyObject *m = Py_InitModule("pypolkit", polkit_methods); + PyModule_AddObject(m, "SCOPE_ONE_SHOT", PyInt_FromLong((long) POLKIT_AUTHORIZATION_SCOPE_PROCESS_ONE_SHOT)); + PyModule_AddObject(m, "SCOPE_PROCESS", PyInt_FromLong((long) POLKIT_AUTHORIZATION_SCOPE_PROCESS)); + PyModule_AddObject(m, "SCOPE_SESSION", PyInt_FromLong((long) POLKIT_AUTHORIZATION_SCOPE_SESSION)); + PyModule_AddObject(m, "SCOPE_ALWAYS", PyInt_FromLong((long) POLKIT_AUTHORIZATION_SCOPE_ALWAYS)); + + PyModule_AddObject(m, "TYPE_UID", PyInt_FromLong((long) POLKIT_AUTHORIZATION_TYPE_UID)); + + PyModule_AddObject(m, "DB_CAPABILITY_CAN_OBTAIN", PyInt_FromLong((long) POLKIT_AUTHORIZATION_DB_CAPABILITY_CAN_OBTAIN)); + PK_Error = PyErr_NewException("pypolkit.error", NULL, NULL); Py_INCREF(PK_Error); PyModule_AddObject(m, "error", PK_Error); From uludag-commits at pardus.org.tr Tue May 6 11:38:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 11:38:17 +0300 (EEST) Subject: [Uludag-commits] r17924 - trunk/tasma/package-manager/src Message-ID: <20080506083817.F2C0F13840FC@liste.pardus.org.tr> Author: faik Date: Tue May 6 11:38:17 2008 New Revision: 17924 Modified: trunk/tasma/package-manager/src/SpecialList.py Log: . Modified: trunk/tasma/package-manager/src/SpecialList.py ================================================================= --- trunk/tasma/package-manager/src/SpecialList.py (original) +++ trunk/tasma/package-manager/src/SpecialList.py Tue May 6 11:38:17 2008 @@ -131,7 +131,7 @@ titleStyle = "" style = "" - packages.sort(key=string.lower) +# packages.sort(key=string.lower) alternativeColor = KGlobalSettings.alternateBackgroundColor().name() baseColor = KGlobalSettings.baseColor().name() @@ -152,18 +152,19 @@ curindex = index + 1 if app.name in self.disabled: checkbox = """
""" % (titleStyle,curindex,checkState,app,curindex) + disabled %s name="%s id="checkboks%d">""" % (titleStyle,curindex,checkState,app.name,curindex) else: checkbox = """
""" % (titleStyle,curindex,checkState,app,curindex) + %s onclick="changeBackgroundColor(this)" name="%s" id="checkboks%d">""" % (titleStyle,curindex,checkState,app.name,curindex) iconSize = getIconSize() - result += template % (checkbox, titleStyle, curindex, app.icon_path, iconSize, iconSize, app.name, app.summary, style, curindex, curindex, + iconPath = getIconPath(app.icon) + result += template % (checkbox, titleStyle, curindex, iconPath, iconSize, iconSize, app.name, app.summary, style, curindex, curindex, i18n("Description: "), app.description, i18n("Version: "), app.version, - i18n("Repository: "), app.repo, - i18n("Package Size: "), app.size, - i18n("Homepage: "), app.homepage, app.homepage) + i18n("Repository: "), "FIXME", #app.repo, + i18n("Package Size: "), "FIXME", #app.size, + i18n("Homepage: "), app.source.homepage, app.source.homepage) index += 1 return result From uludag-commits at pardus.org.tr Tue May 6 12:30:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 12:30:00 +0300 (EEST) Subject: [Uludag-commits] r17925 - in branches/yali4/yali4: . data gui gui/pics Message-ID: <20080506093000.6F6CC138411F@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 12:30:00 2008 New Revision: 17925 Added: branches/yali4/yali4/installer.py Modified: branches/yali4/yali4/data/exampleKickstart.xml branches/yali4/yali4/data/firstBoot.xml branches/yali4/yali4/gui/ScrKahyaCheck.py branches/yali4/yali4/gui/pics/welcome.png branches/yali4/yali4/gui/runner.py branches/yali4/yali4/options.py Log: * Refactoring... Modified: branches/yali4/yali4/data/exampleKickstart.xml ================================================================= --- branches/yali4/yali4/data/exampleKickstart.xml (original) +++ branches/yali4/yali4/data/exampleKickstart.xml Tue May 6 12:30:00 2008 @@ -1,7 +1,8 @@ tr - trq + tr + q pardusman pardus-kickstart Modified: branches/yali4/yali4/data/firstBoot.xml ================================================================= --- branches/yali4/yali4/data/firstBoot.xml (original) +++ branches/yali4/yali4/data/firstBoot.xml Tue May 6 12:30:00 2008 @@ -1,8 +1,9 @@ tr - trq - pardus-kickstart + tr + q + pardus disk0 Modified: branches/yali4/yali4/gui/ScrKahyaCheck.py ================================================================= --- branches/yali4/yali4/gui/ScrKahyaCheck.py (original) +++ branches/yali4/yali4/gui/ScrKahyaCheck.py Tue May 6 12:30:00 2008 @@ -27,10 +27,7 @@ def loadFile(path): """Read contents of a file""" - f = file(path) - data = f.read() - f.close() - return data + return file(path).read() def get_kernel_opt(cmdopt): cmdline = loadFile("/proc/cmdline").split() @@ -72,7 +69,7 @@ ctx.autoInstall = True yaliKahya = kahya() - print "...",ctx.options.kahyaFile + ctx.debugger.log("Kahya File : %s " % ctx.options.kahyaFile) kahyaOpt = get_kernel_opt(ctx.consts.kahyaParam) 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 May 6 12:30:00 2008 @@ -19,6 +19,7 @@ _ = __trans.ugettext import yali4 +import yali4.installer import yali4.sysutils import yali4.gui.context as ctx from yali4.gui.YaliDialog import Dialog @@ -29,20 +30,6 @@ # mainScreen import YaliWindow -# screens -import ScrKahyaCheck -import ScrWelcome -import ScrCheckCD -import ScrKeyboard -import ScrDateTime -import ScrAdmin -import ScrUsers -import ScrPartitionAuto -import ScrPartitionManual -import ScrBootloader -import ScrInstall -import ScrGoodbye - ## # Runner creates main GUI components for installation... class Runner: @@ -52,59 +39,41 @@ def __init__(self): - _all_screens = [ # Numbers can be used with -s paramter - ScrKahyaCheck, # 00 - ScrWelcome, # 01 - ScrCheckCD, # 02 - ScrKeyboard, # 03 - ScrDateTime, # 04 - ScrUsers, # 05 - ScrAdmin, # 06 - ScrPartitionAuto, # 07 - ScrPartitionManual, # 08 - ScrBootloader, # 09 - ScrInstall, # 10 - ScrGoodbye # 11 - ] - - # This list will be used for yali4-firstBoot - _firstBoot_screens = [ # Numbers can be used with -s paramter - ScrWelcome, # 01 - ScrKeyboard, # 02 - ScrDateTime, # 03 - ScrUsers, # 04 - ScrAdmin, # 05 - ScrGoodbye # 06 - ] - + # Qt Stuff self._app = QtGui.QApplication(sys.argv) - self._window = YaliWindow.Widget() - - # check for oemInstall - if yali4.sysutils.checkYaliParams(param=ctx.consts.firstBootParam): - ctx.options.kahyaFile = ctx.consts.firstBootFile - - # font = QtGui.QFont() - # font.setFamily("Droid Sans") - # font.setPixelSize(11) - # self._app.setFont(font) + # Yali.. + self._window = YaliWindow.Widget() ctx.mainScreen = self._window + ctx.yali = yali4.installer.Yali() # visual debugger ctx.debugger = Debugger() + # check boot flags + # check for oemInstall + if yali4.sysutils.checkYaliParams(param=ctx.consts.firstBootParam): + ctx.options.kahyaFile = ctx.consts.firstBootFile + # visual debug mode if ctx.options.debug == True or yali4.sysutils.checkYaliParams(param="debug"): ctx.debugEnabled = True + # Let start ctx.debugger.log("Yali Started") - self._window.createWidgets(_all_screens) + # font = QtGui.QFont() + # font.setFamily("Droid Sans") + # font.setPixelSize(11) + # self._app.setFont(font) + + # add Screens for selected install type + self._window.createWidgets(ctx.yali.screens) + + # base connections QObject.connect(self._app, SIGNAL("lastWindowClosed()"), self._app, SLOT("quit()")) - QObject.connect(ctx.mainScreen.ui, SIGNAL("signalProcessEvents"), self._app.processEvents) @@ -121,13 +90,14 @@ # We want it to be a full-screen window. self._window.ui.resize(self._app.desktop().size()) + self._window.ui.move(0,0) self._window.ui.show() # For testing.. - #self._window.ui.resize(QSize(800,600)) - # self._window.ui.move(0,0) - self._app.exec_() + # self._window.ui.resize(QSize(800,600)) + # Run run run + self._app.exec_() def showException(ex_type, tb): title = _("Error!") Modified: branches/yali4/yali4/options.py ================================================================= --- branches/yali4/yali4/options.py (original) +++ branches/yali4/yali4/options.py Tue May 6 12:30:00 2008 @@ -24,6 +24,9 @@ parser.add_option("-r", "--dryRun", dest="dryRun", action="store_true", default="False", help="only show the result") + parser.add_option("-f", "--firstBoot", dest="firstBoot", + action="store_true", default="False", + help="only show the result") parser.add_option("-k", "--kahyaFile", dest="kahyaFile", help="Run with Kahya file", metavar="FILE") parser.add_option("-s", "--startFrom", dest="startupScreen", From uludag-commits at pardus.org.tr Tue May 6 13:50:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 13:50:45 +0300 (EEST) Subject: [Uludag-commits] r17926 - trunk/tasma/package-manager/src Message-ID: <20080506105045.4DE4113840E3@liste.pardus.org.tr> Author: faik Date: Tue May 6 13:50:44 2008 New Revision: 17926 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/PisiIface.py Log: search fixes Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Tue May 6 13:50:44 2008 @@ -701,7 +701,7 @@ def searchPackage(self): query = unicode(self.searchLine.text()) if query: - result = PisiIface.search_package(query.split(), self.state == install_state) + result = PisiIface.search_package(query.split(), self.state != install_state) self.createSearchResults(result) else: self.timer.stop() Modified: trunk/tasma/package-manager/src/PisiIface.py ================================================================= --- trunk/tasma/package-manager/src/PisiIface.py (original) +++ trunk/tasma/package-manager/src/PisiIface.py Tue May 6 13:50:44 2008 @@ -90,5 +90,5 @@ if installed: return pisi.api.search_installed(terms) else: - return pisi.api.serach_package(terms) + return pisi.api.search_package(terms) From uludag-commits at pardus.org.tr Tue May 6 13:59:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 13:59:23 +0300 (EEST) Subject: [Uludag-commits] r17927 - in branches/yali4/yali4: . data gui Message-ID: <20080506105923.E8CEB13840E3@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 13:59:23 2008 New Revision: 17927 Modified: branches/yali4/yali4/data/firstBoot.xml branches/yali4/yali4/gui/ScrKahyaCheck.py branches/yali4/yali4/gui/ScrKeyboard.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/installer.py branches/yali4/yali4/kahya.py branches/yali4/yali4/yalireadpiks.py Log: * Merge old techniques to new one.. Modified: branches/yali4/yali4/data/firstBoot.xml ================================================================= --- branches/yali4/yali4/data/firstBoot.xml (original) +++ branches/yali4/yali4/data/firstBoot.xml Tue May 6 13:59:23 2008 @@ -4,7 +4,7 @@ tr q pardus - + disk0 Modified: branches/yali4/yali4/gui/ScrKahyaCheck.py ================================================================= --- branches/yali4/yali4/gui/ScrKahyaCheck.py (original) +++ branches/yali4/yali4/gui/ScrKahyaCheck.py Tue May 6 13:59:23 2008 @@ -98,6 +98,9 @@ correctData = yaliKahya.getValues() ctx.debugger.log("Given Kahya Values :") + # set keymap + ctx.yali.setKeymap(correctData.keyData) + # single types ctx.installData.keyData = correctData.keyData ctx.installData.rootPassword = correctData.rootPassword Modified: branches/yali4/yali4/gui/ScrKeyboard.py ================================================================= --- branches/yali4/yali4/gui/ScrKeyboard.py (original) +++ branches/yali4/yali4/gui/ScrKeyboard.py Tue May 6 13:59:23 2008 @@ -77,7 +77,7 @@ def slotLayoutChanged(self,i,y=None): if not i==y: keydata = i.getData() - yali4.localeutils.set_keymap(keydata["xkblayout"], keydata["xkbvariant"]) + ctx.yali.setKeymap(keydata) class KeyboardItem(QtGui.QListWidgetItem): Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Tue May 6 13:59:23 2008 @@ -30,6 +30,8 @@ # mainScreen import YaliWindow +YALI_INSTALL, YALI_FIRSTBOOT, YALI_PARTITIONER = range(3) + ## # Runner creates main GUI components for installation... class Runner: @@ -46,7 +48,12 @@ # Yali.. self._window = YaliWindow.Widget() ctx.mainScreen = self._window - ctx.yali = yali4.installer.Yali() + + # Check for firstBoot on installed system (parameters from options) + install_type = YALI_INSTALL + if ctx.options.firstBoot: + install_type = YALI_FIRSTBOOT + ctx.yali = yali4.installer.Yali(install_type) # visual debugger ctx.debugger = Debugger() Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Tue May 6 13:59:23 2008 @@ -21,6 +21,7 @@ # yali base from yali4.exception import * from yali4.constants import consts +import yali4.localeutils import yali4.sysutils # partitioning @@ -91,3 +92,7 @@ # Let the show begin.. self.screens = self._screens[install_type] + def setKeymap(self, keymap): + yali4.localeutils.set_keymap(keymap["xkblayout"], keymap["xkbvariant"]) + self.keymap = keymap + Modified: branches/yali4/yali4/kahya.py ================================================================= --- branches/yali4/yali4/kahya.py (original) +++ branches/yali4/yali4/kahya.py Tue May 6 13:59:23 2008 @@ -76,16 +76,16 @@ def checkKeymapX(self): """It checks keymap validity""" - for element in getKeymaps(): - if element.X==self.keyX: + for country, data in yali4.localedata.locales.items(): + if data["xkblayout"] == self.keyX: return True return False def findKeymap(self): """It attaches console Keymap""" - for element in getKeymaps(): - if element.X==self.keyX: - return element.console + for country,data in yali4.localedata.locales.items(): + if data["xkblayout"] == self.keyX: + return data["consolekeymap"] return False class partitionFunctions: @@ -138,7 +138,7 @@ def checkAllOptions(self): """It checks all data entries and edits them""" error=errors() - otherFunct=otherFunctions(self.data.keyData.X) + otherFunct=otherFunctions(self.data.keyData["xkblayout"]) ###repo selection### if self.data.repoAddr: @@ -153,27 +153,17 @@ self.errorList.append("Language Error: %s does not exist"%self.data.language) ###keymap selection### - if self.data.keyData.X: + if self.data.keyData["xkblayout"]: if otherFunct.checkKeymapX(): - self.correctData.keyData.X=self.data.keyData.X - self.correctData.keyData.console=otherFunct.findKeymap() + self.correctData.keyData["xkblayout"]=self.data.keyData["xkblayout"] + self.correctData.keyData["consolekeymap"]=otherFunct.findKeymap() else: error.Keymap=True - self.errorList.append("Keymap Error: %s not valid "%self.data.keyData.X) + self.errorList.append("Keymap Error: %s not valid " % self.data.keyData["xkblayout"]) else: if error.Lang!=True: - for lang in getLangsWithKeymaps(): - if lang[0]==self.correctData.language: - if self.correctData.language=="tr": - self.correctData.keyData.X=lang[1][0].X - self.correctData.keyData.console=lang[1][0].console - else: - self.correctData.keyData.X=lang[1].X - self.correctData.keyData.console=lang[1].console - break - else: - error.Keymap=True - self.errorList.append("Keymap Error: Cannot associate Keymap for %s"%self.data.language) + error.Keymap=True + self.errorList.append("Keymap Error: Cannot associate Keymap for %s"%self.data.language) ###root password selection### if len(self.data.rootPassword)<4: Modified: branches/yali4/yali4/yalireadpiks.py ================================================================= --- branches/yali4/yali4/yalireadpiks.py (original) +++ branches/yali4/yali4/yalireadpiks.py Tue May 6 13:59:23 2008 @@ -7,7 +7,9 @@ class kahyaData: def __init__(self): self.language=None - self.keyData=Keymap() + self.keyData={"xkblayout":"tr", + "xkbvariant":"q", + "consolekeymap":"trq"} self.rootPassword='' self.hostname=None self.users=[] @@ -18,7 +20,7 @@ self.repoAddr = None self.useYaliFirstBoot = False -class yaliUser: +class yaliUser: def __init__(self): self.autologin=None self.username=None @@ -26,12 +28,6 @@ self.password=None self.groups=[] -class Keymap: - def __init__(self): - self.console = None - self.X = None - self.translation = None - class yaliPartition: def __init__(self): self.partitionType=None @@ -46,13 +42,14 @@ doc=piksemel.parse(args) data=kahyaData() data.language=doc.getTagData("language") - data.keyData.X=doc.getTagData("keymap") + data.keyData["xkblayout"]=doc.getTagData("keymap") + data.keyData["xkbvariant"]=doc.getTagData("variant") or '' data.rootPassword=doc.getTagData("root_password") or '' data.hostname=doc.getTagData("hostname") data.repoName=doc.getTagData("reponame") or data.repoName data.repoAddr=doc.getTagData("repoaddr") usrsTag=doc.getTag("users") - data.useYaliFirstBoot=usrsTag.getAttribute("use_yali_first_boot") or False + data.useYaliFirstBoot=usrsTag.getAttribute("first_boot") or False for p in usrsTag.tags(): info=yaliUser() @@ -70,7 +67,7 @@ autoPart=yaliPartition() autoPart.disk=partitioning.firstChild().data() data.partitioning.append(autoPart) - else: + elif(data.partitioningType=="manual"): for q in partitioning.tags(): partinfo=yaliPartition() partinfo.partitionType=q.getAttribute("partition_type") From uludag-commits at pardus.org.tr Tue May 6 13:59:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 13:59:53 +0300 (EEST) Subject: [Uludag-commits] r17928 - trunk/sysinfo/sysinfo/about/images Message-ID: <20080506105953.29FB113840E2@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 13:59:52 2008 New Revision: 17928 Modified: trunk/sysinfo/sysinfo/about/images/background.png Log: * New background. Modified: trunk/sysinfo/sysinfo/about/images/background.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Tue May 6 14:10:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 14:10:12 +0300 (EEST) Subject: [Uludag-commits] r17929 - in branches/pisi-devel/pisi: . cli Message-ID: <20080506111012.A0C9D13840E1@liste.pardus.org.tr> Author: faik Date: Tue May 6 14:10:12 2008 New Revision: 17929 Modified: branches/pisi-devel/pisi/api.py branches/pisi-devel/pisi/cli/configurepending.py Log: apply configure pending patch to pisi-devel Modified: branches/pisi-devel/pisi/api.py ================================================================= --- branches/pisi-devel/pisi/api.py (original) +++ branches/pisi-devel/pisi/api.py Tue May 6 14:10:12 2008 @@ -434,12 +434,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).intersection(installdb.list_pending()) + + order = generate_pending_order(packages) try: for x in order: if installdb.has_package(x): Modified: branches/pisi-devel/pisi/cli/configurepending.py ================================================================= --- branches/pisi-devel/pisi/cli/configurepending.py (original) +++ branches/pisi-devel/pisi/cli/configurepending.py Tue May 6 14:10:12 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 Tue May 6 14:13:37 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 14:13:37 +0300 (EEST) Subject: [Uludag-commits] r17930 - in branches/pisi-devel: . licenses pisi pisi/db pisi/operations po Message-ID: <20080506111337.A33B813840E1@liste.pardus.org.tr> Author: faik Date: Tue May 6 14:13:37 2008 New Revision: 17930 Added: branches/pisi-devel/licenses/OSML-1.0 - copied unchanged from r17929, trunk/pisi/licenses/OSML-1.0 branches/pisi-devel/licenses/PlaneShift - copied unchanged from r17929, trunk/pisi/licenses/PlaneShift branches/pisi-devel/licenses/iwlwifi-ucode - copied unchanged from r17929, trunk/pisi/licenses/iwlwifi-ucode branches/pisi-devel/licenses/xiph - copied unchanged from r17929, trunk/pisi/licenses/xiph Modified: branches/pisi-devel/pisi-spec.rng branches/pisi-devel/pisi/db/itembyrepo.py branches/pisi-devel/pisi/operations/history.py branches/pisi-devel/pisi/signalhandler.py branches/pisi-devel/po/es.po Log: merge from trunk Modified: branches/pisi-devel/pisi-spec.rng ================================================================= --- branches/pisi-devel/pisi-spec.rng (original) +++ branches/pisi-devel/pisi-spec.rng Tue May 6 14:13:37 2008 @@ -384,6 +384,7 @@ OSIRIS OSL-1.1 OSL-2.0 + OSML-1.0 OTN Omni OpenSoftware @@ -415,6 +416,7 @@ Parallels PathfinderPL-1.1 PicoContainer + PlaneShift PoseidonCommon.pdf Princeton Q2EULA @@ -639,6 +641,7 @@ ipw2200-fw ipw3945 isc-dhcp + iwlwifi-ucode ixp4xx jardinains jaxen @@ -985,6 +988,7 @@ xhost xineramaproto xinit + xiph xkbcomp xkbdata xkbevd Modified: branches/pisi-devel/pisi/db/itembyrepo.py ================================================================= --- branches/pisi-devel/pisi/db/itembyrepo.py (original) +++ branches/pisi-devel/pisi/db/itembyrepo.py Tue May 6 14:13:37 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): Modified: branches/pisi-devel/pisi/operations/history.py ================================================================= --- branches/pisi-devel/pisi/operations/history.py (original) +++ branches/pisi-devel/pisi/operations/history.py Tue May 6 14:13:37 2008 @@ -104,7 +104,7 @@ if pkg.operation in ["upgrade", "downgrade", "remove"]: actions[pkg.name] = ("install", pkg.before, operation.no) if pkg.operation == "install": - actions[pkg.name] = ("remove", None) + actions[pkg.name] = ("remove", None, operation.no) return actions Modified: branches/pisi-devel/pisi/signalhandler.py ================================================================= --- branches/pisi-devel/pisi/signalhandler.py (original) +++ branches/pisi-devel/pisi/signalhandler.py Tue May 6 14:13:37 2008 @@ -38,7 +38,10 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldhandler = self.signals[sig].oldhandler + if self.signals[sig].oldhandler: + oldhandler = self.signals[sig].oldhandler + else: + oldhandler = signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] signal.signal(sig, oldhandler) Modified: branches/pisi-devel/po/es.po ================================================================= --- branches/pisi-devel/po/es.po (original) +++ branches/pisi-devel/po/es.po Tue May 6 14:13:37 2008 @@ -6,12 +6,13 @@ # Christian Faure , 2007. # klemens , 2007. # Klemens Haeckel , 2008. +# Klemens Haeckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "POT-Creation-Date: 2008-01-31 16:42+EET\n" -"PO-Revision-Date: 2008-02-17 07:50-0300\n" -"Last-Translator: Klemens Haeckel \n" +"PO-Revision-Date: 2008-05-03 19:12-0400\n" +"Last-Translator: Klemens Haeckel \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -818,7 +819,7 @@ #: pisi/atomicoperations.py:161 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" -"los paquetes %s no se puede instalar hasta que instale los paquetes " +"paquete %s no se puede instalar hasta que instale los paquetes " "requeridos" # check this ?? - probably ok, but see the context @@ -1204,15 +1205,15 @@ #: pisi/cli/graph.py:70 msgid "Plotting packages in repository %s" -msgstr "Ploteando paquetes de repositorio %s" +msgstr "graficando paquetes de repositorio %s" #: pisi/cli/graph.py:73 msgid "Plotting a graph of relations among all repository packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" +msgstr "graficando las relaciones entre todos los paquetes en repositorio" #: pisi/cli/graph.py:87 msgid "Plotting a graph of relations among all installed packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes instalados" +msgstr "graficando las relaciones entre todos los paquetes instalados" #: pisi/cli/help.py:49 msgid "" From uludag-commits at pardus.org.tr Tue May 6 14:19:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 14:19:02 +0300 (EEST) Subject: [Uludag-commits] r17931 - trunk/python-modules/python-polkit Message-ID: <20080506111902.C345A138405C@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 14:19:01 2008 New Revision: 17931 Modified: trunk/python-modules/python-polkit/pypolkit.c trunk/python-modules/python-polkit/test.py Log: auth_add() method for authorizing users. Process must have 'polkit' effective gid. Modified: trunk/python-modules/python-polkit/pypolkit.c ================================================================= --- trunk/python-modules/python-polkit/pypolkit.c (original) +++ trunk/python-modules/python-polkit/pypolkit.c Tue May 6 14:19:01 2008 @@ -9,8 +9,10 @@ #include #include -#include #include +#include +#include +#include //! Standard exception for pypolkit static PyObject *PK_Error; @@ -24,6 +26,33 @@ } } +//! Creates action object from action id +PolKitAction * +pk_make_action(const char *action_id) +{ + PolKitAction *pk_action = polkit_action_new(); + polkit_action_set_action_id(pk_action, action_id); + return pk_action; +} + +//! Creates caller object from uid +PolKitCaller * +pk_make_caller_from_uid(int uid) +{ + PolKitCaller *pk_caller = polkit_caller_new(); + polkit_caller_set_uid(pk_caller, (uid_t) uid); + return pk_caller; +} + +//! Creates caller object from pid +PolKitCaller * +pk_make_caller_from_pid(int pid) +{ + PolKitCaller *pk_caller = polkit_caller_new(); + polkit_caller_set_pid(pk_caller, (pid_t) pid); + return pk_caller; +} + //! Init policy cache PolKitPolicyCache * pk_init_cache() @@ -215,12 +244,66 @@ return list; } +//! Authorize user for the given action a single time +static PyObject * +pk_auth_add(PyObject *self, PyObject *args) +{ + const char* action_id; + int pid, uid, type; + + if (!PyArg_ParseTuple(args, "siii", &action_id, &pid, &uid, &type)) { + return NULL; + } + + struct group *gr = getgrnam("polkit"); + if (gr->gr_gid != getegid()) { + PyErr_SetString(PK_Error, "Effective GID must be 'polkit'"); + return NULL; + } + + PolKitAuthorizationDB *pk_auth = pk_init_authdb(); + PolKitError *pk_error = NULL; + + PolKitAction *pk_action = pk_make_action(action_id); + PolKitCaller *pk_caller = pk_make_caller_from_pid(pid); + + polkit_bool_t pk_status; + + switch (type) { + case POLKIT_AUTHORIZATION_SCOPE_PROCESS_ONE_SHOT: + polkit_authorization_db_add_entry_process_one_shot(pk_auth, pk_action, pk_caller, uid); + break; + case POLKIT_AUTHORIZATION_SCOPE_PROCESS: + polkit_authorization_db_add_entry_process(pk_auth, pk_action, pk_caller, uid); + break; + case POLKIT_AUTHORIZATION_SCOPE_SESSION: + polkit_authorization_db_add_entry_session(pk_auth, pk_action, pk_caller, uid); + break; + case POLKIT_AUTHORIZATION_SCOPE_ALWAYS: + polkit_authorization_db_add_entry_always(pk_auth, pk_action, pk_caller, uid); + break; + default: + PyErr_SetString(PK_Error, "Unknown authorization type."); + return NULL; + } + + if (pk_status) { + Py_INCREF(Py_True); + return Py_True; + } + else { + Py_INCREF(Py_False); + return Py_False; + } +} + //! pypolkit methods static PyMethodDef polkit_methods[] = { {"action_list", (PyCFunction) pk_action_list, METH_NOARGS, "Lists all actions."}, {"action_info", (PyCFunction) pk_action_info, METH_VARARGS, "Get action details."}, {"auth_list_uid", (PyCFunction) pk_auth_list_uid, METH_VARARGS, "List granted authorizations for specified UID."}, {"auth_list_all", (PyCFunction) pk_auth_list_all, METH_NOARGS, "List granted authorizations."}, + {"auth_add", (PyCFunction) pk_auth_add, METH_VARARGS, "Authorize user for the given action."}, {NULL, NULL, 0, NULL} }; Modified: trunk/python-modules/python-polkit/test.py ================================================================= --- trunk/python-modules/python-polkit/test.py (original) +++ trunk/python-modules/python-polkit/test.py Tue May 6 14:19:01 2008 @@ -1,8 +1,10 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +import os import pypolkit +""" print "= " * 20 i = 0 @@ -20,3 +22,6 @@ print "= " * 20 print pypolkit.auth_list_all() +""" + +print pypolkit.auth_add("tr.org.pardus.comar.system.service.set", os.getpid(), os.getuid(), 10) From uludag-commits at pardus.org.tr Tue May 6 14:39:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 14:39:53 +0300 (EEST) Subject: [Uludag-commits] r17932 - trunk/baselayout/etc/skel Message-ID: <20080506113953.1CDB7138410F@liste.pardus.org.tr> Author: caglar Date: Tue May 6 14:39:52 2008 New Revision: 17932 Modified: trunk/baselayout/etc/skel/.gtkrc-2.0-kde Log: icon fallback to tulliana Modified: trunk/baselayout/etc/skel/.gtkrc-2.0-kde ================================================================= --- trunk/baselayout/etc/skel/.gtkrc-2.0-kde (original) +++ trunk/baselayout/etc/skel/.gtkrc-2.0-kde Tue May 6 14:39:52 2008 @@ -2,6 +2,7 @@ # You can edit it in the KDE control center, under "GTK Styles and Fonts" include "/usr/share/themes/Qt/gtk-2.0/gtkrc" +include "/etc/gtk-2.0/gtkrc" style "user-font" { From uludag-commits at pardus.org.tr Tue May 6 15:02:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 15:02:11 +0300 (EEST) Subject: [Uludag-commits] r17933 - in trunk/pisi: . pisi pisi/actionsapi Message-ID: <20080506120211.6C6EC13840CD@liste.pardus.org.tr> Author: faik Date: Tue May 6 15:02:11 2008 New Revision: 17933 Removed: trunk/pisi/comar-dbus.patch trunk/pisi/pisi-cli2.5 trunk/pisi/python-2.5.patch Modified: trunk/pisi/pisi/actionsapi/autotools.py trunk/pisi/pisi/api.py trunk/pisi/pisi/archive.py trunk/pisi/pisi/atomicoperations.py trunk/pisi/pisi/comariface.py trunk/pisi/pisi/configfile.py trunk/pisi/pisi/context.py Log: Merge from pisi-devel... trunk is for 2008 development. Modified: trunk/pisi/pisi/actionsapi/autotools.py ================================================================= --- trunk/pisi/pisi/actionsapi/autotools.py (original) +++ trunk/pisi/pisi/actionsapi/autotools.py Tue May 6 15:02:11 2008 @@ -26,6 +26,7 @@ from pisi.actionsapi.shelltools import can_access_file from pisi.actionsapi.shelltools import unlink from pisi.actionsapi.libtools import gnuconfig_update +from pisi.actionsapi.libtools import libtoolize class ConfigureError(pisi.actionsapi.Error): def __init__(self, value=''): @@ -55,6 +56,7 @@ def configure(parameters = ''): '''configure source with given parameters = "--with-nls --with-libusb --with-something-usefull"''' + if can_access_file('configure'): gnuconfig_update() Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Tue May 6 15:02:11 2008 @@ -73,13 +73,28 @@ """ ctx.comar = enable -def set_comar_sockname(sockname): +def set_comar_destination(destination): """ - Set comar socket file + Set comar bus destination + @param destination: Path to bus destination of COMAR + """ + ctx.comar_destination = destination + +def set_dbus_sockname(sockname): + """ + Set dbus socket file + Used by YALI + @param sockname: Path to dbus socket file + """ + ctx.dbus_sockname = sockname + +def set_dbus_timeout(timeout): + """ + Set dbus timeout Used by YALI - @param sockname: Path to comar socket file + @param timeout: Timeout in seconds """ - ctx.comar_sockname = sockname + ctx.dbus_timeout = timeout def set_signal_handling(enable): """ Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Tue May 6 15:02:11 2008 @@ -19,6 +19,7 @@ import tarfile import zipfile import gzip +import struct import gettext __trans = gettext.translation('pisi', fallback=True) @@ -114,8 +115,7 @@ elif self.type == 'tarlzma': rmode = 'r:' self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix) - ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + ctx.const.lzma_suffix, - self.file_path)) + ret, out, err = util.run_batch("lzma -k -f -d %s%s" % (self.file_path,ctx.const.lzma_suffix)) if ret != 0: raise LzmaRuntimeError(err) else: @@ -190,9 +190,9 @@ if self.tar.mode == 'wb' and self.type == 'tarlzma': batch = None if ctx.config.values.build.compressionlevel: - batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) + batch = "lzma -%s -z %s" % (ctx.config.values.build.compressionlevel, self.file_path) else: - batch = "lzmash %s" % self.file_path + batch = "lzma -z %s" % self.file_path ret, out, err = util.run_batch(batch) if ret != 0: @@ -213,7 +213,23 @@ "Attempt to read ZIP archive that was already closed" zinfo = self.getinfo(name) filepos = self.fp.tell() - self.fp.seek(zinfo.file_offset, 0) + + self.fp.seek(zinfo.header_offset, 0) + + # Skip the file header: + fheader = self.fp.read(30) + if fheader[0:4] != zipfile.stringFileHeader: + raise BadZipfile, "Bad magic number for file header" + + fheader = struct.unpack(zipfile.structFileHeader, fheader) + fname = self.fp.read(fheader[zipfile._FH_FILENAME_LENGTH]) + if fheader[zipfile._FH_EXTRA_FIELD_LENGTH]: + self.fp.read(fheader[zipfile._FH_EXTRA_FIELD_LENGTH]) + + if fname != zinfo.orig_filename: + raise zipfile.BadZipfile, \ + 'File name in directory "%s" and header "%s" differ.' % ( + zinfo.orig_filename, fname) destfile = file(outname, 'wb') Modified: trunk/pisi/pisi/atomicoperations.py ================================================================= --- trunk/pisi/pisi/atomicoperations.py (original) +++ trunk/pisi/pisi/atomicoperations.py Tue May 6 15:02:11 2008 @@ -152,7 +152,7 @@ # check comar if self.metadata.package.providesComar and ctx.comar: import pisi.comariface as comariface - comariface.get_comar() + comariface.get_iface() def check_relations(self): # check dependencies Modified: trunk/pisi/pisi/comariface.py ================================================================= --- trunk/pisi/pisi/comariface.py (original) +++ trunk/pisi/pisi/comariface.py Tue May 6 15:02:11 2008 @@ -13,6 +13,7 @@ import os import time import select +import string import gettext __trans = gettext.translation('pisi', fallback=True) @@ -25,19 +26,43 @@ pass try: - import comar + import dbus except ImportError: - raise Error(_("comar package is not fully installed")) + raise Error(_("dbus-python package is not fully installed")) -def get_comar(): - """Connect to the comar daemon and return the handle""" +def is_char_valid(char): + """Test if char is valid object path character.""" + return char in string.ascii_letters + string.digits + "_" + +def make_object_path(package): + """Generates DBus object name from package name.""" + object = package + for char in package: + if not is_char_valid(char): + object = object.replace(char, '_') + if object[0].isdigit(): + object = '_%s' % object + return object + +def get_iface(package="", model=""): + """Connect to the DBus daemon and return the system interface.""" - sockname = "/var/run/comar.socket" + sockname = "/var/run/dbus/system_bus_socket" # YALI starts comar chrooted in the install target, but uses PiSi outside of # the chroot environment, so PiSi needs to use a different socket path to be - # able to connect true comar (usually /mnt/target/var/run/comar.socket). - if ctx.comar_sockname: - sockname = ctx.comar_sockname + # able to connect true dbus (and comar). + # (usually /var/run/dbus/system_bus_socket) + if ctx.dbus_sockname: + sockname = ctx.dbus_sockname + + if package: + obj_path = "/package/%s" % package + else: + obj_path = "/" + if model: + obj_interface = "tr.org.pardus.comar.%s" % model + else: + obj_interface = "tr.org.pardus.comar" # This function is sometimes called when comar has recently started # or restarting after an update. So we give comar a chance to become @@ -45,97 +70,103 @@ timeout = 7 while timeout > 0: try: - com = comar.Link(sockname) - return com - except comar.CannotConnect: + bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % sockname) + obj = bus.get_object(ctx.comar_destination, obj_path, introspect=False) + iface = dbus.Interface(obj, dbus_interface=obj_interface) + return iface + except dbus.DBusException: pass time.sleep(0.2) timeout -= 0.2 - raise Error(_("cannot connect to comar")) - -def wait_for_result(com, package_name=None): - multiple = False - while True: - try: - reply = com.read_cmd() - except select.error: - if ctx.keyboard_interrupt_pending(): - return - raise - except comar.LinkClosed: - # Comar postInstall does a "service comar restart" which cuts - # our precious communication link, so we waitsss - if package_name == "comar": - try: - get_comar() - except Error: - raise Error, _("Could not restart comar") - return - else: - if ctx.keyboard_interrupt_pending(): - return - raise Error, _("connection with comar unexpectedly closed") - - cmd = reply[0] - if cmd == com.RESULT and not multiple: - return - elif cmd == com.NONE and not multiple: - # no post/pre function, that is ok - return - elif cmd == com.RESULT_START: - multiple = True - elif cmd == com.RESULT_END: - return - elif cmd == com.FAIL: - raise Error, _("Configuration error: %s") % reply[2] - elif cmd == com.ERROR: - raise Error, _("Script error: %s") % reply[2] - elif cmd == com.DENIED: - raise Error, _("comar denied our access") + raise Error(_("cannot connect to dbus")) def post_install(package_name, provided_scripts, scriptpath, metapath, filepath, fromVersion, fromRelease, toVersion, toRelease): """Do package's post install operations""" ctx.ui.info(_("Configuring %s package") % package_name) self_post = False - com = get_comar() + sys_service = False + sys_iface = get_iface() + object_name = make_object_path(package_name) for script in provided_scripts: ctx.ui.debug(_("Registering %s comar script") % script.om) if script.om == "System.Package": self_post = True - com.register(script.om, package_name, os.path.join(scriptpath, script.script)) - wait_for_result(com) + elif script.om == "System.Service": + sys_service = True + try: + sys_iface.register(object_name, script.om, os.path.join(scriptpath, script.script)) + except dbus.DBusException, exception: + raise Error, _("Script error: %s") % exception + if sys_service: + try: + iface = get_iface(object_name, "System.Service") + iface.registerState() + except dbus.DBusException, exception: + raise Error, _("Script error: %s") % exception ctx.ui.debug(_("Calling post install handlers")) - com.call("System.PackageHandler.setupPackage", [ "metapath", metapath, "filepath", filepath ]) - wait_for_result(com) + for handler in sys_iface.listModelApplications("System.PackageHandler"): + iface = get_iface(handler, "System.PackageHandler") + try: + iface.setupPackage(metapath, filepath, timeout=ctx.dbus_timeout) + except dbus.DBusException, exception: + # Do nothing if setupPackage method is not defined in package script + if not (exception._dbus_error_name.startswith("tr.org.pardus.comar") and + exception._dbus_error_name.split('tr.org.pardus.comar.')[1] == 'python.missing'): + raise Error, _("Script error: %s") % exception if self_post: - args = { - "fromVersion": fromVersion, - "fromRelease": fromRelease, - "toVersion": toVersion, - "toRelease": toRelease, - } + if not fromVersion: + fromVersion = "" + if not fromRelease: + fromRelease = "" + ctx.ui.debug(_("Running package's post install script")) - com.call_package("System.Package.postInstall", package_name, args) - wait_for_result(com, package_name) + try: + iface = get_iface(object_name, "System.Package") + iface.postInstall(fromVersion, fromRelease, toVersion, toRelease, timeout=ctx.dbus_timeout) + except dbus.DBusException, exception: + # Do nothing if postInstall method is not defined in package script + if not (exception._dbus_error_name.startswith("tr.org.pardus.comar") and + exception._dbus_error_name.split('tr.org.pardus.comar.')[1] == 'python.missing'): + raise Error, _("Script error: %s") % exception + + if package_name == 'comar': + pisi.api.set_comar_destination('tr.org.pardus.comar.new') def pre_remove(package_name, metapath, filepath): """Do package's pre removal operations""" ctx.ui.info(_("Configuring %s package for removal") % package_name) - com = get_comar() + sys_iface = get_iface() + object_name = make_object_path(package_name) - ctx.ui.debug(_("Running package's pre remove script")) - com.call_package("System.Package.preRemove", package_name) - wait_for_result(com) + if "System.Package" in sys_iface.listApplicationModels(object_name): + ctx.ui.debug(_("Running package's pre remove script")) + iface = get_iface(object_name, "System.Package") + try: + iface.preRemove(timeout=ctx.dbus_timeout) + except dbus.DBusException, exception: + # Do nothing if preRemove method is not defined in package script + if not (exception._dbus_error_name.startswith("tr.org.pardus.comar") and + exception._dbus_error_name.split('tr.org.pardus.comar.')[1] == 'python.missing'): + raise Error, _("Script error: %s") % exception ctx.ui.debug(_("Calling pre remove handlers")) - com.call("System.PackageHandler.cleanupPackage", [ "metapath", metapath, "filepath", filepath ]) - wait_for_result(com) + for handler in sys_iface.listModelApplications("System.PackageHandler"): + iface = get_iface(handler, "System.PackageHandler") + try: + iface.cleanupPackage(metapath, filepath, timeout=ctx.dbus_timeout) + except dbus.DBusException, exception: + # Do nothing if cleanupPackage method is not defined in package script + if not (exception._dbus_error_name.startswith("tr.org.pardus.comar") and + exception._dbus_error_name.split('tr.org.pardus.comar.')[1] == 'python.missing'): + raise Error, _("Script error: %s") % exception ctx.ui.debug(_("Unregistering comar scripts")) - com.remove(package_name) - wait_for_result(com) + try: + sys_iface.remove(object_name) + except dbus.DBusException, exception: + raise Error, _("Script error: %s") % exception Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Tue May 6 15:02:11 2008 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005 - 2007, TUBITAK/UEKAE +# Copyright (C) 2005 - 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 @@ -25,9 +25,9 @@ #host = i686-pc-linux-gnu #generateDebug = False #jobs = "-j1" -#CFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow -g -ggdb -#CXXFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow -g -ggdb -#LDFLAGS= +#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2 +#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2 +#LDFLAGS= -Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -65,7 +65,7 @@ destinationdirectory = "/" autoclean = False distribution = "Pardus" - distribution_release = "2007" + distribution_release = "2008" architecture = "i686" http_proxy = os.getenv("HTTP_PROXY") or None https_proxy = os.getenv("HTTPS_PROXY") or None @@ -78,9 +78,9 @@ host = "i686-pc-linux-gnu" jobs = "-j1" generateDebug = False - cflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" - cxxflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" - ldflags = "" + cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2" + cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2" + ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu" buildno = False buildhelper = None compressionlevel = 7 Modified: trunk/pisi/pisi/context.py ================================================================= --- trunk/pisi/pisi/context.py (original) +++ trunk/pisi/pisi/context.py Tue May 6 15:02:11 2008 @@ -38,7 +38,9 @@ stderr = None comar = True -comar_sockname = None +comar_destination = "tr.org.pardus.comar" +dbus_sockname = None +dbus_timeout = 300 # Bug #2879 # FIXME: Maybe we can create a simple rollback mechanism. There are other From uludag-commits at pardus.org.tr Tue May 6 15:02:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 15:02:53 +0300 (EEST) Subject: [Uludag-commits] r17934 - branches/pisi-devel Message-ID: <20080506120253.B1E9A13840CD@liste.pardus.org.tr> Author: faik Date: Tue May 6 15:02:53 2008 New Revision: 17934 Removed: branches/pisi-devel/ Log: no need.. From uludag-commits at pardus.org.tr Tue May 6 15:03:18 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 15:03:18 +0300 (EEST) Subject: [Uludag-commits] r17935 - branches/pisi-xml Message-ID: <20080506120322.1F6CA13840C9@liste.pardus.org.tr> Author: faik Date: Tue May 6 15:03:18 2008 New Revision: 17935 Removed: branches/pisi-xml/ Log: no need From uludag-commits at pardus.org.tr Tue May 6 15:17:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 15:17:06 +0300 (EEST) Subject: [Uludag-commits] r17936 - trunk/pisi/pisi Message-ID: <20080506121706.6D724138415A@liste.pardus.org.tr> Author: faik Date: Tue May 6 15:17:06 2008 New Revision: 17936 Modified: trunk/pisi/pisi/__init__.py Log: 2.0_alpha5 - merge trunk with pisi-devel branch - signal handling fixes for package-manager - new licences Modified: trunk/pisi/pisi/__init__.py ================================================================= --- trunk/pisi/pisi/__init__.py (original) +++ trunk/pisi/pisi/__init__.py Tue May 6 15:17:06 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "2.0_alpha4" +__version__ = "2.0_alpha5" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Tue May 6 15:18:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 15:18:26 +0300 (EEST) Subject: [Uludag-commits] r17937 - in branches/yali4/yali4: . gui Message-ID: <20080506121826.1F5D5138415A@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 15:18:25 2008 New Revision: 17937 Modified: branches/yali4/yali4/gui/runner.py branches/yali4/yali4/options.py Log: * Typo .. Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Tue May 6 15:18:25 2008 @@ -41,7 +41,6 @@ def __init__(self): - # Qt Stuff self._app = QtGui.QApplication(sys.argv) @@ -51,8 +50,10 @@ # Check for firstBoot on installed system (parameters from options) install_type = YALI_INSTALL - if ctx.options.firstBoot: + + if ctx.options.firstBoot == True: install_type = YALI_FIRSTBOOT + ctx.yali = yali4.installer.Yali(install_type) # visual debugger Modified: branches/yali4/yali4/options.py ================================================================= --- branches/yali4/yali4/options.py (original) +++ branches/yali4/yali4/options.py Tue May 6 15:18:25 2008 @@ -26,7 +26,7 @@ help="only show the result") parser.add_option("-f", "--firstBoot", dest="firstBoot", action="store_true", default="False", - help="only show the result") + help="start with first boot options") parser.add_option("-k", "--kahyaFile", dest="kahyaFile", help="Run with Kahya file", metavar="FILE") parser.add_option("-s", "--startFrom", dest="startupScreen", From uludag-commits at pardus.org.tr Tue May 6 16:10:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:10:05 +0300 (EEST) Subject: [Uludag-commits] r17938 - branches/tasma-dbus/network-manager Message-ID: <20080506131005.1C26D138412B@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 16:10:04 2008 New Revision: 17938 Modified: branches/tasma-dbus/network-manager/network-manager.py Log: set mainloop in embedded mode Modified: branches/tasma-dbus/network-manager/network-manager.py ================================================================= --- branches/tasma-dbus/network-manager/network-manager.py (original) +++ branches/tasma-dbus/network-manager/network-manager.py Tue May 6 16:10:04 2008 @@ -69,6 +69,7 @@ global kapp kapp = KApplication.kApplication() + DBusQtMainLoop(set_as_default=True) return Module(parent, name) # Standalone From uludag-commits at pardus.org.tr Tue May 6 16:23:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:23:08 +0300 (EEST) Subject: [Uludag-commits] r17939 - branches/tasma-dbus/user-manager Message-ID: <20080506132308.3F6041384111@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 16:23:07 2008 New Revision: 17939 Modified: branches/tasma-dbus/user-manager/user-manager.py Log: set mainloop in embedded mode Modified: branches/tasma-dbus/user-manager/user-manager.py ================================================================= --- branches/tasma-dbus/user-manager/user-manager.py (original) +++ branches/tasma-dbus/user-manager/user-manager.py Tue May 6 16:23:07 2008 @@ -63,6 +63,7 @@ global kapp kapp = KApplication.kApplication() + dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) return Module(parent, name) From uludag-commits at pardus.org.tr Tue May 6 16:23:30 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:23:30 +0300 (EEST) Subject: [Uludag-commits] r17940 - branches/tasma-dbus/boot-manager/src Message-ID: <20080506132330.C708213840D3@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 16:23:30 2008 New Revision: 17940 Modified: branches/tasma-dbus/boot-manager/src/boot-manager.py Log: set mainloop in embedded mode Modified: branches/tasma-dbus/boot-manager/src/boot-manager.py ================================================================= --- branches/tasma-dbus/boot-manager/src/boot-manager.py (original) +++ branches/tasma-dbus/boot-manager/src/boot-manager.py Tue May 6 16:23:30 2008 @@ -66,6 +66,7 @@ global kapp kapp = KApplication.kApplication() + dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) return Module(parent, name) From uludag-commits at pardus.org.tr Tue May 6 16:45:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:45:13 +0300 (EEST) Subject: [Uludag-commits] r17941 - trunk/tasma/package-manager/src Message-ID: <20080506134513.2A69A13840DC@liste.pardus.org.tr> Author: faik Date: Tue May 6 16:45:12 2008 New Revision: 17941 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/PisiIface.py Log: reload for remove and install Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Tue May 6 16:45:12 2008 @@ -660,8 +660,9 @@ # when pisi db version is upgraded, reload is needed before init packages = self.basket.packages + self.basket.extraPackages print "in finished(): command=%s" % command - if command == "System.Manager.updatePackage" and "pisi" in packages: - PisiIface.reloadPisi() +# if command == "System.Manager.updatePackage" and "pisi" in packages: + #FIXME: Why do we need to reload pisi module every time. Added for not updating mem cached dbs of pisi + PisiIface.reloadPisi() # after every operation check package cache limits if command not in ["System.Manager.clearCache", "System.Manager.setRepositories"]: Modified: trunk/tasma/package-manager/src/PisiIface.py ================================================================= --- trunk/tasma/package-manager/src/PisiIface.py (original) +++ trunk/tasma/package-manager/src/PisiIface.py Tue May 6 16:45:12 2008 @@ -10,6 +10,8 @@ # # Please read the COPYING file +import sys + import pisi def get_install_order(packages): @@ -60,7 +62,7 @@ cdb = pisi.db.componentdb.ComponentDB() return cdb.get_component(name).visibleTo == 'user' -def reloadPisi(self): +def reloadPisi(): for module in sys.modules.keys(): if module.startswith("pisi."): """removal from sys.modules forces reload via import""" From uludag-commits at pardus.org.tr Tue May 6 16:54:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:54:34 +0300 (EEST) Subject: [Uludag-commits] r17942 - trunk/tasma/package-manager/src Message-ID: <20080506135435.09A3813840DB@liste.pardus.org.tr> Author: faik Date: Tue May 6 16:54:34 2008 New Revision: 17942 Modified: trunk/tasma/package-manager/src/Commander.py Log: no ids... dbus gives ids to follow and we can give an handler method for every call. Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Tue May 6 16:54:34 2008 @@ -89,9 +89,10 @@ # self.comar.com_lock.unlock() # pass - def startUpdate(self, repo = None, id=0): + def startUpdate(self, repo = None): if repo is None: - self.updateAllRepos(id) + #FIXME: track id... anything needs to be added here? + self.updateAllRepos() else: self.updateRepo(repo) @@ -110,8 +111,8 @@ def updateRepo(self, repo): self.comar.updateRepo(repo) - def updateAllRepos(self, id=0): - self.comar.updateAllRepos(id) + def updateAllRepos(self): + self.comar.updateAllRepos() def addRepo(self,repoName,repoAddress): self.comar.addRepo(repoName,repoAddress) From uludag-commits at pardus.org.tr Tue May 6 16:55:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 16:55:32 +0300 (EEST) Subject: [Uludag-commits] r17943 - trunk/tasma/package-manager/src Message-ID: <20080506135532.8AFBA13840DB@liste.pardus.org.tr> Author: faik Date: Tue May 6 16:55:32 2008 New Revision: 17943 Modified: trunk/tasma/package-manager/src/Commander.py Log: missed change notification -> signal Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Tue May 6 16:55:32 2008 @@ -47,7 +47,7 @@ elif signal == "status": operation = data[0] self.parent.pisiNotify(operation, args) - elif notification == "warning": + elif signal == "warning": self.comar.com_lock.unlock() self.parent.showWarningMessage(args) self.parent.resetState() From uludag-commits at pardus.org.tr Tue May 6 18:49:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 18:49:03 +0300 (EEST) Subject: [Uludag-commits] r17944 - in branches/yali4/yali4: . gui Message-ID: <20080506154903.5D06513840FF@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 18:49:03 2008 New Revision: 17944 Modified: branches/yali4/yali4/gui/GUIAdditional.py branches/yali4/yali4/gui/ScrKahyaCheck.py branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/kahya.py Log: * Go on darling.. Modified: branches/yali4/yali4/gui/GUIAdditional.py ================================================================= --- branches/yali4/yali4/gui/GUIAdditional.py (original) +++ branches/yali4/yali4/gui/GUIAdditional.py Tue May 6 18:49:03 2008 @@ -106,11 +106,13 @@ self.ui.partition_list.setEnabled(True) def slotDisableList(self): + self.rootWidget.autoPartPartition = self.ui.partition_list.item(0).getPartition() self.ui.partition_list.setEnabled(False) def slotUseSelected(self): self.hide() - self.rootWidget.autoPartPartition = self.ui.partition_list.currentItem().getPartition() + if self.ui.partition_list.isEnabled(): + self.rootWidget.autoPartPartition = self.ui.partition_list.currentItem().getPartition() ctx.mainScreen.processEvents() self.rootWidget.execute_(True) Modified: branches/yali4/yali4/gui/ScrKahyaCheck.py ================================================================= --- branches/yali4/yali4/gui/ScrKahyaCheck.py (original) +++ branches/yali4/yali4/gui/ScrKahyaCheck.py Tue May 6 18:49:03 2008 @@ -114,7 +114,7 @@ ctx.installData.repoName = correctData.repoName ctx.debugger.log("HOSTNAME : %s " % ctx.installData.hostName) - ctx.debugger.log("KEYDATA : %s " % ctx.installData.keyData.X) + ctx.debugger.log("KEYDATA : %s " % ctx.installData.keyData["xkblayout"]) if ctx.installData.repoAddr: ctx.debugger.log("REPOADDR : %s " % ctx.installData.repoAddr) Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Tue May 6 18:49:03 2008 @@ -77,34 +77,55 @@ if dev.getTotalMB() >= ctx.consts.min_root_size: DeviceItem(self.ui.device_list, dev) - # select the first disk by default - self.ui.device_list.setCurrentRow(0) - if not self.ui.device_list.count(): raise YaliExceptionInfo, _("It seems that you don't have the required disk space (min. %s) for Pardus installation." % ctx.consts.min_root_size) - self.connect(self.ui.accept_auto_1, SIGNAL("clicked()"),self.slotSelectAuto) - self.connect(self.ui.accept_auto_2, SIGNAL("clicked()"),self.slotSelectAuto) + self.connect(self.ui.accept_auto_1, SIGNAL("toggled(bool)"),self.slotSelectAutoUseAvail) + self.connect(self.ui.accept_auto_2, SIGNAL("toggled(bool)"),self.slotSelectAutoEraseAll) self.connect(self.ui.manual, SIGNAL("clicked()"),self.slotSelectManual) - self.connect(self.ui.device_list, SIGNAL("currentRowChanged(int)"),self.slotDeviceChanged) - self.slotDeviceChanged(0) + self.connect(self.ui.device_list, SIGNAL("currentItemChanged(QListWidgetItem * ,QListWidgetItem * )"),self.slotDeviceChanged) + + def fillDeviceList(self,limit=None): + self.ui.device_list.clear() + # fill device list + for dev in yali4.storage.devices: + if dev.getTotalMB() >= ctx.consts.min_root_size: + if limit: + if dev in self.resizableDisks: + DeviceItem(self.ui.device_list, dev) + else: + DeviceItem(self.ui.device_list, dev) + + # select the first disk by default + self.ui.device_list.setCurrentRow(0) def shown(self): + + # scan partitions for resizing self.scanPartitions() + self.fillDeviceList() + + def sortBySize(x,y): if x["newSize"]>y["newSize"]:return -1 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: self.arp.append(partition) + if len(self.arp) == 0: self.ui.accept_auto_1.setEnabled(False) + self.ui.accept_auto_2.toggle() elif len(self.arp) == 1: self.autoPartPartition = self.arp[0] + self.ui.accept_auto_1.toggle() + ctx.mainScreen.disableNext() self.updateUI() @@ -170,11 +191,20 @@ if move: ctx.mainScreen.slotNext(dryRun=True) - def slotDeviceChanged(self, i): - self.device = self.ui.device_list.item(i).getDevice() + def slotDeviceChanged(self, n, o): + if n: + self.device = n.getDevice() + ctx.debugger.log("Install device selected as %s" % self.device.getPath()) + + def slotSelectAutoEraseAll(self,state): + self.fillDeviceList() + self.enable_next = state + self.device = self.ui.device_list.currentItem().getDevice() + self.updateUI() - def slotSelectAuto(self): - self.enable_next = True + def slotSelectAutoUseAvail(self, state): + self.fillDeviceList(state) + self.enable_next = state self.device = self.ui.device_list.currentItem().getDevice() self.updateUI() Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Tue May 6 18:49:03 2008 @@ -102,16 +102,17 @@ # move to id numbered stack def stackMove(self, id): - self.mainStack.setCurrentIndex(id) - _w = self.mainStack.currentWidget() - self.screenName.setText(_w.title) - self.screenDescription.setText(_w.desc) - self.screenIcon.setPixmap(QtGui.QPixmap(":/gui/pics/%s.png" % (_w.icon or "pardus"))) - self.helpContent.setText(_w.help) - # shown functions contain necessary instructions before - # showing a stack ( updating gui, disabling some buttons etc. ) - _w.update() - _w.shown() + if not id == self.mainStack.currentIndex() or id==0: + self.mainStack.setCurrentIndex(id) + _w = self.mainStack.currentWidget() + self.screenName.setText(_w.title) + self.screenDescription.setText(_w.desc) + self.screenIcon.setPixmap(QtGui.QPixmap(":/gui/pics/%s.png" % (_w.icon or "pardus"))) + 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 # see runner.py/_all_screens for the list Modified: branches/yali4/yali4/kahya.py ================================================================= --- branches/yali4/yali4/kahya.py (original) +++ branches/yali4/yali4/kahya.py Tue May 6 18:49:03 2008 @@ -76,14 +76,14 @@ def checkKeymapX(self): """It checks keymap validity""" - for country, data in yali4.localedata.locales.items(): + for country, data in locales.items(): if data["xkblayout"] == self.keyX: return True return False def findKeymap(self): """It attaches console Keymap""" - for country,data in yali4.localedata.locales.items(): + for country,data in locales.items(): if data["xkblayout"] == self.keyX: return data["consolekeymap"] return False From uludag-commits at pardus.org.tr Tue May 6 20:11:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 20:11:45 +0300 (EEST) Subject: [Uludag-commits] r17945 - branches/tasma-dbus/network-manager Message-ID: <20080506171145.5BB7613840FB@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue May 6 20:11:45 2008 New Revision: 17945 Modified: branches/tasma-dbus/network-manager/comariface.py Log: Show 'Add Connection' dialog on first open Modified: branches/tasma-dbus/network-manager/comariface.py ================================================================= --- branches/tasma-dbus/network-manager/comariface.py (original) +++ branches/tasma-dbus/network-manager/comariface.py Tue May 6 20:11:45 2008 @@ -381,6 +381,7 @@ if len(self.links) == self.nr_empty: if self.first_time: self.first_time = False + self.emitNoConn() # get signals self.listenSignals() ch = self.callHandler(script, "Net.Link", "connections", "tr.org.pardus.comar.net.link.get") From uludag-commits at pardus.org.tr Tue May 6 20:38:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 20:38:34 +0300 (EEST) Subject: [Uludag-commits] r17946 - in branches/yali4/yali4: . gui Message-ID: <20080506173834.8EE9B138419A@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 20:38:34 2008 New Revision: 17946 Modified: branches/yali4/yali4/constants.py branches/yali4/yali4/gui/ScrCheckCD.py branches/yali4/yali4/gui/ScrDateTime.py branches/yali4/yali4/gui/ScrInstall.py branches/yali4/yali4/gui/ScrKahyaCheck.py branches/yali4/yali4/gui/ScrKeyboard.py branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/gui/ScrWelcome.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/installer.py Log: * Refactoring.. go go.. Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Tue May 6 20:38:34 2008 @@ -91,9 +91,9 @@ # kahya options consts.kahyaParam = "kahya" -# firstBoot options -consts.firstBootParam = "oeminstall" -consts.firstBootFile = join(consts.data_dir,"data/firstBoot.xml") +# oemInstall options +consts.oemInstallParam = "oeminstall" +consts.oemInstallFile = join(consts.data_dir,"data/firstBoot.xml") try: consts.lang = locale.getdefaultlocale()[0][:2] Modified: branches/yali4/yali4/gui/ScrCheckCD.py ================================================================= --- branches/yali4/yali4/gui/ScrCheckCD.py (original) +++ branches/yali4/yali4/gui/ScrCheckCD.py Tue May 6 20:38:34 2008 @@ -46,82 +46,10 @@ self.connect(self.ui.checkButton, SIGNAL("clicked()"), self.slotCheckCD) - - def showError(self): - r = ErrorWidget(self) - d = Dialog(_("Check Failed"), r, self) - d.resize(300,200) - d.exec_() - def slotCheckCD(self): - ctx.mainScreen.disableNext() - ctx.mainScreen.disableBack() - self.ui.checkButton.setEnabled(False) - self.ui.checkLabel.setText(_('Please wait while checking CD.')) - yali4.pisiiface.initialize(ui = PisiUI(), with_comar = False, nodestDir = True) - yali4.pisiiface.add_cd_repo() - - ctx.mainScreen.processEvents() - - pkg_names = yali4.pisiiface.get_available() - self.ui.progressBar.setMaximum(len(pkg_names)) - - cur = 0 - for pkg_name in pkg_names: - cur += 1 - ctx.debugger.log("Checking %s " % pkg_name) - if yali4.pisiiface.check_package_hash(pkg_name): - self.ui.progressBar.setValue(cur) - else: - self.showError() - - self.ui.checkLabel.setText(_('Check succeeded. You can proceed to the next screen.')) - - yali4.pisiiface.remove_repo(ctx.consts.cd_repo_name) - - ctx.mainScreen.enableNext() - ctx.mainScreen.enableBack() - -class PisiUI(pisi.ui.UI): - def notify(self, event, **keywords): - pass - def display_progress(self, operation, percent, info, **keywords): - pass - -class ErrorWidget(QtGui.QWidget): - def __init__(self, *args): - apply(QtGui.QWidget.__init__, (self,) + args) - - self.gridlayout = QtGui.QGridLayout(self) - - self.vboxlayout = QtGui.QVBoxLayout() - - self.label = QtGui.QLabel(self) - self.label.setText(_(''' -

Integrity check for packages failed. It seems that installation CD is broken.

- -''')) - self.vboxlayout.addWidget(self.label) - self.hboxlayout = QtGui.QHBoxLayout() - - spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum) - self.hboxlayout.addItem(spacerItem) - - self.reboot = QtGui.QPushButton(self) - self.reboot.setFocusPolicy(Qt.NoFocus) - self.reboot.setText(_("Reboot")) - - self.hboxlayout.addWidget(self.reboot) - self.vboxlayout.addLayout(self.hboxlayout) - self.gridlayout.addLayout(self.vboxlayout,0,0,1,1) - - yali4.sysutils.eject_cdrom() - - self.connect(self.reboot, SIGNAL("clicked()"),self.slotReboot) - - def slotReboot(self): - yali4.sysutils.reboot() + # Check the CD + ctx.yali.checkCD(self.ui) Modified: branches/yali4/yali4/gui/ScrDateTime.py ================================================================= --- branches/yali4/yali4/gui/ScrDateTime.py (original) +++ branches/yali4/yali4/gui/ScrDateTime.py Tue May 6 20:38:34 2008 @@ -65,6 +65,7 @@ # Select the timeZone self.ui.timeZoneList.setCurrentItem(self.currentZone) + self.timer.start(1000) def dateChanged(self): self.isDateChanged = True @@ -91,20 +92,9 @@ def execute(self): if not self.timer.isActive() or self.isDateChanged: - date = self.ui.calendarWidget.selectedDate() - args = "%02d%02d%02d%02d%04d.%02d" % (date.month(), date.day(), - self.ui.timeHours.time().hour(), self.ui.timeMinutes.time().minute(), - date.year(), self.ui.timeSeconds.time().second()) - # Set current date and time - ctx.debugger.log("Date/Time setting to %s" % args) - os.system("date %s" % args) + ctx.yali.setTime(self.ui) self.timer.stop() - # Sync date time with hardware - ctx.debugger.log("YALI's time is syncing with the system.") - os.system("hwclock --systohc") - - # 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) + ctx.yali.setTimeZone(self.ui) + return True Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Tue May 6 20:38:34 2008 @@ -113,12 +113,12 @@ if event == pisi.ui.installing: self.ui.info.setText(_("Installing: %s
%s") % (p.name, p.summary)) - ctx.debugger.log("customEvent :: %s installed" % p.name) + ctx.debugger.log("Pisi : %s installing" % p.name) self.cur += 1 self.ui.progress.setValue(self.cur) elif event == pisi.ui.configuring: self.ui.info.setText(_("Configuring package: %s") % p.name) - ctx.debugger.log("customEvent :: %s configured" % p.name) + ctx.debugger.log("Pisi : %s configuring" % p.name) self.cur += 1 self.ui.progress.setValue(self.cur) @@ -283,7 +283,7 @@ try: # run all pending... - ctx.debugger.log("execute :: yali4.pisiiface.configure_pending() called") + ctx.debugger.log("exec : yali4.pisiiface.configure_pending() called") yali4.pisiiface.configure_pending() except Exception, e: # User+10: error Modified: branches/yali4/yali4/gui/ScrKahyaCheck.py ================================================================= --- branches/yali4/yali4/gui/ScrKahyaCheck.py (original) +++ branches/yali4/yali4/gui/ScrKahyaCheck.py Tue May 6 20:38:34 2008 @@ -96,7 +96,6 @@ devices.append(dev) correctData = yaliKahya.getValues() - ctx.debugger.log("Given Kahya Values :") # set keymap ctx.yali.setKeymap(correctData.keyData) Modified: branches/yali4/yali4/gui/ScrKeyboard.py ================================================================= --- branches/yali4/yali4/gui/ScrKeyboard.py (original) +++ branches/yali4/yali4/gui/ScrKeyboard.py Tue May 6 20:38:34 2008 @@ -69,15 +69,9 @@ self.connect(self.ui.keyboard_list, SIGNAL("currentItemChanged(QListWidgetItem*, QListWidgetItem*)"), self.slotLayoutChanged) - def execute(self): - keydata = self.ui.keyboard_list.currentItem().getData() - ctx.installData.keyData = keydata - return True - - def slotLayoutChanged(self,i,y=None): + def slotLayoutChanged(self, i, y=None): if not i==y: - keydata = i.getData() - ctx.yali.setKeymap(keydata) + ctx.yali.setKeymap(i.getData()) class KeyboardItem(QtGui.QListWidgetItem): Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Tue May 6 20:38:34 2008 @@ -105,7 +105,6 @@ self.scanPartitions() self.fillDeviceList() - def sortBySize(x,y): if x["newSize"]>y["newSize"]:return -1 elif x["newSize"]==y["newSize"]: return 0 @@ -129,9 +128,6 @@ ctx.mainScreen.disableNext() self.updateUI() - # Remove it later. - # self.ui.accept_auto_1.setEnabled(False) - def scanPartitions(self): self.resizablePartitions = [] self.resizableDisks = [] Modified: branches/yali4/yali4/gui/ScrWelcome.py ================================================================= --- branches/yali4/yali4/gui/ScrWelcome.py (original) +++ branches/yali4/yali4/gui/ScrWelcome.py Tue May 6 20:38:34 2008 @@ -107,3 +107,4 @@ else: ctx.mainScreen.disableNext() ctx.mainScreen.processEvents() + Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Tue May 6 20:38:34 2008 @@ -30,7 +30,7 @@ # mainScreen import YaliWindow -YALI_INSTALL, YALI_FIRSTBOOT, YALI_PARTITIONER = range(3) +YALI_INSTALL, YALI_FIRSTBOOT, YALI_OEMINSTALL, YALI_PARTITIONER = range(4) ## # Runner creates main GUI components for installation... @@ -54,22 +54,22 @@ if ctx.options.firstBoot == True: install_type = YALI_FIRSTBOOT + # check for oemInstall + if yali4.sysutils.checkYaliParams(param=ctx.consts.oemInstallParam): + install_type = YALI_OEMINSTALL + ctx.yali = yali4.installer.Yali(install_type) # visual debugger ctx.debugger = Debugger() # check boot flags - # check for oemInstall - if yali4.sysutils.checkYaliParams(param=ctx.consts.firstBootParam): - ctx.options.kahyaFile = ctx.consts.firstBootFile - # visual debug mode if ctx.options.debug == True or yali4.sysutils.checkYaliParams(param="debug"): ctx.debugEnabled = True # Let start - ctx.debugger.log("Yali Started") + ctx.debugger.log("Yali has been started.") # font = QtGui.QFont() # font.setFamily("Droid Sans") Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Tue May 6 20:38:34 2008 @@ -18,12 +18,21 @@ __trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext +# PyQt4 Rocks +from PyQt4 import QtGui +from PyQt4.QtCore import * + # yali base from yali4.exception import * from yali4.constants import consts +import yali4.gui.context as ctx import yali4.localeutils import yali4.sysutils +# pisi base +import pisi.ui +import yali4.pisiiface + # partitioning import yali4.partitiontype as parttype import yali4.partitionrequest as request @@ -51,7 +60,7 @@ import yali4.gui.ScrGoodbye PARTITION_ERASE_ALL, PARTITION_USE_AVAIL, PARTITION_USE_OLD = range(3) -YALI_INSTALL, YALI_FIRSTBOOT, YALI_PARTITIONER = range(3) +YALI_INSTALL, YALI_FIRSTBOOT, YALI_OEMINSTALL, YALI_PARTITIONER = range(4) class Yali: def __init__(self, install_type=YALI_INSTALL): @@ -74,16 +83,27 @@ yali4.gui.ScrGoodbye # 11 ] - # This list will be used for yali4-firstBoot + # FirstBoot Installation process self._screens[YALI_FIRSTBOOT] = [ # Numbers can be used with -s paramter - yali4.gui.ScrWelcome, # 01 - yali4.gui.ScrKeyboard, # 02 - yali4.gui.ScrDateTime, # 03 - yali4.gui.ScrUsers, # 04 - yali4.gui.ScrAdmin, # 05 - yali4.gui.ScrGoodbye # 06 + yali4.gui.ScrWelcome, # 00 + yali4.gui.ScrKeyboard, # 01 + yali4.gui.ScrDateTime, # 02 + yali4.gui.ScrUsers, # 03 + yali4.gui.ScrAdmin, # 04 + yali4.gui.ScrGoodbye # 05 ] + # Oem Installation process + self._screens[YALI_OEMINSTALL] = [ # Numbers can be used with -s paramter + yali4.gui.ScrWelcome, # 00 + yali4.gui.ScrCheckCD, # 01 + yali4.gui.ScrPartitionAuto, # 02 + yali4.gui.ScrPartitionManual, # 03 + yali4.gui.ScrBootloader, # 04 + yali4.gui.ScrInstall, # 05 + yali4.gui.ScrGoodbye # 06 + ] + # Use YALI just for partitioning self._screens[YALI_PARTITIONER] = [ yali4.gui.ScrPartitionManual # Manual Partitioning @@ -91,8 +111,99 @@ # Let the show begin.. self.screens = self._screens[install_type] + self.install_type = install_type + + def checkCD(self, rootWidget): + ctx.mainScreen.disableNext() + ctx.mainScreen.disableBack() + + class PisiUI(pisi.ui.UI): + def notify(self, event, **keywords): + pass + def display_progress(self, operation, percent, info, **keywords): + pass + + yali4.pisiiface.initialize(ui = PisiUI(), with_comar = False, nodestDir = True) + yali4.pisiiface.add_cd_repo() + ctx.mainScreen.processEvents() + pkg_names = yali4.pisiiface.get_available() + + rootWidget.progressBar.setMaximum(len(pkg_names)) + + cur = 0 + for pkg_name in pkg_names: + cur += 1 + ctx.debugger.log("Checking %s " % pkg_name) + if yali4.pisiiface.check_package_hash(pkg_name): + rootWidget.progressBar.setValue(cur) + else: + self.showError(_("Check Failed"), + _("

Integrity check for packages failed.\ + It seems that installation CD is broken.

")) + + rootWidget.checkLabel.setText(_('Check succeeded. You can proceed to the next screen.')) + + yali4.pisiiface.remove_repo(ctx.consts.cd_repo_name) + + ctx.mainScreen.enableNext() + ctx.mainScreen.enableBack() def setKeymap(self, keymap): yali4.localeutils.set_keymap(keymap["xkblayout"], keymap["xkbvariant"]) - self.keymap = keymap + ctx.installData.keyData = keymap + + def setTime(self, rootWidget): + date = rootWidget.calendarWidget.selectedDate() + args = "%02d%02d%02d%02d%04d.%02d" % (date.month(), date.day(), + rootWidget.timeHours.time().hour(), rootWidget.timeMinutes.time().minute(), + date.year(), rootWidget.timeSeconds.time().second()) + # Set current date and time + ctx.debugger.log("Date/Time setting to %s" % args) + os.system("date %s" % args) + + # Sync date time with hardware + ctx.debugger.log("YALI's time is syncing with the system.") + os.system("hwclock --systohc") + + def setTimeZone(self, rootWidget): + # Store time zone selection we will set it in processPending actions. + ctx.installData.timezone = rootWidget.timeZoneList.currentItem().text() + ctx.debugger.log("Time zone selected as %s " % ctx.installData.timezone) + + def showError(self, title, message): + r = ErrorWidget(self) + r.label.setText(message) + d = Dialog(title, r, self) + d.resize(300,200) + d.exec_() + +class ErrorWidget(QtGui.QWidget): + def __init__(self, *args): + apply(QtGui.QWidget.__init__, (self,) + args) + + self.gridlayout = QtGui.QGridLayout(self) + self.vboxlayout = QtGui.QVBoxLayout() + + self.label = QtGui.QLabel(self) + self.vboxlayout.addWidget(self.label) + + self.hboxlayout = QtGui.QHBoxLayout() + + spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum) + self.hboxlayout.addItem(spacerItem) + + self.reboot = QtGui.QPushButton(self) + self.reboot.setFocusPolicy(Qt.NoFocus) + self.reboot.setText(_("Reboot")) + + self.hboxlayout.addWidget(self.reboot) + self.vboxlayout.addLayout(self.hboxlayout) + self.gridlayout.addLayout(self.vboxlayout,0,0,1,1) + + yali4.sysutils.eject_cdrom() + + self.connect(self.reboot, SIGNAL("clicked()"),self.slotReboot) + + def slotReboot(self): + yali4.sysutils.reboot() From uludag-commits at pardus.org.tr Tue May 6 20:45:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 20:45:33 +0300 (EEST) Subject: [Uludag-commits] r17947 - trunk/PolicyKit-kde/src Message-ID: <20080506174533.C32B013840FC@liste.pardus.org.tr> Author: gokcen.eraslan Date: Tue May 6 20:45:33 2008 New Revision: 17947 Modified: trunk/PolicyKit-kde/src/service.cpp Log: add more unrefs Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Tue May 6 20:45:33 2008 @@ -516,6 +516,22 @@ void PolicyService::obtainAuthorization(const QString& actionId, const uint wid, const uint pid, const QDBusMessage& messageToReply) { + /* + if (m_authInProgress) + { + Debug::printError("obtainAuthorization: Another client is already authenticating."); + + QDBusMessage replyError = QDBusMessage::methodReply(messageToReply); + + replyError << QDBusData::fromBool(false); + m_sessionBus.send(replyError); + + return; + } + + m_authInProgress = true; + */ + //stop exitTimer during authentication, and restart when it is finished if (KCmdLineArgs::parsedArgs()->isSet("-exit")) { @@ -528,6 +544,7 @@ { QString msg = QString("Could not create new action"); Debug::printError(msg); + m_authInProgress = false; throw msg; } @@ -536,6 +553,7 @@ { QString msg = QString("Could not set actionid."); Debug::printError(msg); + m_authInProgress = false; throw msg; } @@ -564,6 +582,7 @@ { QString msg = QString("Could not connect to system bus."); Debug::printError(msg); + m_authInProgress = false; throw msg; } @@ -573,6 +592,7 @@ QDBusError *qerror = new QDBusError((const DBusError *)&dbuserror); QString msg = QString("Could not define caller from pid: %1").arg(qerror->message()); Debug::printError(msg); + m_authInProgress = false; throw msg; } @@ -586,6 +606,7 @@ { QString msg = QString("PolKitGrant object could not be created"); Debug::printError(msg); + m_authInProgress = false; throw msg; } @@ -616,11 +637,16 @@ { QString msg = QString("Could not initialize grant"); Debug::printError(msg); + m_authInProgress = false; + delete m_dialog; + if (m_grant) + polkit_grant_unref(m_grant); throw msg; } // This workaround used for to avoid ourself from a race condition, // polkit_grant_done must return before the following privilege check + Debug::printDebug("obtain_authorization: Entering eventloop to wait grant_done"); QApplication::eventLoop()->exec(); if (!m_gainedPrivilege && !m_inputBogus && !m_cancelled) @@ -634,6 +660,10 @@ if (m_grant) polkit_grant_unref (m_grant); + if (action) + polkit_action_unref (action); + if (caller) + polkit_caller_unref (caller); Debug::printDebug(QString("obtain_authorization: privilege: %1 input_bogus: %2, cancelled: %3").arg(m_gainedPrivilege).arg(m_inputBogus).arg(m_cancelled)); @@ -648,6 +678,9 @@ Debug::printDebug("Authentication finished, starting timer again"); exitTimer->start(POLICYKITKDE_TIMEOUT, true); } + + //m_authInProgress = false; + delete m_dialog; } #include "service.moc" From uludag-commits at pardus.org.tr Tue May 6 20:54:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 20:54:02 +0300 (EEST) Subject: [Uludag-commits] r17948 - trunk/PolicyKit-kde/src Message-ID: <20080506175402.5FB6513840FC@liste.pardus.org.tr> Author: gokcen.eraslan Date: Tue May 6 20:54:01 2008 New Revision: 17948 Modified: trunk/PolicyKit-kde/src/service.cpp Log: Do not flood screen with 'grant watch activated' debug print Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Tue May 6 20:54:01 2008 @@ -293,7 +293,8 @@ Q_ASSERT(m_grantwatches.contains(fd)); Q_ASSERT(m_grant != NULL); - Debug::printDebug("Grant watch activated"); + //This floods screen + //Debug::printDebug("Grant watch activated"); polkit_grant_io_func (m_grant, fd); } @@ -652,7 +653,8 @@ if (!m_gainedPrivilege && !m_inputBogus && !m_cancelled) { Debug::printDebug("obtain_authorization: Authentication failure, trying again..."); - polkit_grant_unref (m_grant); + if (m_grant) + polkit_grant_unref (m_grant); } else break; From uludag-commits at pardus.org.tr Tue May 6 21:21:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 21:21:29 +0300 (EEST) Subject: [Uludag-commits] r17949 - in branches/yali4/yali4: . gui Message-ID: <20080506182129.E91EF138417A@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 21:21:29 2008 New Revision: 17949 Modified: branches/yali4/yali4/gui/ScrAdmin.py branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/gui/ScrUsers.py branches/yali4/yali4/gui/YaliDialog.py branches/yali4/yali4/installer.py Log: * Refactoring.. go go.. Modified: branches/yali4/yali4/gui/ScrAdmin.py ================================================================= --- branches/yali4/yali4/gui/ScrAdmin.py (original) +++ branches/yali4/yali4/gui/ScrAdmin.py Tue May 6 21:21:29 2008 @@ -67,7 +67,7 @@ self.ui.host_error.setVisible(False) self.ui.caps_error.setVisible(False) - self.ui.caps_error.setText(_('Caps Lock is on!')) + self.ui.caps_error.setText(_('
Caps Lock is on!
')) self.connect(self.ui.pass1, SIGNAL("textChanged(const QString &)"), self.slotTextChanged) @@ -109,7 +109,7 @@ if p1 == p2 and p1: if len(p1)<4: - self.ui.pass_error.setText(_('Password is too short!')) + self.ui.pass_error.setText(_('
Password is too short!
')) self.ui.pass_error.setVisible(True) self.pass_valid = False else: @@ -118,7 +118,7 @@ else: self.pass_valid = False if p2: - self.ui.pass_error.setText(_('Passwords do not match!')) + self.ui.pass_error.setText(_('
Passwords do not match!
')) self.ui.pass_error.setVisible(True) self.setNext() @@ -136,7 +136,7 @@ if not self.host_valid: self.ui.host_error.setVisible(True) - self.ui.host_error.setText(_('Hostname contains invalid characters!')) + self.ui.host_error.setText(_('
Hostname contains invalid characters!
')) else: self.ui.host_error.setVisible(False) self.setNext() Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Tue May 6 21:21:29 2008 @@ -115,87 +115,6 @@ def slotDeviceChanged(self, o, n): self.device = o.getDevice() - def autopartDevice(self): - dev = ctx.installData.autoPartDev - - # first delete partitions on device - dev.deleteAllPartitions() - dev.commit() - - ctx.mainScreen.processEvents() - - p = dev.addPartition(None, - parttype.root.parted_type, - parttype.root.filesystem, - dev.getFreeMB(), - parttype.root.parted_flags) - p = dev.getPartition(p.num) # get partition.Partition - - # create the partition - dev.commit() - ctx.mainScreen.processEvents() - - # make partition requests - ctx.partrequests.append(request.MountRequest(p, parttype.root)) - ctx.partrequests.append(request.FormatRequest(p, parttype.root)) - ctx.partrequests.append(request.LabelRequest(p, parttype.root)) - ctx.partrequests.append(request.SwapFileRequest(p, parttype.root)) - - def useAvail(self): - dev = ctx.installData.autoPartDev - _part = ctx.installData.autoPartPartition - part = _part["partition"] - - newPartSize = int(_part["newSize"]/2) - ctx.debugger.log("UA: newPartSize : %s " % newPartSize) - ctx.debugger.log("UA: resizing to : %s " % (int(part.getMB()) - newPartSize)) - _np = dev.resizePartition(part._fsname, part.getMB() - newPartSize, part) - - ctx.debugger.log("UA: Resize finished.") - time.sleep(1) - - newStart = _np.geom.end - np = dev.getPartition(_np.num) - - if np.isLogical(): - ptype = PARTITION_LOGICAL - else: - ptype = PARTITION_PRIMARY - - ctx.debugger.log("UA: newStart : %s " % newStart) - _newPart = dev.addPartition(None, - ptype, - parttype.root.filesystem, - newPartSize - 150, - parttype.root.parted_flags, - newStart) - - newPart = dev.getPartition(_newPart.num) - - dev.commit() - ctx.mainScreen.processEvents() - - # make partition requests - ctx.partrequests.append(request.MountRequest(newPart, parttype.root)) - ctx.partrequests.append(request.FormatRequest(newPart, parttype.root)) - ctx.partrequests.append(request.LabelRequest(newPart, parttype.root)) - ctx.partrequests.append(request.SwapFileRequest(newPart, parttype.root)) - - def checkSwap(self): - # check swap partition, if not present use swap file - rt = request.mountRequestType - pt = parttype.swap - swap_part_req = ctx.partrequests.searchPartTypeAndReqType(pt, rt) - - if not swap_part_req: - # No swap partition defined using swap as file in root - # partition - rt = request.mountRequestType - pt = parttype.root - root_part_req = ctx.partrequests.searchPartTypeAndReqType(pt, rt) - ctx.partrequests.append(request.SwapFileRequest(root_part_req.partition(), - root_part_req.partitionType())) - def execute(self): w = WarningWidget(self) @@ -214,7 +133,6 @@ return False ctx.mainScreen.processEvents() - info = InformationWindow(_("Writing disk tables ...")) # We should do partitioning operations in here. if ctx.options.dryRun == True: @@ -224,44 +142,36 @@ # Auto Partitioning if ctx.installData.autoPartDev: ctx.use_autopart = True + if ctx.installData.autoPartMethod == methodEraseAll: info.show() - ctx.mainScreen.processEvents() - ctx.partrequests.remove_all() - self.autopartDevice() - time.sleep(2) - info.updateMessage(_("Formatting ...")) - ctx.mainScreen.processEvents() - self.checkSwap() + ctx.yali.autoPartDevice() + ctx.yali.checkSwap() + ctx.yali.info.updateMessage(_("Formatting ...")) ctx.partrequests.applyAll() + elif ctx.installData.autoPartMethod == methodUseAvail: - info.show() - info.updateMessage(_("Resizing ...")) - ctx.mainScreen.processEvents() - self.useAvail() - time.sleep(2) - info.updateMessage(_("Formatting ...")) - ctx.mainScreen.processEvents() - self.checkSwap() + ctx.yali.autoPartUseAvail() + ctx.yali.checkSwap() + ctx.yali.info.updateMessage(_("Formatting ...")) ctx.partrequests.applyAll() # Manual Partitioning else: ctx.debugger.log("Format Operation Started") - info.show() + ctx.yali.info.updateAndShow(_("Writing disk tables ...")) for dev in yali4.storage.devices: ctx.mainScreen.processEvents() dev.commit() # wait for udev to create device nodes time.sleep(2) - info.updateMessage(_("Formatting ...")) - ctx.mainScreen.processEvents() - self.checkSwap() + ctx.yali.checkSwap() + ctx.yali.info.updateMessage(_("Formatting ...")) ctx.partrequests.applyAll() ctx.debugger.log("Format Operation Finished") ctx.mainScreen.processEvents() - info.close() + ctx.yali.info.close() root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, request.mountRequestType) Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Tue May 6 21:21:29 2008 @@ -216,9 +216,9 @@ class DeviceItem(QtGui.QListWidgetItem): def __init__(self, parent, dev): - text = u"%s - %s (%s)" %(dev.getModel(), - dev.getName(), - dev.getSizeStr()) + text = u"%s - %s (%s)" % (dev.getModel(), + dev.getName(), + dev.getSizeStr()) QtGui.QListWidgetItem.__init__(self,text,parent) self._dev = dev Modified: branches/yali4/yali4/gui/ScrUsers.py ================================================================= --- branches/yali4/yali4/gui/ScrUsers.py (original) +++ branches/yali4/yali4/gui/ScrUsers.py Tue May 6 21:21:29 2008 @@ -93,12 +93,7 @@ self.connect(self.ui.pass2, SIGNAL("returnPressed()"), self.slotReturnPressed) - #self.checkUsers() - def shown(self): - # from os.path import basename - # ctx.debugger.log("%s loaded" % basename(__file__)) - ctx.installData.users = [] ctx.installData.autoLoginUser = None @@ -141,7 +136,6 @@ u = self.ui.userList.item(i).getUser() ctx.installData.users.append(u) yali4.users.pending_users.append(u) - # ctx.debugger.log("USER::%s"%u.username) return True @@ -185,7 +179,7 @@ u.username = str(self.ui.username.text().toAscii()) # ignore last character. see bug #887 u.realname = unicode(self.ui.realname.text()) - u.passwd = str(self.ui.pass1.text().toAscii()) + u.passwd = unicode(self.ui.pass1.text()) u.groups = ["users", "pnp", "pnpadmin", "removable", "disk", "audio", "video", "power", "dialout"] pix = self.normalUserIcon if self.ui.admin.isChecked(): Modified: branches/yali4/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4/yali4/gui/YaliDialog.py (original) +++ branches/yali4/yali4/gui/YaliDialog.py Tue May 6 21:21:29 2008 @@ -188,5 +188,17 @@ self.move(ctx.mainScreen.ui.width()/2 - self.width()/2 - 20, ctx.mainScreen.ui.height()/2 - self.height()/2 - 30) self.label.setText(message) + ctx.mainScreen.processEvents() + def updateAndShow(self, message): + self.updateMessage(message) + self.show() + + def show(self): + ctx.mainScreen.processEvents() + QtGui.QWidget.show(self) + + def hide(self): + ctx.mainScreen.processEvents() + QtGui.QWidget.hide(self) Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Tue May 6 21:21:29 2008 @@ -40,6 +40,7 @@ # gui from yali4.gui.YaliDialog import Dialog +from yali4.gui.YaliDialog import WarningDialog, WarningWidget, InformationWindow # debugger from yali4.gui.debugger import Debugger @@ -112,6 +113,8 @@ # Let the show begin.. self.screens = self._screens[install_type] self.install_type = install_type + self.info = InformationWindow(_("YALI Working...")) + self.info.hide() def checkCD(self, rootWidget): ctx.mainScreen.disableNext() @@ -157,6 +160,7 @@ args = "%02d%02d%02d%02d%04d.%02d" % (date.month(), date.day(), rootWidget.timeHours.time().hour(), rootWidget.timeMinutes.time().minute(), date.year(), rootWidget.timeSeconds.time().second()) + # Set current date and time ctx.debugger.log("Date/Time setting to %s" % args) os.system("date %s" % args) @@ -170,6 +174,98 @@ ctx.installData.timezone = rootWidget.timeZoneList.currentItem().text() ctx.debugger.log("Time zone selected as %s " % ctx.installData.timezone) + def autoPartDevice(self): + self.info.updateAndShow(_("Writing disk tables ...")) + + ctx.partrequests.remove_all() + dev = ctx.installData.autoPartDev + + # first delete partitions on device + dev.deleteAllPartitions() + dev.commit() + + ctx.mainScreen.processEvents() + + p = dev.addPartition(None, + parttype.root.parted_type, + parttype.root.filesystem, + dev.getFreeMB(), + parttype.root.parted_flags) + p = dev.getPartition(p.num) # get partition.Partition + + # create the partition + dev.commit() + ctx.mainScreen.processEvents() + + # make partition requests + ctx.partrequests.append(request.MountRequest(p, parttype.root)) + ctx.partrequests.append(request.FormatRequest(p, parttype.root)) + ctx.partrequests.append(request.LabelRequest(p, parttype.root)) + ctx.partrequests.append(request.SwapFileRequest(p, parttype.root)) + + time.sleep(2) + + def checkSwap(self): + # check swap partition, if not present use swap file + rt = request.mountRequestType + pt = parttype.swap + swap_part_req = ctx.partrequests.searchPartTypeAndReqType(pt, rt) + + if not swap_part_req: + # No swap partition defined using swap as file in root + # partition + rt = request.mountRequestType + pt = parttype.root + root_part_req = ctx.partrequests.searchPartTypeAndReqType(pt, rt) + ctx.partrequests.append(request.SwapFileRequest(root_part_req.partition(), + root_part_req.partitionType())) + + def autoPartUseAvail(self): + dev = ctx.installData.autoPartDev + _part = ctx.installData.autoPartPartition + part = _part["partition"] + + newPartSize = int(_part["newSize"]/2) + ctx.debugger.log("UA: newPartSize : %s " % newPartSize) + ctx.debugger.log("UA: resizing to : %s " % (int(part.getMB()) - newPartSize)) + + self.info.updateAndShow(_("Resizing ...")) + _np = dev.resizePartition(part._fsname, part.getMB() - newPartSize, part) + + self.into.updateMessage(_("Resize Finished ...")) + ctx.debugger.log("UA: Resize finished.") + time.sleep(1) + + newStart = _np.geom.end + np = dev.getPartition(_np.num) + + if np.isLogical(): + ptype = PARTITION_LOGICAL + else: + ptype = PARTITION_PRIMARY + + self.into.updateMessage(_("Creating new partition ...")) + ctx.debugger.log("UA: newStart : %s " % newStart) + _newPart = dev.addPartition(None, + ptype, + parttype.root.filesystem, + newPartSize - 150, + parttype.root.parted_flags, + newStart) + + newPart = dev.getPartition(_newPart.num) + + dev.commit() + ctx.mainScreen.processEvents() + + # make partition requests + ctx.partrequests.append(request.MountRequest(newPart, parttype.root)) + ctx.partrequests.append(request.FormatRequest(newPart, parttype.root)) + ctx.partrequests.append(request.LabelRequest(newPart, parttype.root)) + ctx.partrequests.append(request.SwapFileRequest(newPart, parttype.root)) + + time.sleep(2) + def showError(self, title, message): r = ErrorWidget(self) r.label.setText(message) From uludag-commits at pardus.org.tr Tue May 6 21:23:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 21:23:25 +0300 (EEST) Subject: [Uludag-commits] r17950 - trunk/tasma/display-manager/src Message-ID: <20080506182325.DA5E9138417A@liste.pardus.org.tr> Author: pinar Date: Tue May 6 21:23:25 2008 New Revision: 17950 Modified: trunk/tasma/display-manager/src/display-manager.py trunk/tasma/display-manager/src/dm_mainview.ui Log: extended/cloned mode Modified: trunk/tasma/display-manager/src/display-manager.py ================================================================= --- trunk/tasma/display-manager/src/display-manager.py (original) +++ trunk/tasma/display-manager/src/display-manager.py Tue May 6 21:23:25 2008 @@ -73,7 +73,8 @@ self.connect(self.screenImage2, SIGNAL("toggled(bool)"), self.switchBetweenScreens) self.connect(self.checkBoxDualMode, SIGNAL("toggled(bool)"), self.enableExtendedOption) - self.connect(self.checkBoxExtended, SIGNAL("toggled(bool)"), self.setExtendedOption) + self.connect(self.radioBoxExtended, SIGNAL("toggled(bool)"), self.setDualModeOptions) + self.connect(self.radioBoxCloned, SIGNAL("toggled(bool)"), self.setDualModeOptions) self.connect(self.comboBoxOutput, SIGNAL("activated(int)"), self.setSelectedOutput) self.connect(self.comboBoxResolution, SIGNAL("activated(int)"), self.setSelectedMode) @@ -102,11 +103,14 @@ if not self.currentDualMode == "single": if self.currentDualMode == "horizontal": self.checkBoxDualMode.setChecked(1) - self.checkBoxExtended.setChecked(1) + self.radioBoxExtended.setChecked(1) else: self.checkBoxDualMode.setChecked(1) + self.radioBoxCloned.setChecked(1) else: self.screenImage2.hide() + self.radioBoxCloned.setEnabled(0) + self.radioBoxExtended.setEnabled(0) def duplicateOutputs(self): message = i18n("Sorry, but you can use one device for each output.\nTry to select another output.") @@ -154,11 +158,10 @@ self.getResolutions() - def setExtendedOption(self): - if self.checkBoxExtended.isChecked(): + def setDualModeOptions(self): + if self.radioBoxExtended.isChecked(): self.displayConfiguration.desktop_setup = "horizontal" else: - self.displayConfiguration.desktop_setup = self.currentDualMode self.displayConfiguration.desktop_setup = "clone" def setSelectedMode(self): @@ -179,13 +182,15 @@ if self.checkBoxDualMode.isChecked(): self.setIconbyResolution(str(self.currentModes[self.displayConfiguration.secondaryScr]),2) self.screenImage2.show() - self.checkBoxExtended.setEnabled(1) - self.displayConfiguration.desktop_setup = "clone" + self.radioBoxCloned.setEnabled(1) + self.radioBoxExtended.setEnabled(1) + self.displayConfiguration.desktop_setup = self.currentDualMode else: self.screenImage2.hide() self.screenImage1.setState(QButton.On) - self.checkBoxExtended.setEnabled(0) - self.displayConfiguration.desktop_setup = self.currentDualMode + self.radioBoxExtended.setEnabled(0) + self.radioBoxCloned.setEnabled(0) + self.displayConfiguration.desktop_setup = "single" def switchBetweenScreens(self): if self.selectedScreen == "1": Modified: trunk/tasma/display-manager/src/dm_mainview.ui ================================================================= --- trunk/tasma/display-manager/src/dm_mainview.ui (original) +++ trunk/tasma/display-manager/src/dm_mainview.ui Tue May 6 21:23:25 2008 @@ -826,7 +826,7 @@ - radiBoxCloned + radioBoxExtended Extended Mode From uludag-commits at pardus.org.tr Tue May 6 21:45:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 21:45:06 +0300 (EEST) Subject: [Uludag-commits] r17951 - in branches/yali4/yali4: . gui Message-ID: <20080506184506.2C6DB138418C@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 21:45:05 2008 New Revision: 17951 Modified: branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/ScrInstall.py branches/yali4/yali4/installer.py Log: * Refactoring.. Part III.. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Tue May 6 21:45:05 2008 @@ -184,16 +184,7 @@ elif self.ui.installMBR.isChecked(): ctx.installData.bootLoaderDev = basename(self.device.getPath()) else: - if len(yali4.storage.devices) > 1: - ctx.installData.bootLoaderDev = basename(ctx.installData.orderedDiskList[0]) - else: - dev_path = root_part_req.partition().getPath() - if dev_path.find("cciss") > 0: - # HP Smart array controller (something like /dev/cciss/c0d0p1) - ctx.installData.bootLoaderDev = dev_path[:-2] - else: - ctx.installData.bootLoaderDev = str(filter(lambda u: not u.isdigit(), - basename(dev_path))) + ctx.yali.guessBootLoaderDevice() _ins_part = root_part_req.partition().getPath() Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Tue May 6 21:45:05 2008 @@ -66,9 +66,6 @@ self.steps = YaliSteps() - self.ui.info.setText(_('Rebooting system. Please wait!')) - self.ui.info.hide() - def shown(self): ctx.mainScreen.disableBack() self.processPendingActions() @@ -76,7 +73,7 @@ def execute(self): ctx.mainScreen.disableNext() - self.ui.info.show() + ctx.yali.info.updateAndShow(_('Rebooting system. Please wait!')) try: ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir + "/home")) Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Tue May 6 21:45:05 2008 @@ -146,65 +146,40 @@ def packageInstallFinished(self): self.cur = 0 - - # fill fstab - fstab = yali4.fstab.Fstab() - for req in ctx.partrequests: - req_type = req.requestType() - if req_type == request.mountRequestType: - p = req.partition() - pt = req.partitionType() - - path = "LABEL=%s" % pt.filesystem.getLabel(p) - fs = pt.filesystem._sysname or pt.filesystem._name - mountpoint = pt.mountpoint - # TODO: consider merging mountoptions in filesystem.py - opts = ",".join([pt.filesystem.mountOptions(), pt.mountoptions]) - - e = yali4.fstab.FstabEntry(path, mountpoint, fs, opts) - fstab.insert(e) - elif req_type == request.swapFileRequestType: - path = "/" + ctx.consts.swap_file_name - mountpoint = "none" - fs = "swap" - opts = "sw" - e = yali4.fstab.FstabEntry(path, mountpoint, fs, opts) - fstab.insert(e) - - fstab.close() + ctx.yali.fillFstab() # Configure Pending... - # run baselayout's postinstall first + + ctx.yali.info.updateAndShow(_("Creating baselayout for your system!")) yali4.postinstall.initbaselayout() # postscripts depend on 03locale... yali4.localeutils.write_locale_from_cmdline() # run dbus in chroot - yali4.sysutils.chroot_dbus() + yali4.sysutils.chroot_dbus() + + ctx.yali.info.updateMessage(_("Configuring packages for your system!")) - self.ui.info.setText(_("Configuring packages for your system!")) # start configurator thread self.pkg_configurator = PkgConfigurator(self) self.pkg_configurator.start() + ctx.yali.info.hide() + def execute(self): # stop slide show self.timer.stop() - return True def finished(self): if self.hasErrors: return - # trigger next screen. will activate execute() ctx.mainScreen.slotNext() - def installError(self, e): - #self.info.setText(str(e)) import yali4 import yali4.gui.runner @@ -248,7 +223,6 @@ qevent.setData(total) ctx.debugger.log("Posting PisiEvent to the widget..") QCoreApplication.postEvent(self._widget, qevent) - ctx.debugger.log("Found %d packages in repo.." % total) try: Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Tue May 6 21:45:05 2008 @@ -28,6 +28,7 @@ import yali4.gui.context as ctx import yali4.localeutils import yali4.sysutils +import yali4.fstab # pisi base import pisi.ui @@ -37,6 +38,7 @@ import yali4.partitiontype as parttype import yali4.partitionrequest as request from yali4.partitionrequest import partrequests +from yali4.parteddata import * # gui from yali4.gui.YaliDialog import Dialog @@ -266,6 +268,47 @@ time.sleep(2) + def guessBootLoaderDevice(self): + root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, + request.mountRequestType) + + if len(yali4.storage.devices) > 1: + ctx.installData.bootLoaderDev = basename(ctx.installData.orderedDiskList[0]) + else: + dev_path = root_part_req.partition().getPath() + if dev_path.find("cciss") > 0: + # HP Smart array controller (something like /dev/cciss/c0d0p1) + ctx.installData.bootLoaderDev = dev_path[:-2] + else: + ctx.installData.bootLoaderDev = str(filter(lambda u: not u.isdigit(), + basename(dev_path))) + + def fillFstab(self): + # fill fstab + fstab = yali4.fstab.Fstab() + for req in ctx.partrequests: + req_type = req.requestType() + if req_type == request.mountRequestType: + p = req.partition() + pt = req.partitionType() + + path = "LABEL=%s" % pt.filesystem.getLabel(p) + fs = pt.filesystem._sysname or pt.filesystem._name + mountpoint = pt.mountpoint + # TODO: consider merging mountoptions in filesystem.py + opts = ",".join([pt.filesystem.mountOptions(), pt.mountoptions]) + + e = yali4.fstab.FstabEntry(path, mountpoint, fs, opts) + fstab.insert(e) + elif req_type == request.swapFileRequestType: + path = "/" + ctx.consts.swap_file_name + mountpoint = "none" + fs = "swap" + opts = "sw" + e = yali4.fstab.FstabEntry(path, mountpoint, fs, opts) + fstab.insert(e) + fstab.close() + def showError(self, title, message): r = ErrorWidget(self) r.label.setText(message) From uludag-commits at pardus.org.tr Tue May 6 21:50:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 21:50:39 +0300 (EEST) Subject: [Uludag-commits] r17952 - branches/yali4/yali4/gui Message-ID: <20080506185039.BC3D5138417A@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 21:50:39 2008 New Revision: 17952 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * ohom. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Tue May 6 21:50:39 2008 @@ -144,7 +144,6 @@ ctx.use_autopart = True if ctx.installData.autoPartMethod == methodEraseAll: - info.show() ctx.yali.autoPartDevice() ctx.yali.checkSwap() ctx.yali.info.updateMessage(_("Formatting ...")) From uludag-commits at pardus.org.tr Tue May 6 21:52:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 21:52:51 +0300 (EEST) Subject: [Uludag-commits] r17953 - trunk/tasma/display-manager/src Message-ID: <20080506185251.9CF2F138417A@liste.pardus.org.tr> Author: pinar Date: Tue May 6 21:52:51 2008 New Revision: 17953 Modified: trunk/tasma/display-manager/src/dm_mainview.ui Log: devices screen Modified: trunk/tasma/display-manager/src/dm_mainview.ui ================================================================= --- trunk/tasma/display-manager/src/dm_mainview.ui (original) +++ trunk/tasma/display-manager/src/dm_mainview.ui Tue May 6 21:52:51 2008 @@ -8,8 +8,8 @@ 0 0 - 497 - 403 + 615 + 461 @@ -858,6 +858,85 @@ Devices + + + unnamed + + + + groupBoxPrimaryScreen + + + Primary Screen + + + + unnamed + + + + pixMonitor1 + + + + + + true + + + + + textMonitor1 + + + + + buttonMonitor1 + + + Configure + + + + + + + groupBoxSecondaryScreen + + + Secondary Screen + + + + unnamed + + + + pixMonitor2 + + + + + + true + + + + + textMonitor2 + + + + + buttonMonitor2 + + + Configure + + + + + From uludag-commits at pardus.org.tr Tue May 6 22:06:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 6 May 2008 22:06:50 +0300 (EEST) Subject: [Uludag-commits] r17954 - branches/yali4/yali4 Message-ID: <20080506190650.F2B741384197@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue May 6 22:06:50 2008 New Revision: 17954 Modified: branches/yali4/yali4/installer.py Log: * Refactoring.. Part IV.. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Tue May 6 22:06:50 2008 @@ -12,6 +12,7 @@ # linux ? import os +import time # we need i18n import gettext @@ -273,7 +274,7 @@ request.mountRequestType) if len(yali4.storage.devices) > 1: - ctx.installData.bootLoaderDev = basename(ctx.installData.orderedDiskList[0]) + ctx.installData.bootLoaderDev = os.path.basename(ctx.installData.orderedDiskList[0]) else: dev_path = root_part_req.partition().getPath() if dev_path.find("cciss") > 0: @@ -281,7 +282,7 @@ ctx.installData.bootLoaderDev = dev_path[:-2] else: ctx.installData.bootLoaderDev = str(filter(lambda u: not u.isdigit(), - basename(dev_path))) + os.path.basename(dev_path))) def fillFstab(self): # fill fstab From uludag-commits at pardus.org.tr Wed May 7 09:17:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 09:17:05 +0300 (EEST) Subject: [Uludag-commits] r17955 - trunk/tasma/package-manager/src Message-ID: <20080507061705.1CE9D1384160@liste.pardus.org.tr> Author: faik Date: Wed May 7 09:17:04 2008 New Revision: 17955 Modified: trunk/tasma/package-manager/src/handler.py Log: use policykit-kde Modified: trunk/tasma/package-manager/src/handler.py ================================================================= --- trunk/tasma/package-manager/src/handler.py (original) +++ trunk/tasma/package-manager/src/handler.py Wed May 7 09:17:04 2008 @@ -108,7 +108,7 @@ def __getAuthIface(self): try: - obj = self.sesBus.get_object("org.gnome.PolicyKit", "/") + obj = self.sesBus.get_object("org.freedesktop.PolicyKit.AuthenticationAgent", "/") return dbus.Interface(obj, "org.freedesktop.PolicyKit.AuthenticationAgent") except dbus.DBusException, e: for func in self.handleDBusError: From uludag-commits at pardus.org.tr Wed May 7 09:43:18 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 09:43:18 +0300 (EEST) Subject: [Uludag-commits] r17956 - trunk/tasma/package-manager/src Message-ID: <20080507064318.C43461384160@liste.pardus.org.tr> Author: faik Date: Wed May 7 09:43:18 2008 New Revision: 17956 Modified: trunk/tasma/package-manager/src/ComarIface.py Log: KMessageBox call fixes i18n imported Modified: trunk/tasma/package-manager/src/ComarIface.py ================================================================= --- trunk/tasma/package-manager/src/ComarIface.py (original) +++ trunk/tasma/package-manager/src/ComarIface.py Wed May 7 09:43:18 2008 @@ -12,6 +12,7 @@ from qt import QMutex, SIGNAL from kdeui import KMessageBox +from kdecore import i18n # DBus import dbus @@ -33,7 +34,7 @@ self.sysBus = dbus.SystemBus() self.sesBus = dbus.SessionBus() except dbus.DBusException: - KMessageBox.error(self, i18n("Unable to connect to DBus."), i18n("DBus Error")) + KMessageBox.error(None, i18n("Unable to connect to DBus."), i18n("DBus Error")) return False return True @@ -47,14 +48,14 @@ self.handler(signal, args) def busError(self, exception): - KMessageBox.error(self, str(exception), "D-Bus Error") + KMessageBox.error(None, str(exception), i18n("D-Bus Error")) self.setupBusses() def comarAuthError(self, exception): - KMessageBox.error(self, str(exception), "COMAR Auth Error") + KMessageBox.error(None, str(exception), i18n("COMAR Auth Error")) def comarError(self, exception): - KMessageBox.error(self, str(exception), "COMAR Error") + KMessageBox.error(None, str(exception), i18n("COMAR Error")) def callMethod(self, method, action, handler, *args): print "Method: %s Action: %s" % (method, action) From uludag-commits at pardus.org.tr Wed May 7 09:48:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 09:48:19 +0300 (EEST) Subject: [Uludag-commits] r17957 - trunk/pisi/pisi Message-ID: <20080507064819.5657F13840DF@liste.pardus.org.tr> Author: faik Date: Wed May 7 09:48:18 2008 New Revision: 17957 Modified: trunk/pisi/pisi/comariface.py Log: apply Bahadir's patch Modified: trunk/pisi/pisi/comariface.py ================================================================= --- trunk/pisi/pisi/comariface.py (original) +++ trunk/pisi/pisi/comariface.py Wed May 7 09:48:18 2008 @@ -68,17 +68,22 @@ # or restarting after an update. So we give comar a chance to become # active in a reasonable time. timeout = 7 + exceptions = [] while timeout > 0: try: bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % sockname) obj = bus.get_object(ctx.comar_destination, obj_path, introspect=False) iface = dbus.Interface(obj, dbus_interface=obj_interface) return iface - except dbus.DBusException: + except dbus.DBusException, e: + exceptions.append(str(e)) + pass + except Exception, e: + exceptions.append(str(e)) pass time.sleep(0.2) timeout -= 0.2 - raise Error(_("cannot connect to dbus")) + raise Error(_("cannot connect to dbus: \n %s\n") % "\n ".join(exceptions)) def post_install(package_name, provided_scripts, scriptpath, metapath, filepath, fromVersion, fromRelease, toVersion, toRelease): """Do package's post install operations""" From uludag-commits at pardus.org.tr Wed May 7 10:54:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 10:54:03 +0300 (EEST) Subject: [Uludag-commits] r17958 - trunk/tasma/package-manager/src Message-ID: <20080507075403.9CE7F1384160@liste.pardus.org.tr> Author: faik Date: Wed May 7 10:54:03 2008 New Revision: 17958 Modified: trunk/tasma/package-manager/src/ComarIface.py trunk/tasma/package-manager/src/Commander.py Log: Handle error gracefully.. After getting an error.. do not lock package manager. Modified: trunk/tasma/package-manager/src/ComarIface.py ================================================================= --- trunk/tasma/package-manager/src/ComarIface.py (original) +++ trunk/tasma/package-manager/src/ComarIface.py Wed May 7 10:54:03 2008 @@ -21,7 +21,8 @@ from handler import CallHandler class ComarIface: - def __init__(self, handler=None): + def __init__(self, handler=None, errHandler=None): + self.errHandler = errHandler self.handler = handler # tray and package-manager synchronization self.com_lock = QMutex() @@ -50,12 +51,15 @@ def busError(self, exception): KMessageBox.error(None, str(exception), i18n("D-Bus Error")) self.setupBusses() + self.errHandler() def comarAuthError(self, exception): KMessageBox.error(None, str(exception), i18n("COMAR Auth Error")) + self.errHandler() def comarError(self, exception): KMessageBox.error(None, str(exception), i18n("COMAR Error")) + self.errHandler() def callMethod(self, method, action, handler, *args): print "Method: %s Action: %s" % (method, action) Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Wed May 7 10:54:03 2008 @@ -24,10 +24,16 @@ QObject.__init__(self) self.parent = parent try: - self.comar = ComarIface.ComarIface(self.handler) + self.comar = ComarIface.ComarIface(self.handler, self.errHandler) except: parent.showErrorMessage("Cannot connect to Comar daemon") + def errHandler(): + self.comar.com_lock.unlock() + self.parent.finished("System.Manager.cancelled") + self.parent.resetState() + self.parent.refreshState() + def handler(self, signal, data): print "Signal: ", signal print "Data: ", data From uludag-commits at pardus.org.tr Wed May 7 10:56:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 10:56:07 +0300 (EEST) Subject: [Uludag-commits] r17959 - trunk/tasma/package-manager/src Message-ID: <20080507075607.ECFCE138416C@liste.pardus.org.tr> Author: faik Date: Wed May 7 10:56:07 2008 New Revision: 17959 Modified: trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/MainWidget.py Log: checkCacheLimits causes policykit-KDE to ask two passwords for an operation... We will move this to manager.py and again will be called for every operation by looking at limits.. But clear cache button of package manager preferences will ask password for this operation.. Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Wed May 7 10:56:07 2008 @@ -161,16 +161,3 @@ def setCache(self, enabled, limit): self.comar.setCache(enabled, limit) - def checkCacheLimits(self): - print "checkCacheLimits called" - config = PisiIface.read_config("/etc/pisi/pisi.conf") - - cache = config.get("general", "package_cache") - if cache == "True": - limit = config.get("general", "package_cache_limit") - - # If PackageCache is used and limit is 0. It means limitless. - if limit and int(limit) != 0: - self.clearCache(int(limit) * 1024 * 1024) - elif cache == "False": - self.clearCache(0) Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Wed May 7 10:56:07 2008 @@ -664,10 +664,6 @@ #FIXME: Why do we need to reload pisi module every time. Added for not updating mem cached dbs of pisi PisiIface.reloadPisi() - # after every operation check package cache limits - if command not in ["System.Manager.clearCache", "System.Manager.setRepositories"]: - self.command.checkCacheLimits() - self.basket.empty() self.operateAction.setEnabled(False) self.basketAction.setEnabled(False) From uludag-commits at pardus.org.tr Wed May 7 12:03:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 12:03:17 +0300 (EEST) Subject: [Uludag-commits] r17960 - branches/yali4/yali4/gui Message-ID: <20080507090317.6921B13840AE@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed May 7 12:03:17 2008 New Revision: 17960 Modified: branches/yali4/yali4/gui/ScrAdmin.py branches/yali4/yali4/gui/ScrGoodbye.py Log: * Let root pass unicode.. Modified: branches/yali4/yali4/gui/ScrAdmin.py ================================================================= --- branches/yali4/yali4/gui/ScrAdmin.py (original) +++ branches/yali4/yali4/gui/ScrAdmin.py Wed May 7 12:03:17 2008 @@ -89,7 +89,7 @@ self.ui.pass1.setFocus() def execute(self): - ctx.installData.rootPassword = self.ui.pass1.text().toAscii() + ctx.installData.rootPassword = unicode(self.ui.pass1.text()) ctx.installData.hostName = self.ui.hostname.text().toAscii() return True Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Wed May 7 12:03:17 2008 @@ -160,7 +160,7 @@ def setPackages(): global bus - if yali4.sysutils.checkYaliParams(param=ctx.consts.firstBootParam): + if yali4.sysutils.checkYaliParams(param=ctx.consts.oemInstallParam): ctx.debugger.log("OemInstall selected.") obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") From uludag-commits at pardus.org.tr Wed May 7 12:07:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 12:07:57 +0300 (EEST) Subject: [Uludag-commits] r17961 - trunk/tasma/package-manager/src Message-ID: <20080507090758.12E9513840AE@liste.pardus.org.tr> Author: faik Date: Wed May 7 12:07:57 2008 New Revision: 17961 Modified: trunk/tasma/package-manager/src/Commander.py Log: no need for these, we have error handlers Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Wed May 7 12:07:57 2008 @@ -61,39 +61,14 @@ else: print "Got notification : %s with data : %s" % (signal, data) -# # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If -# # some misbehaviour is seen, comar.log is always there to look. -# elif signal == "error": -# self.comar.com_lock.unlock() -# self.parent.finished("System.Manager.cancelled") -# return -# elif signal == "denied": -# self.comar.com_lock.unlock() -# self.parent.finished("System.Manager.cancelled") -# self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) -# elif signal == "fail": -# if data == "System.Manager.cancelled": -# self.comar.com_lock.unlock() -# self.parent.finished(data) -# return - -# self.comar.com_lock.unlock() -# self.parent.finished() -# self.parent.resetState() -# self.parent.refreshState() - -# #FIXME: What replaces this in new Comar api -# # do not show any error if it is the interval check -# # if not reply.id == ID_TRAY_INTERVAL_CHECK: -# # self.parent.showErrorMessage(unicode(reply.data)) - -# # if an error occured communicating with comar and components are not ready we should warn -# if not PisiIface.get_components(): -# self.parent.repoNotReady() -# else: -# # paranoia -# self.comar.com_lock.unlock() -# pass +# #FIXME: What replaces this in new Comar api +# # do not show any error if it is the interval check +# # if not reply.id == ID_TRAY_INTERVAL_CHECK: +# # self.parent.showErrorMessage(unicode(reply.data)) + + # if an error occured communicating with comar and components are not ready we should warn + if not PisiIface.get_components(): + self.parent.repoNotReady() def startUpdate(self, repo = None): if repo is None: From uludag-commits at pardus.org.tr Wed May 7 13:04:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 13:04:38 +0300 (EEST) Subject: [Uludag-commits] r17962 - in branches/yali4/yali4: . gui gui/pics Message-ID: <20080507100438.ABAB61384114@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed May 7 13:04:38 2008 New Revision: 17962 Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/gui/YaliDialog.py branches/yali4/yali4/gui/pics/working.png branches/yali4/yali4/installer.py Log: * cieses Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Wed May 7 13:04:38 2008 @@ -102,7 +102,7 @@ def shown(self): # scan partitions for resizing - self.scanPartitions() + ctx.yali.scanPartitions(self) self.fillDeviceList() def sortBySize(x,y): @@ -128,34 +128,6 @@ ctx.mainScreen.disableNext() self.updateUI() - def scanPartitions(self): - self.resizablePartitions = [] - self.resizableDisks = [] - ctx.debugger.log("Disk analyze started.") - ctx.debugger.log("%d disk found." % len(yali4.storage.devices)) - for dev in yali4.storage.devices: - ctx.debugger.log("In disk %s, %d mb is free." % (dev.getPath(), dev.getLargestContinuousFreeMB())) - if dev.primaryAvailable(): - if dev.getLargestContinuousFreeMB() > ctx.consts.min_root_size + 100: - self.resizableDisks.append(dev) - for part in dev.getOrderedPartitionList(): - ctx.debugger.log("Partition %s found on disk %s, formatted as %s" % (part.getPath(), dev.getPath(), part.getFSName())) - if part.isResizable(): - minSize = part.getMinResizeMB() - possibleFreeSize = part.getMB() - minSize - ctx.debugger.log(" - This partition is resizable") - ctx.debugger.log(" - Total size of this partition is %.2f MB" % part.getMB()) - ctx.debugger.log(" - It can resizable to %.2f MB" % minSize) - ctx.debugger.log(" - Usable size for this partition is %.2f MB" % possibleFreeSize) - self.resizablePartitions.append({"partition":part,"newSize":possibleFreeSize}) - if possibleFreeSize+100 > ctx.consts.min_root_size: - if dev not in self.resizableDisks: - self.resizableDisks.append(dev) - else: - ctx.debugger.log("This partition is not resizable") - else: - ctx.debugger.log("In disk %s, there is no primary avaliable" % (dev.getPath())) - def execute(self): ctx.installData.autoPartDev = None if len(self.arp) > 1: Modified: branches/yali4/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4/yali4/gui/YaliDialog.py (original) +++ branches/yali4/yali4/gui/YaliDialog.py Wed May 7 13:04:38 2008 @@ -88,7 +88,6 @@ QMetaObject.connectSlotsByName(self) self.setStyleSheet(""" - QDialog { background-image:url(':/gui/pics/transBlack.png'); } QFrame#windowTitle {background-color:#70A73C;color:#FFF;border:1px solid #CCC;border-radius:4px;} """) @@ -164,11 +163,12 @@ self.setObjectName("InfoWin") self.resize(280,200) self.setStyleSheet(""" - QLabel { border: 1px solid #CCC; + QLabel { border: 1px solid #555; border-radius: 4px; background-image:url(':/gui/pics/transBlack.png');} - QLabel#message { border: 2px solid #AAA; - background-color:#FFFFFF } + QLabel#message { border: 1px solid #555; + color:#FFFFFF; + font:bold;} """) self.gridlayout = QtGui.QGridLayout(self) Modified: branches/yali4/yali4/gui/pics/working.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Wed May 7 13:04:38 2008 @@ -123,6 +123,7 @@ ctx.mainScreen.disableNext() ctx.mainScreen.disableBack() + self.info.updateAndShow(_("Starting for CD Check")) class PisiUI(pisi.ui.UI): def notify(self, event, **keywords): pass @@ -140,6 +141,7 @@ for pkg_name in pkg_names: cur += 1 ctx.debugger.log("Checking %s " % pkg_name) + self.info.updateMessage(_("Checking: %s") % pkg_name) if yali4.pisiiface.check_package_hash(pkg_name): rootWidget.progressBar.setValue(cur) else: @@ -147,18 +149,21 @@ _("

Integrity check for packages failed.\ It seems that installation CD is broken.

")) - rootWidget.checkLabel.setText(_('Check succeeded. You can proceed to the next screen.')) + rootWidget.checkLabel.setText(_('Check succeeded. You can proceed to the next screen.')) yali4.pisiiface.remove_repo(ctx.consts.cd_repo_name) ctx.mainScreen.enableNext() ctx.mainScreen.enableBack() + self.info.hide() + def setKeymap(self, keymap): yali4.localeutils.set_keymap(keymap["xkblayout"], keymap["xkbvariant"]) ctx.installData.keyData = keymap def setTime(self, rootWidget): + self.info.updateAndShow(_("Setting time settings..")) date = rootWidget.calendarWidget.selectedDate() args = "%02d%02d%02d%02d%04d.%02d" % (date.month(), date.day(), rootWidget.timeHours.time().hour(), rootWidget.timeMinutes.time().minute(), @@ -171,12 +176,43 @@ # Sync date time with hardware ctx.debugger.log("YALI's time is syncing with the system.") os.system("hwclock --systohc") + self.info.hide() def setTimeZone(self, rootWidget): # Store time zone selection we will set it in processPending actions. ctx.installData.timezone = rootWidget.timeZoneList.currentItem().text() ctx.debugger.log("Time zone selected as %s " % ctx.installData.timezone) + def scanPartitions(self, rootWidget): + self.info.updateAndShow(_("Disk analyze started..")) + rootWidget.resizablePartitions = [] + rootWidget.resizableDisks = [] + ctx.debugger.log("Disk analyze started.") + ctx.debugger.log("%d disk found." % len(yali4.storage.devices)) + for dev in yali4.storage.devices: + ctx.debugger.log("In disk %s, %d mb is free." % (dev.getPath(), dev.getLargestContinuousFreeMB())) + if dev.primaryAvailable(): + if dev.getLargestContinuousFreeMB() > ctx.consts.min_root_size + 100: + rootWidget.resizableDisks.append(dev) + for part in dev.getOrderedPartitionList(): + ctx.debugger.log("Partition %s found on disk %s, formatted as %s" % (part.getPath(), dev.getPath(), part.getFSName())) + if part.isResizable(): + minSize = part.getMinResizeMB() + possibleFreeSize = part.getMB() - minSize + ctx.debugger.log(" - This partition is resizable") + ctx.debugger.log(" - Total size of this partition is %.2f MB" % part.getMB()) + ctx.debugger.log(" - It can resizable to %.2f MB" % minSize) + ctx.debugger.log(" - Usable size for this partition is %.2f MB" % possibleFreeSize) + rootWidget.resizablePartitions.append({"partition":part,"newSize":possibleFreeSize}) + if possibleFreeSize+100 > ctx.consts.min_root_size: + if dev not in rootWidget.resizableDisks: + rootWidget.resizableDisks.append(dev) + else: + ctx.debugger.log("This partition is not resizable") + else: + ctx.debugger.log("In disk %s, there is no primary avaliable" % (dev.getPath())) + self.info.hide() + def autoPartDevice(self): self.info.updateAndShow(_("Writing disk tables ...")) From uludag-commits at pardus.org.tr Wed May 7 15:58:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 15:58:32 +0300 (EEST) Subject: [Uludag-commits] r17963 - trunk/tasma/package-manager/src Message-ID: <20080507125832.AFFBF13840F2@liste.pardus.org.tr> Author: faik Date: Wed May 7 15:58:32 2008 New Revision: 17963 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/SpecialList.py Log: make select all and unselect all work Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Wed May 7 15:58:32 2008 @@ -78,6 +78,10 @@ self.show() + def updateAfterAPackageClicked(self): + self.updateButtons() + self.updateStatusBar() + def packageClicked(self, itemName, checked): if checked: if itemName not in self.basket.packages: @@ -85,9 +89,6 @@ else: self.basket.remove(itemName) - self.updateButtons() - self.updateStatusBar() - def setupInterface(self): self.layout = QGridLayout(self) self.leftLayout = QVBox(self) Modified: trunk/tasma/package-manager/src/SpecialList.py ================================================================= --- trunk/tasma/package-manager/src/SpecialList.py (original) +++ trunk/tasma/package-manager/src/SpecialList.py Wed May 7 15:58:32 2008 @@ -43,8 +43,10 @@ node.addEventListener(DOM.DOMString("click"),self.eventListener,True) def slotCheckboxClicked(self, itemName, checked): + self.emit(PYSIGNAL("checkboxClicked"), (itemName, checked)) + if not self.selectingAll: - self.emit(PYSIGNAL("checkboxClicked"), (itemName, checked)) + self.parent.parent().updateAfterAPackageClicked() def slotHomepageClicked(self, link): KRun.runURL(KURL(link),"text/html",False,False); @@ -59,9 +61,7 @@ if reverse or not element.checked(): element.click() self.selectingAll = False - - #TODO: Fix this - #self.parent.updateStatusBar() + self.parent.parent().updateAfterAPackageClicked() def clear(self): self.part.view().setContentsPos(0, 0) From uludag-commits at pardus.org.tr Wed May 7 16:22:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:22:03 +0300 (EEST) Subject: [Uludag-commits] r17964 - in branches/yali4/yali4: . gui gui/Ui Message-ID: <20080507132203.AA7C113840FC@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed May 7 16:22:03 2008 New Revision: 17964 Modified: branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/gui/GUIAdditional.py branches/yali4/yali4/gui/ScrAdmin.py branches/yali4/yali4/gui/ScrInstall.py branches/yali4/yali4/gui/Ui/main.ui branches/yali4/yali4/gui/Ui/rootpasswidget.ui branches/yali4/yali4/gui/YaliDialog.py branches/yali4/yali4/gui/YaliWindow.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/installer.py Log: * A lot of changes.. Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Wed May 7 16:22:03 2008 @@ -570,7 +570,7 @@ self.ui.formatType.setCurrentIndex(0) self.ui.formatCheck.setChecked(False) - self.ui.resizePartition.setVisible(part.isResizable()) + self.ui.resizePartition.setVisible(part.isResizable() and part.isFileSystemReady()) if part._parted_type == parteddata.freeSpaceType: self.ui.deletePartition.setVisible(False) self.ui.resizePartition.setVisible(False) Modified: branches/yali4/yali4/gui/GUIAdditional.py ================================================================= --- branches/yali4/yali4/gui/GUIAdditional.py (original) +++ branches/yali4/yali4/gui/GUIAdditional.py Wed May 7 16:22:03 2008 @@ -67,10 +67,12 @@ self.connect(self.ui.resizeButton, SIGNAL("clicked()"), self.slotResize) def slotResize(self): + ctx.yali.info.updateAndShow(_("Resizing to %s MB..") % (self.ui.resizeMB.value())) ctx.debugger.log("Resize started on partition %s " % self.part.getPath()) self.dev.resizePartition(self.part._fsname, int(self.ui.resizeMB.value()),self.part) self.rootWidget.update() self.hide() + ctx.yali.info.hide() class AutoPartQuestionWidget(QtGui.QWidget): Modified: branches/yali4/yali4/gui/ScrAdmin.py ================================================================= --- branches/yali4/yali4/gui/ScrAdmin.py (original) +++ branches/yali4/yali4/gui/ScrAdmin.py Wed May 7 16:22:03 2008 @@ -81,7 +81,9 @@ def shown(self): try: # Use first added user's name as machine name - self.ui.hostname.setText("%s-pardus" % yali4.users.pending_users[0].username) + hostname_guess = "%s-pardus" % yali4.users.pending_users[0].username + if self.ui.hostname.text() == '': + self.ui.hostname.setText(hostname_guess) except: pass self.setNext() Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Wed May 7 16:22:03 2008 @@ -98,6 +98,7 @@ self.pkg_installer = PkgInstaller(self) ctx.debugger.log("Calling PkgInstaller.start...") self.pkg_installer.start() + ctx.yali.info.updateAndShow(_("Packages are installing.."), True) ctx.mainScreen.disableNext() ctx.mainScreen.disableBack() @@ -160,7 +161,7 @@ # run dbus in chroot yali4.sysutils.chroot_dbus() - ctx.yali.info.updateMessage(_("Configuring packages for your system!")) + ctx.yali.info.updateMessage(_("Configuring packages for your system!"), True) # start configurator thread self.pkg_configurator = PkgConfigurator(self) Modified: branches/yali4/yali4/gui/Ui/main.ui ================================================================= --- branches/yali4/yali4/gui/Ui/main.ui (original) +++ branches/yali4/yali4/gui/Ui/main.ui Wed May 7 16:22:03 2008 @@ -463,7 +463,7 @@ - 0 + 120 200 @@ -556,7 +556,7 @@ Previous Screen - Back + Back Modified: branches/yali4/yali4/gui/Ui/rootpasswidget.ui ================================================================= --- branches/yali4/yali4/gui/Ui/rootpasswidget.ui (original) +++ branches/yali4/yali4/gui/Ui/rootpasswidget.ui Wed May 7 16:22:03 2008 @@ -378,7 +378,7 @@ - pardus + Modified: branches/yali4/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4/yali4/gui/YaliDialog.py (original) +++ branches/yali4/yali4/gui/YaliDialog.py Wed May 7 16:22:03 2008 @@ -158,47 +158,76 @@ class InformationWindow(QtGui.QWidget): def __init__(self, message): - Pix = QtGui.QPixmap(':/gui/pics/working.png') QtGui.QWidget.__init__(self, ctx.mainScreen.ui) self.setObjectName("InfoWin") - self.resize(280,200) + self.resize(280,50) self.setStyleSheet(""" - QLabel { border: 1px solid #555; - border-radius: 4px; - background-image:url(':/gui/pics/transBlack.png');} - QLabel#message { border: 1px solid #555; - color:#FFFFFF; - font:bold;} + QFrame#frame { border: 1px solid #CCC; + border-radius: 4px; + background-image:url(':/gui/pics/transBlack.png');} + + QLabel { border:none; + color:#FFFFFF; + font:bold; } + + QProgressBar { border: 1px solid white;} + + QProgressBar::chunk { background-color: #F1610D; + width: 0.5px;} """) + self.gridlayout = QtGui.QGridLayout(self) + self.gridlayout.setObjectName("gridlayout") + + self.frame = QtGui.QFrame(self) + self.frame.setObjectName("frame") + + self.gridlayout1 = QtGui.QGridLayout(self.frame) + self.gridlayout1.setMargin(2) + self.gridlayout1.setSpacing(3) + self.gridlayout1.setObjectName("gridlayout1") + + self.hboxlayout = QtGui.QHBoxLayout() + self.hboxlayout.setObjectName("hboxlayout") + + spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum) + self.hboxlayout.addItem(spacerItem) - self.label = QtGui.QLabel(self) - self.label.setMaximumSize(QSize(16777215,30)) - self.label.setAlignment(Qt.AlignCenter) + self.label = QtGui.QLabel(self.frame) self.label.setObjectName("message") - self.gridlayout.addWidget(self.label,1,0,1,1) + self.hboxlayout.addWidget(self.label) + + spacerItem1 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum) + self.hboxlayout.addItem(spacerItem1) + self.gridlayout1.addLayout(self.hboxlayout,0,0,1,1) + + self.progressBar = QtGui.QProgressBar(self.frame) + self.progressBar.setMaximumSize(QSize(16777215,6)) + self.progressBar.setMaximum(0) + self.progressBar.setProperty("value",QVariant(-1)) + self.progressBar.setObjectName("progressBar") + self.gridlayout1.addWidget(self.progressBar,1,0,1,1) + self.gridlayout.addWidget(self.frame,0,0,1,1) - self.pix = QtGui.QLabel(self) - self.pix.setAlignment(Qt.AlignCenter) - self.pix.setPixmap(Pix) - self.gridlayout.addWidget(self.pix,0,0,1,1) self.updateMessage(message) - def updateMessage(self, message): - self.move(ctx.mainScreen.ui.width()/2 - self.width()/2 - 20, - ctx.mainScreen.ui.height()/2 - self.height()/2 - 30) - self.label.setText(message) + def updateMessage(self, message=None, progress=False): + self.progressBar.setVisible(progress) + self.move(ctx.mainScreen.ui.width()/2 - self.width()/2, + ctx.mainScreen.ui.height() - self.height()/2 - 26) + if message: + self.label.setText(message) ctx.mainScreen.processEvents() - def updateAndShow(self, message): - self.updateMessage(message) + def updateAndShow(self, message, progress=False): + self.updateMessage(message,progress) self.show() def show(self): - ctx.mainScreen.processEvents() QtGui.QWidget.show(self) + ctx.mainScreen.processEvents() def hide(self): - ctx.mainScreen.processEvents() QtGui.QWidget.hide(self) + ctx.mainScreen.processEvents() Modified: branches/yali4/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4/yali4/gui/YaliWindow.py (original) +++ branches/yali4/yali4/gui/YaliWindow.py Wed May 7 16:22:03 2008 @@ -39,7 +39,7 @@ self.screenData = None # shortcut to open debug window self.debugShortCut = QtGui.QShortcut(QtGui.QKeySequence(Qt.Key_F2),self.ui) - self.ui.setAttribute(Qt.WA_OpaquePaintEvent) + # self.ui.setAttribute(Qt.WA_OpaquePaintEvent) # move one step at a time self.moveInc = 1 Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Wed May 7 16:22:03 2008 @@ -100,6 +100,7 @@ self._window.ui.resize(self._app.desktop().size()) self._window.ui.move(0,0) self._window.ui.show() + ctx.yali.info.updateMessage() # For testing.. # self._window.ui.resize(QSize(800,600)) Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Wed May 7 16:22:03 2008 @@ -271,7 +271,7 @@ self.info.updateAndShow(_("Resizing ...")) _np = dev.resizePartition(part._fsname, part.getMB() - newPartSize, part) - self.into.updateMessage(_("Resize Finished ...")) + self.info.updateMessage(_("Resize Finished ...")) ctx.debugger.log("UA: Resize finished.") time.sleep(1) @@ -283,7 +283,7 @@ else: ptype = PARTITION_PRIMARY - self.into.updateMessage(_("Creating new partition ...")) + self.info.updateMessage(_("Creating new partition ...")) ctx.debugger.log("UA: newStart : %s " % newStart) _newPart = dev.addPartition(None, ptype, From uludag-commits at pardus.org.tr Wed May 7 16:29:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:29:21 +0300 (EEST) Subject: [Uludag-commits] r17965 - trunk/tasma/package-manager/src Message-ID: <20080507132921.BB29613840D6@liste.pardus.org.tr> Author: faik Date: Wed May 7 16:29:21 2008 New Revision: 17965 Modified: trunk/tasma/package-manager/src/Commander.py Log: errHandler is a member method Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Wed May 7 16:29:21 2008 @@ -28,7 +28,7 @@ except: parent.showErrorMessage("Cannot connect to Comar daemon") - def errHandler(): + def errHandler(self): self.comar.com_lock.unlock() self.parent.finished("System.Manager.cancelled") self.parent.resetState() From uludag-commits at pardus.org.tr Wed May 7 16:32:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:32:32 +0300 (EEST) Subject: [Uludag-commits] r17966 - trunk/tasma/package-manager/src Message-ID: <20080507133232.B71FA13840D6@liste.pardus.org.tr> Author: faik Date: Wed May 7 16:32:32 2008 New Revision: 17966 Modified: trunk/tasma/package-manager/src/Preferences.py Log: call setCache if cache setting changed Modified: trunk/tasma/package-manager/src/Preferences.py ================================================================= --- trunk/tasma/package-manager/src/Preferences.py (original) +++ trunk/tasma/package-manager/src/Preferences.py Wed May 7 16:32:32 2008 @@ -63,6 +63,7 @@ self.systemTray.setChecked(self.parent.settings.getBoolValue(Settings.general, "SystemTray")) self.getCacheSettings() self.reposChanged = False + self.cacheEnabled = False def setCacheSettings(self, useCache, cacheLimit): self.parent.command.setCache(useCache, cacheLimit) @@ -84,7 +85,8 @@ enableCache = True else: enableCache = False - + + self.cacheEnabled = enableCache self.useCacheCheck.setChecked(enableCache) self.useCacheSize.setValue(cache_limit) @@ -196,7 +198,10 @@ self.parent.settings.setValue(Settings.general, "SystemTray", self.systemTray.isChecked()) self.parent.settings.setValue(Settings.general, "UpdateCheck", self.intervalCheck.isChecked()) self.parent.settings.setValue(Settings.general, "UpdateCheckInterval", self.intervalSpin.value()) - self.setCacheSettings(self.useCacheCheck.isChecked(), self.useCacheSize.value()) + + # set cache if changed + if self.cacheEnabled != self.useCacheCheck.isChecked(): + self.setCacheSettings(self.useCacheCheck.isChecked(), self.useCacheSize.value()) if self.intervalCheck.isChecked(): self.parent.parent.tray.updateInterval(self.intervalSpin.value()) From uludag-commits at pardus.org.tr Wed May 7 16:49:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:49:19 +0300 (EEST) Subject: [Uludag-commits] r17967 - branches/kaptan3/src/screens Message-ID: <20080507134919.BC0E813840F5@liste.pardus.org.tr> Author: pinar Date: Wed May 7 16:49:19 2008 New Revision: 17967 Modified: branches/kaptan3/src/screens/ScrPackage.py Log: add contrib repo Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Wed May 7 16:49:19 2008 @@ -15,6 +15,8 @@ from kdeui import * import kdedesigner +import addrepo + from screens.Screen import ScreenWidget from screens.packagedlg import PackageWidget @@ -22,8 +24,6 @@ class Widget(PackageWidget, ScreenWidget): - #TODO: Add contrib depo - # title and description at the top of the dialog window title = i18n("Package Manager") desc = i18n("Configure package manager settings...") @@ -51,13 +51,36 @@ self.checkBoxContrib.setText(i18n("Add contrib repo")) #policykit olana kadar enabled - self.checkBoxContrib.setEnabled(False) + self.checkBoxContrib.setEnabled(True) #set images self.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/middleWithCorner.png"))) self.pixPackage.setPixmap(QPixmap(locate("data", "kaptan/pics/package.png"))) + self.showTray.connect(self.showTray, SIGNAL("toggled(bool)"), self.enableCheckTime) - self.checkUpdate.connect(self.checkUpdate, SIGNAL("toggled(bool)"), self.updateSelected); + self.checkUpdate.connect(self.checkUpdate, SIGNAL("toggled(bool)"), self.updateSelected) + self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.addRepo) + + def addRepo(self): + try: + addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + return + except Exception, e: + print e + if e.get_dbus_name().endswith('policy.no'): + print 'Access denied' + #pop up + return True + elif e.get_dbus_name().endswith('policy.auth_admin'): + print 'Access denied, root password required' + addrepo.auth() + elif e.get_dbus_name().endswith('policy.auth_user'): + print 'Access denied, user password required' + addrepo.auth() + try: + addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + except: + return False def enableCheckTime(self): if self.showTray.isOn(): From uludag-commits at pardus.org.tr Wed May 7 16:50:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:50:40 +0300 (EEST) Subject: [Uludag-commits] r17968 - branches/kaptan3/src/screens Message-ID: <20080507135040.4CE9C13840F5@liste.pardus.org.tr> Author: pinar Date: Wed May 7 16:50:39 2008 New Revision: 17968 Added: branches/kaptan3/src/screens/addrepo.py Log: add contrib repo From uludag-commits at pardus.org.tr Wed May 7 16:52:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:52:06 +0300 (EEST) Subject: [Uludag-commits] r17969 - branches/kaptan3/src/screens Message-ID: <20080507135206.4A81513840F5@liste.pardus.org.tr> Author: pinar Date: Wed May 7 16:52:05 2008 New Revision: 17969 Modified: branches/kaptan3/src/screens/kaptanMain.ui Log: make qdialog instead of main window Modified: branches/kaptan3/src/screens/kaptanMain.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Wed May 7 16:53:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 16:53:55 +0300 (EEST) Subject: [Uludag-commits] r17970 - branches/buildfarm-devel Message-ID: <20080507135355.8440413840F5@liste.pardus.org.tr> Author: caglar Date: Wed May 7 16:53:55 2008 New Revision: 17970 Modified: branches/buildfarm-devel/config.py branches/buildfarm-devel/main.py Log: revert -debug handling code, buildfarm is not the place to solve this issue. Modified: branches/buildfarm-devel/config.py ================================================================= --- branches/buildfarm-devel/config.py (original) +++ branches/buildfarm-devel/config.py Wed May 7 16:53:55 2008 @@ -15,7 +15,6 @@ workDir = "/var/pisi/" outputDir = "/var/cache/pisi/buildlogs/" binaryPath = "/var/cache/pisi/packages/" -binaryDebugPath = "/var/cache/pisi/packages-debug/" localPspecRepo = "%s/exampleRepo" % os.getcwd() logFile = "/var/cache/pisi/buildfarm.log" Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Wed May 7 16:53:55 2008 @@ -25,7 +25,6 @@ import mailer import qmanager import pisiinterface -import pisi.util """ Gettext Support """ import gettext @@ -103,18 +102,17 @@ mailer.info(_("Queue finished without a problem!...\n\n\nNew binary packages are;\n\n%s\n\nnow in repository...") % "\n".join(packageList)) logger.raw() - generateIndex(config.binaryPath) - generateIndex(config.binaryDebugPath) - -def generateIndex(repositoryPath = config.binaryPath): logger.raw() logger.info(_("Generating PiSi Index...")) current = os.getcwd() - os.chdir(repositoryPath) + os.chdir(config.binaryPath) os.system("/usr/bin/pisi index %s . --skip-signing --skip-sources" % config.localPspecRepo) logger.info(_("PiSi Index generated...")) + #FIXME: will be enableb after some internal tests + #os.system("rsync -avze ssh --delete . pisi.pardus.org.tr:/var/www/paketler.uludag.org.tr/htdocs/pardus-1.1/") + # Check packages containing binaries and libraries broken by any package update os.system("/usr/bin/revdep-rebuild --force") # FIXME: if there is any broken package, mail /root/.revdep-rebuild.4_names file @@ -152,49 +150,37 @@ remove = os.remove copy = shutil.copy - def moveOldPackage(package, debug = False): + def moveOldPackage(package): logger.info(_("*** Old package '%s' is processing") % (package)) if exists(join(config.binaryPath, package)): - if debug: - remove(join(config.binaryDebugPath, package)) - else: - remove(join(config.binaryPath, package)) + remove(join(config.binaryPath, package)) if exists(join(config.workDir, package)): remove(join(config.workDir, package)) - def moveNewPackage(package, debug = False): + def moveNewPackage(package): logger.info(_("*** New package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - if debug: - copy(join(config.workDir, package), config.binaryDebugPath) - else: - copy(join(config.workDir, package), config.binaryPath) + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) - def moveUnchangedPackage(package, debug = False): + def moveUnchangedPackage(package): logger.info(_("*** Unchanged package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - if debug: - copy(join(config.workDir, package), config.binaryDebugPath) - else: - copy(join(config.workDir, package), config.binaryPath) + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) for package in newPackages: if package: - isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") - moveNewPackage(package, isDebug) + moveNewPackage(package) for package in oldPackages: if package: - isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") - moveOldPackage(package, isDebug) + moveOldPackage(package) for package in unchangedPackages: if package: - isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") - moveUnchangedPackage(package, isDebug) + moveUnchangedPackage(package) def removeBinaryPackageFromWorkDir(package): join = os.path.join @@ -204,7 +190,6 @@ def create_directories(): directories = [config.workDir, config.binaryPath, - config.binaryDebugPath, config.localPspecRepo, config.outputDir] From uludag-commits at pardus.org.tr Wed May 7 17:07:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 17:07:01 +0300 (EEST) Subject: [Uludag-commits] r17971 - branches/buildfarm-devel Message-ID: <20080507140702.0E96513840F5@liste.pardus.org.tr> Author: caglar Date: Wed May 7 17:07:01 2008 New Revision: 17971 Modified: branches/buildfarm-devel/config.py branches/buildfarm-devel/main.py Log: revert revert Modified: branches/buildfarm-devel/config.py ================================================================= --- branches/buildfarm-devel/config.py (original) +++ branches/buildfarm-devel/config.py Wed May 7 17:07:01 2008 @@ -15,6 +15,7 @@ workDir = "/var/pisi/" outputDir = "/var/cache/pisi/buildlogs/" binaryPath = "/var/cache/pisi/packages/" +binaryDebugPath = "/var/cache/pisi/packages-debug/" localPspecRepo = "%s/exampleRepo" % os.getcwd() logFile = "/var/cache/pisi/buildfarm.log" Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Wed May 7 17:07:01 2008 @@ -25,6 +25,7 @@ import mailer import qmanager import pisiinterface +import pisi.util """ Gettext Support """ import gettext @@ -102,17 +103,18 @@ mailer.info(_("Queue finished without a problem!...\n\n\nNew binary packages are;\n\n%s\n\nnow in repository...") % "\n".join(packageList)) logger.raw() + generateIndex(config.binaryPath) + generateIndex(config.binaryDebugPath) + +def generateIndex(repositoryPath = config.binaryPath): logger.raw() logger.info(_("Generating PiSi Index...")) current = os.getcwd() - os.chdir(config.binaryPath) + os.chdir(repositoryPath) os.system("/usr/bin/pisi index %s . --skip-signing --skip-sources" % config.localPspecRepo) logger.info(_("PiSi Index generated...")) - #FIXME: will be enableb after some internal tests - #os.system("rsync -avze ssh --delete . pisi.pardus.org.tr:/var/www/paketler.uludag.org.tr/htdocs/pardus-1.1/") - # Check packages containing binaries and libraries broken by any package update os.system("/usr/bin/revdep-rebuild --force") # FIXME: if there is any broken package, mail /root/.revdep-rebuild.4_names file @@ -150,37 +152,49 @@ remove = os.remove copy = shutil.copy - def moveOldPackage(package): + def moveOldPackage(package, debug = False): logger.info(_("*** Old package '%s' is processing") % (package)) if exists(join(config.binaryPath, package)): - remove(join(config.binaryPath, package)) + if debug: + remove(join(config.binaryDebugPath, package)) + else: + remove(join(config.binaryPath, package)) if exists(join(config.workDir, package)): remove(join(config.workDir, package)) - def moveNewPackage(package): + def moveNewPackage(package, debug = False): logger.info(_("*** New package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) - def moveUnchangedPackage(package): + def moveUnchangedPackage(package, debug = False): logger.info(_("*** Unchanged package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) for package in newPackages: if package: - moveNewPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveNewPackage(package, isDebug) for package in oldPackages: if package: - moveOldPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveOldPackage(package, isDebug) for package in unchangedPackages: if package: - moveUnchangedPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveUnchangedPackage(package, isDebug) def removeBinaryPackageFromWorkDir(package): join = os.path.join @@ -190,6 +204,7 @@ def create_directories(): directories = [config.workDir, config.binaryPath, + config.binaryDebugPath, config.localPspecRepo, config.outputDir] From uludag-commits at pardus.org.tr Wed May 7 20:17:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 20:17:40 +0300 (EEST) Subject: [Uludag-commits] r17972 - in branches/yali4/yali4: . gui Message-ID: <20080507171740.39D1213841C3@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed May 7 20:17:39 2008 New Revision: 17972 Modified: branches/yali4/yali4/filesystem.py branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/gui/GUIAdditional.py branches/yali4/yali4/gui/ScrInstall.py Log: * Handle resize errors. Modified: branches/yali4/yali4/filesystem.py ================================================================= --- branches/yali4/yali4/filesystem.py (original) +++ branches/yali4/yali4/filesystem.py Wed May 7 20:17:39 2008 @@ -215,11 +215,13 @@ lines = os.popen("%s -h %s" % (cmd_path, partition.getPath())).readlines() - total_blocks = long(filter(lambda line: line.startswith('Block count'), lines)[0].split(':')[1].strip('\n').strip(' ')) - free_blocks = long(filter(lambda line: line.startswith('Free blocks'), lines)[0].split(':')[1].strip('\n').strip(' ')) - block_size = long(filter(lambda line: line.startswith('Block size'), lines)[0].split(':')[1].strip('\n').strip(' ')) - - return (((total_blocks - free_blocks) * block_size) / parteddata.MEGABYTE) + 150 + try: + total_blocks = long(filter(lambda line: line.startswith('Block count'), lines)[0].split(':')[1].strip('\n').strip(' ')) + free_blocks = long(filter(lambda line: line.startswith('Free blocks'), lines)[0].split(':')[1].strip('\n').strip(' ')) + block_size = long(filter(lambda line: line.startswith('Block size'), lines)[0].split(':')[1].strip('\n').strip(' ')) + return (((total_blocks - free_blocks) * block_size) / parteddata.MEGABYTE) + 150 + except: + return 0 def preResize(self, partition): """ FileSystem Check before resize """ Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Wed May 7 20:17:39 2008 @@ -570,7 +570,6 @@ self.ui.formatType.setCurrentIndex(0) self.ui.formatCheck.setChecked(False) - self.ui.resizePartition.setVisible(part.isResizable() and part.isFileSystemReady()) if part._parted_type == parteddata.freeSpaceType: self.ui.deletePartition.setVisible(False) self.ui.resizePartition.setVisible(False) @@ -599,6 +598,8 @@ else: self.isPartitionUsed = False + self.ui.resizePartition.setVisible(part.isResizable() and not self.isPartitionUsed) + isFormatChecked = getPartitionType(part,0) if isFormatChecked: self.ui.formatCheck.setChecked(True) Modified: branches/yali4/yali4/gui/GUIAdditional.py ================================================================= --- branches/yali4/yali4/gui/GUIAdditional.py (original) +++ branches/yali4/yali4/gui/GUIAdditional.py Wed May 7 20:17:39 2008 @@ -51,20 +51,29 @@ } QWidget#PartResizeWidget { - background-image: url(:/gui/pics/trans.png); + background-image: url(:/gui/pics/trans.png); } """) + self.resize(ctx.mainScreen.ui.size()) self.dev = dev self.part = part minSize = self.part.getMinResizeMB() - maxSize = self.part.getMB() - self.ui.resizeMB.setMaximum(maxSize) - self.ui.resizeMBSlider.setMaximum(maxSize) - self.ui.resizeMB.setMinimum(minSize) - self.ui.resizeMBSlider.setMinimum(minSize) + + if minSize == 0: + self.ui.resizeMB.setVisible(False) + self.ui.resizeMBSlider.setVisible(False) + self.ui.resizeButton.setVisible(False) + self.ui.label.setText(_("""

It seems this partition is not ready for resizing.

""")) + else: + maxSize = self.part.getMB() + self.ui.resizeMB.setMaximum(maxSize) + self.ui.resizeMBSlider.setMaximum(maxSize) + self.ui.resizeMB.setMinimum(minSize) + self.ui.resizeMBSlider.setMinimum(minSize) + self.connect(self.ui.resizeButton, SIGNAL("clicked()"), self.slotResize) + self.connect(self.ui.cancelButton, SIGNAL("clicked()"), self.hide) - self.connect(self.ui.resizeButton, SIGNAL("clicked()"), self.slotResize) def slotResize(self): ctx.yali.info.updateAndShow(_("Resizing to %s MB..") % (self.ui.resizeMB.value())) Modified: branches/yali4/yali4/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Wed May 7 20:17:39 2008 @@ -167,8 +167,6 @@ self.pkg_configurator = PkgConfigurator(self) self.pkg_configurator.start() - ctx.yali.info.hide() - def execute(self): # stop slide show self.timer.stop() @@ -177,6 +175,7 @@ def finished(self): if self.hasErrors: return + ctx.yali.info.hide() # trigger next screen. will activate execute() ctx.mainScreen.slotNext() From uludag-commits at pardus.org.tr Wed May 7 21:03:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 21:03:33 +0300 (EEST) Subject: [Uludag-commits] r17973 - in branches/kaptan3/src: . screens Message-ID: <20080507180333.92B1A13841B9@liste.pardus.org.tr> Author: pinar Date: Wed May 7 21:03:33 2008 New Revision: 17973 Modified: branches/kaptan3/src/kaptan.py branches/kaptan3/src/screens/kaptanMain.ui Log: remove hardcoded images from main window Modified: branches/kaptan3/src/kaptan.py ================================================================= --- branches/kaptan3/src/kaptan.py (original) +++ branches/kaptan3/src/kaptan.py Wed May 7 21:03:33 2008 @@ -73,8 +73,11 @@ icon = "kaptan/pics/icons/welcome.png" # set images + self.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) self.pixSteps.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/leftWithCorner.png"))) self.pageStack.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/middleWithCorner.png"))) + self.pageDesc.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) + self.pageTitle.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) self.pageIcon.setPixmap(QPixmap(locate("data", icon))) # set button icons Modified: branches/kaptan3/src/screens/kaptanMain.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Wed May 7 21:24:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 21:24:54 +0300 (EEST) Subject: [Uludag-commits] r17974 - trunk/artwork/wallpapers/2007 Message-ID: <20080507182454.9A19B138412F@liste.pardus.org.tr> Author: pinar Date: Wed May 7 21:24:54 2008 New Revision: 17974 Modified: trunk/artwork/wallpapers/2007/caracalge.jpg.desktop trunk/artwork/wallpapers/2007/felisge.jpg.desktop trunk/artwork/wallpapers/2007/lynxge.jpg.desktop Log: add resolution tag to desktop files for kaptan 3.0 Modified: trunk/artwork/wallpapers/2007/caracalge.jpg.desktop ================================================================= --- trunk/artwork/wallpapers/2007/caracalge.jpg.desktop (original) +++ trunk/artwork/wallpapers/2007/caracalge.jpg.desktop Wed May 7 21:24:54 2008 @@ -8,3 +8,4 @@ Name[pt_BR]=Caracal [Tela larga] ImageType=pixmap Author=Umut +Resolution=Wide Modified: trunk/artwork/wallpapers/2007/felisge.jpg.desktop ================================================================= --- trunk/artwork/wallpapers/2007/felisge.jpg.desktop (original) +++ trunk/artwork/wallpapers/2007/felisge.jpg.desktop Wed May 7 21:24:54 2008 @@ -6,3 +6,4 @@ Name[nl]=Felis chaus [Breedbeeld] ImageType=pixmap Author=Umut +Resolution=Wide Modified: trunk/artwork/wallpapers/2007/lynxge.jpg.desktop ================================================================= --- trunk/artwork/wallpapers/2007/lynxge.jpg.desktop (original) +++ trunk/artwork/wallpapers/2007/lynxge.jpg.desktop Wed May 7 21:24:54 2008 @@ -8,3 +8,4 @@ Name[pt_BR]= Lynx [Tela larga] ImageType=pixmap Author=Umut +Resolution=Wide From uludag-commits at pardus.org.tr Wed May 7 21:36:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 21:36:56 +0300 (EEST) Subject: [Uludag-commits] r17975 - branches/kaptan3/src/screens Message-ID: <20080507183656.AD4D6138415B@liste.pardus.org.tr> Author: pinar Date: Wed May 7 21:36:56 2008 New Revision: 17975 Modified: branches/kaptan3/src/screens/ScrGoodbye.py Log: remove exception message, logging is enough Modified: branches/kaptan3/src/screens/ScrGoodbye.py ================================================================= --- branches/kaptan3/src/screens/ScrGoodbye.py (original) +++ branches/kaptan3/src/screens/ScrGoodbye.py Wed May 7 21:36:56 2008 @@ -58,7 +58,6 @@ if isMigrationAvaiable: self.groupBoxMigration.hide() except OSError, e: - print "Error: ", e logging.debug("Migration is not installed: " + str(e)) # hide migration part, if it's not installed. self.groupBoxMigration.hide() From uludag-commits at pardus.org.tr Wed May 7 22:47:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 22:47:24 +0300 (EEST) Subject: [Uludag-commits] r17976 - in branches/yali4/yali4/gui: . Ui Message-ID: <20080507194724.DD5E31384132@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed May 7 22:47:24 2008 New Revision: 17976 Modified: branches/yali4/yali4/gui/GUIAdditional.py branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/ScrDateTime.py branches/yali4/yali4/gui/Ui/main.ui branches/yali4/yali4/gui/YaliDialog.py Log: * GUI issues fixed.. Modified: branches/yali4/yali4/gui/GUIAdditional.py ================================================================= --- branches/yali4/yali4/gui/GUIAdditional.py (original) +++ branches/yali4/yali4/gui/GUIAdditional.py Wed May 7 22:47:24 2008 @@ -76,11 +76,14 @@ self.connect(self.ui.cancelButton, SIGNAL("clicked()"), self.hide) def slotResize(self): + self.hide() ctx.yali.info.updateAndShow(_("Resizing to %s MB..") % (self.ui.resizeMB.value())) ctx.debugger.log("Resize started on partition %s " % self.part.getPath()) + QTimer.singleShot(500,self.res) + + def res(self): self.dev.resizePartition(self.part._fsname, int(self.ui.resizeMB.value()),self.part) self.rootWidget.update() - self.hide() ctx.yali.info.hide() class AutoPartQuestionWidget(QtGui.QWidget): Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Wed May 7 22:47:24 2008 @@ -147,12 +147,14 @@ ctx.yali.autoPartDevice() ctx.yali.checkSwap() ctx.yali.info.updateMessage(_("Formatting ...")) + ctx.mainScreen.processEvents() ctx.partrequests.applyAll() elif ctx.installData.autoPartMethod == methodUseAvail: ctx.yali.autoPartUseAvail() ctx.yali.checkSwap() ctx.yali.info.updateMessage(_("Formatting ...")) + ctx.mainScreen.processEvents() ctx.partrequests.applyAll() # Manual Partitioning @@ -166,11 +168,11 @@ time.sleep(2) ctx.yali.checkSwap() ctx.yali.info.updateMessage(_("Formatting ...")) + ctx.mainScreen.processEvents() ctx.partrequests.applyAll() ctx.debugger.log("Format Operation Finished") - ctx.mainScreen.processEvents() - ctx.yali.info.close() + ctx.yali.info.hide() root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, request.mountRequestType) Modified: branches/yali4/yali4/gui/ScrDateTime.py ================================================================= --- branches/yali4/yali4/gui/ScrDateTime.py (original) +++ branches/yali4/yali4/gui/ScrDateTime.py Wed May 7 22:47:24 2008 @@ -90,9 +90,12 @@ def shown(self): self.timer.start(1000) + def setTime(self): + ctx.yali.setTime(self.ui) + def execute(self): if not self.timer.isActive() or self.isDateChanged: - ctx.yali.setTime(self.ui) + QTimer.singleShot(500,self.setTime) self.timer.stop() ctx.yali.setTimeZone(self.ui) Modified: branches/yali4/yali4/gui/Ui/main.ui ================================================================= --- branches/yali4/yali4/gui/Ui/main.ui (original) +++ branches/yali4/yali4/gui/Ui/main.ui Wed May 7 22:47:24 2008 @@ -285,6 +285,22 @@ QSpinBox::down-button:pressed { border-image: url(:/images/spindown_pressed.png) 1; +} +QListWidget { + show-decoration-selected: 1; + selection-background-color: #E75F10; + selection-color: white; +} + +QProgressBar { + border: 2px solid #F1610D; + border-radius:5px; + text-align: center; +} + +QProgressBar::chunk { + background-color: #F1610D; + width: 0.5px; } Modified: branches/yali4/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4/yali4/gui/YaliDialog.py (original) +++ branches/yali4/yali4/gui/YaliDialog.py Wed May 7 22:47:24 2008 @@ -30,7 +30,7 @@ self.label = QtGui.QLabel(self) self.label.setObjectName("label") - self.label.setStyleSheet("padding-left:4px; font:bold 11px") + self.label.setStyleSheet("padding-left:4px; font:bold 11px; color: #FFFFFF;") self.hboxlayout.addWidget(self.label) @@ -88,7 +88,7 @@ QMetaObject.connectSlotsByName(self) self.setStyleSheet(""" - QFrame#windowTitle {background-color:#70A73C;color:#FFF;border:1px solid #CCC;border-radius:4px;} + QFrame#windowTitle {background-color:#E75F10;color:#FFF;border:1px solid #FFF;border-radius:1px;} """) class WarningDialog(Dialog): From uludag-commits at pardus.org.tr Wed May 7 23:49:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 23:49:10 +0300 (EEST) Subject: [Uludag-commits] r17977 - trunk/comar/mudur/bin Message-ID: <20080507204910.1169A13840FC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Wed May 7 23:49:09 2008 New Revision: 17977 Modified: trunk/comar/mudur/bin/service.py Log: return codes Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Wed May 7 23:49:09 2008 @@ -185,7 +185,7 @@ def manage_service(service, op, use_color=True, quiet=False): if os.getuid() != 0 and op not in ["status", "info", "list"]: print _("You must be root to use that.") - return + return -1 bus = dbus.SystemBus() @@ -208,7 +208,6 @@ elif op == "restart": manage_service(service, "stop", use_color, quiet) manage_service(service, "start", use_color, quiet) - return def run(*cmd): subprocess.call(cmd) @@ -216,7 +215,7 @@ def manage_dbus(op, use_color, quiet): if os.getuid() != 0 and op not in ["status", "info", "list"]: print _("You must be root to use that.") - return + return -1 def cleanup(): try: @@ -235,7 +234,7 @@ "--", "--system") if not waitBus("/var/run/dbus/system_bus_socket"): print _("Unable to start D-Bus") - return + return -1 elif op == "stop": if not quiet: print _("Stopping DBus...") @@ -311,11 +310,15 @@ manage_service(args[0], args[1], use_color, quiet) except dbus.DBusException, e: print e.args[0] + return -1 except ValueError, e: print e + return -1 else: usage() + return 0 + # if __name__ == "__main__": From uludag-commits at pardus.org.tr Wed May 7 23:49:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 7 May 2008 23:49:41 +0300 (EEST) Subject: [Uludag-commits] r17978 - trunk/comar/mudur/bin Message-ID: <20080507204941.EAA2613840FC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Wed May 7 23:49:41 2008 New Revision: 17978 Modified: trunk/comar/mudur/bin/service.py Log: inc timeout Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Wed May 7 23:49:41 2008 @@ -232,7 +232,7 @@ run("/sbin/start-stop-daemon", "-b", "--start", "--quiet", "--pidfile", "/var/run/dbus/pid", "--exec", "/usr/bin/dbus-daemon", "--", "--system") - if not waitBus("/var/run/dbus/system_bus_socket"): + if not waitBus("/var/run/dbus/system_bus_socket", timeout=20): print _("Unable to start D-Bus") return -1 elif op == "stop": From uludag-commits at pardus.org.tr Thu May 8 01:22:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 01:22:10 +0300 (EEST) Subject: [Uludag-commits] r17979 - in branches/kaptan3/src: . screens Message-ID: <20080507222210.E30C31384116@liste.pardus.org.tr> Author: pinar Date: Thu May 8 01:22:10 2008 New Revision: 17979 Modified: branches/kaptan3/src/kaptan.py branches/kaptan3/src/screens/ScrWallpaper.py Log: workaround :) and some other minor fixes Modified: branches/kaptan3/src/kaptan.py ================================================================= --- branches/kaptan3/src/kaptan.py (original) +++ branches/kaptan3/src/kaptan.py Thu May 8 01:22:10 2008 @@ -113,7 +113,7 @@ _w = screen.Widget() self.pageStack.addWidget(_w) sId = self.pageStack.id(_w) - sCaption = screen.Widget().caption() + sCaption = _w.caption() screenId[sId] = sCaption if sId == 1: Modified: branches/kaptan3/src/screens/ScrWallpaper.py ================================================================= --- branches/kaptan3/src/screens/ScrWallpaper.py (original) +++ branches/kaptan3/src/screens/ScrWallpaper.py Thu May 8 01:22:10 2008 @@ -106,7 +106,6 @@ # get normal size wallpapers self.wallpaperList[wallpaperFile] = wallpaperTitle except ConfigParser.NoOptionError, e: - print "Error: ", e logging.debug("No Option Error: " + str(e)) self.sortedWallpaperList = self.dictSort(self.wallpaperList) @@ -117,7 +116,12 @@ if wallpaperTitle == i: item = KListViewItem(self.listWallpaper, "file", str(wallpaperFile)) item.setText(0,wallpaperTitle) - item.setPixmap(0,QPixmap(QImage(os.path.join(self.tmpThumbDir, os.path.basename(wallpaperFile) + ".thumbnail")))) + wpCurrentThumbnail = os.path.join(self.tmpThumbDir, os.path.basename(wallpaperFile) + ".thumbnail") + + if os.path.exists(wpCurrentThumbnail): + item.setPixmap(0,QPixmap(QImage(wpCurrentThumbnail))) + else: + item.setPixmap(0,QPixmap(QImage(locate("data", self.nonePic)))) if wallpaperFile in self.wallpaperList.keys(): if wallpaperFile in self.wideList.keys(): @@ -144,13 +148,16 @@ def setWps(self, wpFile, wpTitle): item = KListViewItem(self.listWallpaper, "file", str(wpFile)) item.setText(0,wpTitle) - item.setPixmap(0,QPixmap(QImage(os.path.join(self.tmpThumbDir, os.path.basename(wpFile) + ".thumbnail")))) + wpCurrentThumbnail = os.path.join(self.tmpThumbDir, os.path.basename(wpFile) + ".thumbnail") + + if os.path.exists(wpCurrentThumbnail): + item.setPixmap(0,QPixmap(QImage(wpCurrentThumbnail))) + else: + item.setPixmap(0,QPixmap(QImage(locate("data", self.nonePic)))) def resizeImages(self, resizeList): if current: resizeList[current] = self.currentText - else: - resizeList[self.nonePic] = self.noneText for infile in resizeList: tmpDir = os.path.join(self.tmpThumbDir, os.path.splitext(os.path.basename(infile))[0]) @@ -159,7 +166,6 @@ im.thumbnail(self.thumbSize, Image.NEAREST) im.save(tmpDir + ".jpg.thumbnail", "BMP") except IOError, e: - print "Error: ", e logging.debug("IO Error: " + str(e)) def showAllWallpapers(self): From uludag-commits at pardus.org.tr Thu May 8 01:56:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 01:56:03 +0300 (EEST) Subject: [Uludag-commits] r17980 - branches/kaptan3 Message-ID: <20080507225603.D5CE21384116@liste.pardus.org.tr> Author: pinar Date: Thu May 8 01:56:03 2008 New Revision: 17980 Modified: branches/kaptan3/setup.py Log: fix autostart problem Modified: branches/kaptan3/setup.py ================================================================= --- branches/kaptan3/setup.py (original) +++ branches/kaptan3/setup.py Thu May 8 01:56:03 2008 @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2005-2006, TUBITAK/UEKAE +# Copyright (C) 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 @@ -55,10 +55,10 @@ sys.exit(0) app_data = [ - 'src/kaptan.py', + ('/usr/kde/3.5/share/apps/kaptan', ['src/kaptan.py']), ('/usr/kde/3.5/share/icons/hicolor/128x128/apps', ['pics/cr128-app-kaptan.png']), ('/usr/kde/3.5/share/apps/kaptan/pics', ['pics/']), - 'src/kaptan.desktop', + ('/usr/kde/3.5/share/autostart/', ['src/kaptan.desktop']), ('/usr/kde/3.5/share/apps/kaptan/screens', ['src/screens']), ('/usr/kde/3.5/share/apps/kaptan/pics/themes', ['pics/themes/']), ('/usr/kde/3.5/share/apps/kaptan/pics/icons', ['pics/icons/']) From uludag-commits at pardus.org.tr Thu May 8 02:10:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 02:10:36 +0300 (EEST) Subject: [Uludag-commits] r17981 - trunk/comar/zorg/zorg Message-ID: <20080507231037.1CB1C1384092@liste.pardus.org.tr> Author: fatih Date: Thu May 8 02:10:36 2008 New Revision: 17981 Modified: trunk/comar/zorg/zorg/config.py Log: randr12 drivers don't need a modes line Modified: trunk/comar/zorg/zorg/config.py ================================================================= --- trunk/comar/zorg/zorg/config.py (original) +++ trunk/comar/zorg/zorg/config.py Thu May 8 02:10:36 2008 @@ -102,7 +102,7 @@ subsec = XorgSection("Display") subsec.set("Depth", atoi(card.depth)) - if "no-modes-line" not in flags: + if "no-modes-line" not in flags or "randr12" not in flags: output = card.active_outputs[0] if card.modes.has_key(output): subsec.set("Modes", card.modes[output], "800x600", "640x480") From uludag-commits at pardus.org.tr Thu May 8 02:10:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 02:10:40 +0300 (EEST) Subject: [Uludag-commits] r17982 - trunk/comar/zorg/data Message-ID: <20080507231040.F053E1384093@liste.pardus.org.tr> Author: fatih Date: Thu May 8 02:10:40 2008 New Revision: 17982 Modified: trunk/comar/zorg/data/DriversDB Log: prefer radeonhd over radeon for this X1600 Modified: trunk/comar/zorg/data/DriversDB ================================================================= --- trunk/comar/zorg/data/DriversDB (original) +++ trunk/comar/zorg/data/DriversDB Thu May 8 02:10:40 2008 @@ -344,7 +344,7 @@ 1002719f fglrx:ati-drivers radeon radeonhd 100271c0 fglrx:ati-drivers radeon radeonhd 100271c1 fglrx:ati-drivers radeon radeonhd -100271c2 fglrx:ati-drivers radeon radeonhd +100271c2 fglrx:ati-drivers radeonhd radeon 100271c3 fglrx:ati-drivers radeon radeonhd 100271c4 fglrx:ati-drivers radeon radeonhd 100271c5 fglrx:ati-drivers radeon radeonhd From uludag-commits at pardus.org.tr Thu May 8 02:10:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 02:10:44 +0300 (EEST) Subject: [Uludag-commits] r17983 - trunk/comar/zorg/data Message-ID: <20080507231044.A2BD8138407D@liste.pardus.org.tr> Author: fatih Date: Thu May 8 02:10:43 2008 New Revision: 17983 Modified: trunk/comar/zorg/data/DriversDB Log: Change package separator. Old one is not suitable for kernel cmdline. Modified: trunk/comar/zorg/data/DriversDB ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu May 8 02:10:49 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 02:10:49 +0300 (EEST) Subject: [Uludag-commits] r17984 - in trunk/comar/zorg: . zorg Message-ID: <20080507231049.D504D138408B@liste.pardus.org.tr> Author: fatih Date: Thu May 8 02:10:48 2008 New Revision: 17984 Added: trunk/comar/zorg/zorg/consts.py Modified: trunk/comar/zorg/zorg-cli trunk/comar/zorg/zorg/__init__.py trunk/comar/zorg/zorg/config.py trunk/comar/zorg/zorg/probe.py Log: Use kbd and mouse drivers instead of evdev Modified: trunk/comar/zorg/zorg-cli ================================================================= --- trunk/comar/zorg/zorg-cli (original) +++ trunk/comar/zorg/zorg-cli Thu May 8 02:10:48 2008 @@ -14,6 +14,7 @@ import dbus import zorg +from zorg.consts import package_sep zorg_info = " Xorg AutoConfiguration tool" @@ -71,11 +72,11 @@ help="use MODE given in form x[-] if supported") parser.add_option("-d", "--driver", action="store", type="string", - dest="driver", default=None, metavar="DRIVER[:PACKAGE]", + dest="driver", default=None, metavar="DRIVER[%sPACKAGE]" % package_sep, help="set video card driver to DRIVER") parser.add_option("-k", "--keymap", action="store", type="string", - dest="keymap", default=None, metavar="LAYOUT[,VARIANT]", + dest="keymap", default=None, metavar="LAYOUT[/VARIANT]", help="changes keyboard map") opts, args = parser.parse_args() @@ -90,7 +91,7 @@ if opts.mode: setMode(opts) elif opts.keymap: - layout, variant = opts.keymap.split(",", 1) if "," in opts.keymap else (opts.keymap, "") - link.setKeymap(layout, variant) + keymap = opts.keymap.split("/", 1) + link.setKeymap(*keymap) else: parser.print_help() Modified: trunk/comar/zorg/zorg/__init__.py ================================================================= --- trunk/comar/zorg/zorg/__init__.py (original) +++ trunk/comar/zorg/zorg/__init__.py Thu May 8 02:10:48 2008 @@ -13,6 +13,7 @@ __version__ = "0.94" __all__ = ["config", + "consts", "ddc", "modeline", "parser", Modified: trunk/comar/zorg/zorg/config.py ================================================================= --- trunk/comar/zorg/zorg/config.py (original) +++ trunk/comar/zorg/zorg/config.py Thu May 8 02:10:48 2008 @@ -4,14 +4,11 @@ import piksemel +from zorg.consts import * from zorg.parser import * from zorg.probe import VideoDevice, Monitor from zorg.utils import atoi -xorgConf = "/etc/X11/xorg.conf" -zorgConfigDir = "/var/lib/zorg" -zorgConfig = "config.xml" - def saveXorgConfig(card): parser = XorgParser() @@ -19,6 +16,8 @@ secdri = XorgSection("dri") secFiles = XorgSection("Files") secFlags = XorgSection("ServerFlags") + secKeyboard = XorgSection("InputDevice") + secMouse = XorgSection("InputDevice") secDevice = XorgSection("Device") secScr = XorgSection("Screen") secLay = XorgSection("ServerLayout") @@ -28,9 +27,11 @@ secdri, secFiles, secFlags, - secLay, + secKeyboard, + secMouse, + secDevice, secScr, - secDevice + secLay ] extmod = XorgSection("extmod") @@ -57,7 +58,6 @@ secFiles.add("FontPath", fontPath) secFlags.options = { - "AllowEmptyInput" : "true", "AllowMouseOpenFail" : "true", "BlankTime" : "0", "StandbyTime" : "0", @@ -65,6 +65,22 @@ "OffTime" : "0" } + secKeyboard.set("Identifier", "Keyboard") + secKeyboard.set("Driver", "kbd") + xkb_layout, xkb_variant = getKeymap() + secKeyboard.options = { + "CoreKeyboard" : "true", + "XkbModel" : "pc105", + "XkbLayout" : xkb_layout, + "XkbVariant" : xkb_variant + } + + secMouse.set("Identifier", "Mouse") + secMouse.set("Driver", "mouse") + secMouse.options = { + "CorePointer" : "true", + } + info = card.getDict() #secDevice.set("Screen", screenNumber) @@ -144,7 +160,7 @@ drvname = tag.firstChild().data() drvpackage = tag.getAttribute("package") if drvpackage != "xorg-video": - drvname += ":%s" % drvpackage + drvname += package_sep + drvpackage drivers.append(drvname) @@ -237,8 +253,8 @@ drivers = cardTag.insertTag("Drivers") for driver in card.driverlist: - if ":" in driver: - drv, pkg = driver.split(":", 1) + if package_sep in driver: + drv, pkg = driver.split(package_sep, 1) else: drv = driver pkg = "xorg-video" @@ -298,3 +314,64 @@ f = file(configFile, "w") f.write(doc.toPrettyString()) f.close() + +def getKeymap(): + layout = None + variant = "basic" + + configFile = os.path.join(zorgConfigDir, zorgConfig) + + try: + doc = piksemel.parse(configFile) + + keyboard = doc.getTag("Keyboard") + if keyboard: + layoutTag = keyboard.getTag("Layout") + if layoutTag: + layout = layoutTag.firstChild().data() + + variantTag = keyboard.getTag("Variant") + if variantTag: + variant = variantTag.firstChild().data() + + except OSError: + pass + + if not layout: + from pardus.localedata import languages + + try: + language = file("/etc/mudur/language").read().strip() + except IOError: + language = "en" + + if not languages.has_key(language): + language = "en" + + keymap = languages[language].keymaps[0] + layout = keymap.xkb_layout + variant = keymap.xkb_variant + + return layout, variant + +def saveKeymap(layout, variant="basic"): + if not os.path.exists(zorgConfigDir): + os.mkdir(zorgConfigDir, 0755) + + configFile = os.path.join(zorgConfigDir, zorgConfig) + + try: + doc = piksemel.parse(configFile) + except OSError: + doc = piksemel.newDocument("ZORG") + + keyboardTag = doc.getTag("Keyboard") + + if keyboardTag: + keyboardTag.hide() + + keyboardTag = doc.insertTag("Keyboard") + keyboardTag.insertTag("Layout").insertData(layout) + keyboardTag.insertTag("Variant").insertData(variant) + + file(configFile, "w").write(doc.toPrettyString()) Modified: trunk/comar/zorg/zorg/probe.py ================================================================= --- trunk/comar/zorg/zorg/probe.py (original) +++ trunk/comar/zorg/zorg/probe.py Thu May 8 02:10:48 2008 @@ -1,27 +1,14 @@ # -*- coding: utf-8 -*- import os -import re import dbus import struct +from zorg.consts import * from zorg.parser import * from zorg.utils import * from zorg import modeline -DriversDB = "/usr/lib/X11/DriversDB" -MonitorsDB = "/usr/lib/X11/MonitorsDB" - -driver_path = "/usr/lib/xorg/modules/drivers" -xkb_path = "/usr/share/X11/xkb/symbols" - -sysdir = "/sys/bus/pci/devices/" - -lcd_drivers = ["nv", "nvidia", "ati", "via", "i810", - "intel", "sis", "savage", "neomagic"] -truecolor_cards = ["i810", "intel", "nv", "radeon"] - - # from pci/header.h PCI_COMMAND = 0x04 PCI_COMMAND_IO = 0x1 @@ -106,8 +93,8 @@ self.driverlist = line.rstrip("\n").split(" ")[1:] for drv in self.driverlist: - if ":" in drv: - drvname, drvpackage = drv.split(":", 1) + if package_sep in drv: + drvname, drvpackage = drv.split(package_sep, 1) if drvpackage.replace("-", "_") in driverPackages: self.driver = drvname self.package = drvpackage @@ -143,8 +130,8 @@ self.package = "xorg-video" if withDriver: - if ":" in withDriver: - drvname, drvpackage = withDriver.split(":", 1) + if package_sep in withDriver: + drvname, drvpackage = withDriver.split(package_sep, 1) if drvpackage.replace("-", "_") in driverPackages: self.driver = drvname self.package = drvpackage From uludag-commits at pardus.org.tr Thu May 8 04:37:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 04:37:39 +0300 (EEST) Subject: [Uludag-commits] r17985 - branches/kaptan3/src/screens Message-ID: <20080508013739.45E2D13840DF@liste.pardus.org.tr> Author: pinar Date: Thu May 8 04:37:38 2008 New Revision: 17985 Modified: branches/kaptan3/src/screens/goodbyedlg.ui Log: screen resolution Modified: branches/kaptan3/src/screens/goodbyedlg.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu May 8 08:40:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 08:40:23 +0300 (EEST) Subject: [Uludag-commits] r17986 - trunk/comar/comar/etc Message-ID: <20080508054023.41A3A13840D7@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 08:40:22 2008 New Revision: 17986 Modified: trunk/comar/comar/etc/tr.org.pardus.comar.new.service trunk/comar/comar/etc/tr.org.pardus.comar.service Log: enable debug Modified: trunk/comar/comar/etc/tr.org.pardus.comar.new.service ================================================================= --- trunk/comar/comar/etc/tr.org.pardus.comar.new.service (original) +++ trunk/comar/comar/etc/tr.org.pardus.comar.new.service Thu May 8 08:40:22 2008 @@ -1,4 +1,4 @@ [D-BUS Service] Name=tr.org.pardus.comar.new -Exec=/usr/bin/comar --busname=tr.org.pardus.comar.new +Exec=/usr/bin/comar --busname=tr.org.pardus.comar.new --debug=all User=root Modified: trunk/comar/comar/etc/tr.org.pardus.comar.service ================================================================= --- trunk/comar/comar/etc/tr.org.pardus.comar.service (original) +++ trunk/comar/comar/etc/tr.org.pardus.comar.service Thu May 8 08:40:22 2008 @@ -1,4 +1,4 @@ [D-BUS Service] Name=tr.org.pardus.comar -Exec=/usr/bin/comar +Exec=/usr/bin/comar --debug=all User=root From uludag-commits at pardus.org.tr Thu May 8 08:40:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 08:40:59 +0300 (EEST) Subject: [Uludag-commits] r17987 - trunk/comar/mudur/bin Message-ID: <20080508054059.B109813840D7@liste.pardus.org.tr> Author: caglar Date: Thu May 8 08:40:59 2008 New Revision: 17987 Modified: trunk/comar/mudur/bin/mudur.py Log: fix /etc/modprobe.mudur usage, remove re-triggering udev events with plain trigger, its wrong Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Thu May 8 08:40:59 2008 @@ -681,16 +681,16 @@ if not os.path.exists("/proc/modules"): return + curkernel = os.uname()[2] + ui.info(_("Calculating module dependencies for %s" % curkernel)) + if os.path.exists("/etc/modprobe.mudur"): depkernel = loadFile("/etc/modprobe.mudur").rstrip("\n") - 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") + file("/etc/modprobe.mudur", "w").write("%s\n" % curkernel) fn = "/etc/modules.autoload.d/kernel-%s.%s.%s" % (config.kernel[0], config.kernel[1], config.kernel[2]) if not os.path.exists(fn): @@ -1060,15 +1060,9 @@ 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") + 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") From uludag-commits at pardus.org.tr Thu May 8 09:59:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 09:59:07 +0300 (EEST) Subject: [Uludag-commits] r17988 - branches/kaptan3/src/screens Message-ID: <20080508065907.ADA5F13840C3@liste.pardus.org.tr> Author: pinar Date: Thu May 8 09:59:07 2008 New Revision: 17988 Modified: branches/kaptan3/src/screens/ScrPackage.py branches/kaptan3/src/screens/addrepo.py Log: fix dbus problem Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Thu May 8 09:59:07 2008 @@ -63,22 +63,27 @@ def addRepo(self): try: - addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") - return + addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2") + return True except Exception, e: print e if e.get_dbus_name().endswith('policy.no'): print 'Access denied' - #pop up - return True + return False elif e.get_dbus_name().endswith('policy.auth_admin'): print 'Access denied, root password required' - addrepo.auth() + authResult = addrepo.auth() + elif e.get_dbus_name().endswith('policy.auth_user'): print 'Access denied, user password required' - addrepo.auth() + authResult = addrepo.auth() + else: + return False try: - addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + if authResult: + addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + else: + return False except: return False Modified: branches/kaptan3/src/screens/addrepo.py ================================================================= --- branches/kaptan3/src/screens/addrepo.py (original) +++ branches/kaptan3/src/screens/addrepo.py Thu May 8 09:59:07 2008 @@ -14,7 +14,9 @@ obj = bus.get_object("org.freedesktop.PolicyKit.AuthenticationAgent", "/") try: - auths = obj.obtainAuthorization("tr.org.pardus.comar.addrepository", 0, os.getpid(), dbus_interface="org.freedesktop.PolicyKit.AuthenticationAgent") + auths = obj.ObtainAuthorization("tr.org.pardus.comar.system.manager.addrepository", 0, os.getpid(), dbus_interface="org.freedesktop.PolicyKit.AuthenticationAgent") + return auths except Exception, e: print e + return False From uludag-commits at pardus.org.tr Thu May 8 10:01:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:01:20 +0300 (EEST) Subject: [Uludag-commits] r17989 - trunk/tasma/package-manager Message-ID: <20080508070121.00E6C13840C3@liste.pardus.org.tr> Author: faik Date: Thu May 8 10:01:20 2008 New Revision: 17989 Modified: trunk/tasma/package-manager/setup.py Log: add new files Modified: trunk/tasma/package-manager/setup.py ================================================================= --- trunk/tasma/package-manager/setup.py (original) +++ trunk/tasma/package-manager/setup.py Thu May 8 10:01:20 2008 @@ -46,6 +46,8 @@ 'src/Debug.py', 'src/SpecialList.py', 'src/Component.py', + 'src/PisiIface.py', + 'src/handler.py', # ui files 'src/ProgressDialog.ui', From uludag-commits at pardus.org.tr Thu May 8 10:06:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:06:34 +0300 (EEST) Subject: [Uludag-commits] r17990 - in branches/yali4/yali4: . gui Message-ID: <20080508070634.59E5513840D1@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 10:06:34 2008 New Revision: 17990 Modified: branches/yali4/yali4/constants.py branches/yali4/yali4/gui/ScrGoodbye.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/installer.py Log: * Refucktoring.. FirstBoot stuff.. Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Thu May 8 10:06:34 2008 @@ -15,6 +15,7 @@ import locale from os.path import join +from yali4.options import options class _constant: """ Constant members implementation """ @@ -54,8 +55,11 @@ consts.mnt_dir = "/mnt" -# new system will be installed directly into this target directory -consts.target_dir = join(consts.mnt_dir, "target") +if options.firstBoot == True: + consts.target_dir = "/" +else: + # new system will be installed directly into this target directory + consts.target_dir = join(consts.mnt_dir, "target") # log file for storing after installation consts.log_file = join(consts.target_dir,"var/log/yaliInstall.log") Modified: branches/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- branches/yali4/yali4/gui/ScrGoodbye.py (original) +++ branches/yali4/yali4/gui/ScrGoodbye.py Thu May 8 10:06:34 2008 @@ -37,6 +37,8 @@ from yali4.gui.Ui.goodbyewidget import Ui_GoodByeWidget import yali4.gui.context as ctx +YALI_INSTALL, YALI_FIRSTBOOT, YALI_OEMINSTALL, YALI_PARTITIONER = range(4) + ## # Goodbye screen class Widget(QtGui.QWidget, ScreenWidget): @@ -68,21 +70,21 @@ def shown(self): ctx.mainScreen.disableBack() - self.processPendingActions() + ctx.yali.processPendingActions(self) self.steps.slotRunOperations() def execute(self): ctx.mainScreen.disableNext() - ctx.yali.info.updateAndShow(_('Rebooting system. Please wait!')) - try: - ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir + "/home")) - yali4.sysutils.umount(ctx.consts.target_dir + "/home") - ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir)) - yali4.sysutils.umount(ctx.consts.target_dir) - except: - ctx.debugger.log("Umount Failed.") - pass + if not ctx.yali.install_type == YALI_FIRSTBOOT: + try: + ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir + "/home")) + yali4.sysutils.umount(ctx.consts.target_dir + "/home") + ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir)) + yali4.sysutils.umount(ctx.consts.target_dir) + except: + ctx.debugger.log("Umount Failed.") + pass w = RebootWidget(self) @@ -90,10 +92,12 @@ self.dialog = WarningDialog(w, self) self.dialog.exec_() ctx.mainScreen.processEvents() + ctx.yali.info.updateAndShow(_('Rebooting system. Please wait!')) # remove cd... - ctx.debugger.log("Trying to eject the CD.") - yali4.sysutils.eject_cdrom() + if not ctx.yali.install_type == YALI_FIRSTBOOT: + ctx.debugger.log("Trying to eject the CD.") + yali4.sysutils.eject_cdrom() ctx.debugger.log("Yali, fastreboot calling..") @@ -105,120 +109,6 @@ time.sleep(4) yali4.sysutils.fastreboot() - # 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="unix:path=%s" % ctx.consts.dbus_socket_file) - break - except dbus.DBusException: - time.sleep(1) - ctx.debugger.log("wait dbus for 1 second...") - if bus: - return True - return False - - def setHostName(): - global bus - obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - 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 - - def addUsers(): - global bus - 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) - obj.addUser("auto", u.username, u.realname, "", "", unicode(u.passwd), u.groups, dbus_interface="tr.org.pardus.comar.User.Manager") - # Enable auto-login - if u.username == ctx.installData.autoLoginUser: - u.setAutoLogin() - return True - - def setRootPassword(): - if not ctx.installData.useYaliFirstBoot: - global bus - obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - obj.setUser(0, "", "", "", str(ctx.installData.rootPassword), "", dbus_interface="tr.org.pardus.comar.User.Manager") - return True - - def writeConsoleData(): - yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) - ctx.debugger.log("Keymap stored.") - return True - - def migrateXorgConf(): - yali4.postinstall.migrate_xorg() - ctx.debugger.log("xorg.conf and other files merged.") - return True - - def setPackages(): - global bus - if yali4.sysutils.checkYaliParams(param=ctx.consts.oemInstallParam): - ctx.debugger.log("OemInstall selected.") - obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") - obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") - obj = bus.get_object("tr.org.pardus.comar", "/package/yali_firstBoot") - obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") - return True - - 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}, - {"text":"Adding Users...","operation":addUsers}, - {"text":"Writing Console Data...","operation":writeConsoleData}, - {"text":"Migrating X.org Configuration...","operation":migrateXorgConf}, - {"text":"Setting misc. package configurations...","operation":setPackages}, - {"text":"Installing BootLoader...","operation":self.installBootloader}] - - self.steps.setOperations(steps) - - def installBootloader(self): - if not ctx.installData.bootLoaderDev: - ctx.debugger.log("Dont install bootloader selected; skipping.") - return - - loader = yali4.bootloader.BootLoader() - root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, - partrequest.mountRequestType) - _ins_part = root_part_req.partition().getPath() - _ins_part_label = root_part_req.partition().getFSLabel() - - loader.write_grub_conf(_ins_part, ctx.installData.bootLoaderDev, _ins_part_label) - - # Check for windows partitions. - ctx.debugger.log("Checking for Windows ...") - for d in yali4.storage.devices: - for p in d.getPartitions(): - fs = p.getFSName() - if fs in ("ntfs", "fat32"): - if is_windows_boot(p.getPath(), fs): - ctx.debugger.log("Windows Found on device %s partition %s " % (p.getDevicePath(), p.getPath())) - win_fs = fs - win_dev = basename(p.getDevicePath()) - win_root = basename(p.getPath()) - loader.grub_conf_append_win(ctx.installData.bootLoaderDev, - win_dev, - win_root, - win_fs) - continue - - try: - ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir + "/mnt/archive")) - yali4.sysutils.umount(ctx.consts.target_dir + "/mnt/archive") - except: - ctx.debugger.log("Umount Failed ") - - # finally install it - return loader.install_grub(ctx.installData.bootLoaderDev) - class RebootWidget(QtGui.QWidget): def __init__(self, *args): Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Thu May 8 10:06:34 2008 @@ -70,6 +70,7 @@ # Let start ctx.debugger.log("Yali has been started.") + ctx.debugger.log("Install type is %d" % ctx.yali.install_type) # font = QtGui.QFont() # font.setFamily("Droid Sans") Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 10:06:34 2008 @@ -12,6 +12,7 @@ # linux ? import os +import dbus import time # we need i18n @@ -346,6 +347,126 @@ fstab.insert(e) fstab.close() + def processPendingActions(self, rootWidget): + 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="unix:path=%s" % ctx.consts.dbus_socket_file) + break + except dbus.DBusException: + time.sleep(1) + ctx.debugger.log("wait dbus for 1 second...") + if bus: + return True + return False + + def setHostName(): + global bus + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + 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 + + def addUsers(): + global bus + 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) + obj.addUser("auto", u.username, u.realname, "", "", unicode(u.passwd), u.groups, dbus_interface="tr.org.pardus.comar.User.Manager") + # Enable auto-login + if u.username == ctx.installData.autoLoginUser: + u.setAutoLogin() + return True + + def setRootPassword(): + if not ctx.installData.useYaliFirstBoot: + global bus + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + obj.setUser(0, "", "", "", str(ctx.installData.rootPassword), "", dbus_interface="tr.org.pardus.comar.User.Manager") + return True + + def writeConsoleData(): + yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) + ctx.debugger.log("Keymap stored.") + return True + + def migrateXorgConf(): + if not self.install_type == YALI_FIRSTBOOT: + yali4.postinstall.migrate_xorg() + ctx.debugger.log("xorg.conf and other files merged.") + return True + + def setPackages(): + global bus + if self.install_type == YALI_OEMINSTALL: + ctx.debugger.log("OemInstall selected.") + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + elif self.install_type == YALI_FIRSTBOOT: + ctx.debugger.log("FirstBoot selected.") + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + return True + + 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}, + {"text":"Adding Users...","operation":addUsers}, + {"text":"Writing Console Data...","operation":writeConsoleData}, + {"text":"Migrating X.org Configuration...","operation":migrateXorgConf}, + {"text":"Setting misc. package configurations...","operation":setPackages}, + {"text":"Installing BootLoader...","operation":self.installBootloader}] + + rootWidget.steps.setOperations(steps) + + def installBootloader(self): + if not ctx.installData.bootLoaderDev: + ctx.debugger.log("Dont install bootloader selected; skipping.") + return + + loader = yali4.bootloader.BootLoader() + root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, + request.mountRequestType) + _ins_part = root_part_req.partition().getPath() + _ins_part_label = root_part_req.partition().getFSLabel() + + loader.write_grub_conf(_ins_part, ctx.installData.bootLoaderDev, _ins_part_label) + + # Check for windows partitions. + ctx.debugger.log("Checking for Windows ...") + for d in yali4.storage.devices: + for p in d.getPartitions(): + fs = p.getFSName() + if fs in ("ntfs", "fat32"): + if yali4.sysutils.is_windows_boot(p.getPath(), fs): + ctx.debugger.log("Windows Found on device %s partition %s " % (p.getDevicePath(), p.getPath())) + win_fs = fs + win_dev = basename(p.getDevicePath()) + win_root = basename(p.getPath()) + loader.grub_conf_append_win(ctx.installData.bootLoaderDev, + win_dev, + win_root, + win_fs) + continue + + try: + ctx.debugger.log("Trying to umount %s" % (ctx.consts.target_dir + "/mnt/archive")) + yali4.sysutils.umount(ctx.consts.target_dir + "/mnt/archive") + except: + ctx.debugger.log("Umount Failed ") + + # finally install it + return loader.install_grub(ctx.installData.bootLoaderDev) + def showError(self, title, message): r = ErrorWidget(self) r.label.setText(message) From uludag-commits at pardus.org.tr Thu May 8 10:28:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:28:12 +0300 (EEST) Subject: [Uludag-commits] r17991 - trunk/comar/comar/etc Message-ID: <20080508072812.A661913840D8@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 10:28:12 2008 New Revision: 17991 Added: trunk/comar/comar/etc/comar2.conf trunk/comar/comar/etc/tr.org.pardus.comar2.service - copied, changed from r17986, trunk/comar/comar/etc/tr.org.pardus.comar.new.service Removed: trunk/comar/comar/etc/tr.org.pardus.comar.new.service Modified: trunk/comar/comar/etc/comar.conf Log: comar.new -> comar2 Modified: trunk/comar/comar/etc/comar.conf ================================================================= --- trunk/comar/comar/etc/comar.conf (original) +++ trunk/comar/comar/etc/comar.conf Thu May 8 10:28:12 2008 @@ -5,6 +5,5 @@ - Copied: trunk/comar/comar/etc/tr.org.pardus.comar2.service (from r17986, trunk/comar/comar/etc/tr.org.pardus.comar.new.service) ================================================================= --- trunk/comar/comar/etc/tr.org.pardus.comar.new.service (original) +++ trunk/comar/comar/etc/tr.org.pardus.comar2.service Thu May 8 10:28:12 2008 @@ -1,4 +1,4 @@ [D-BUS Service] -Name=tr.org.pardus.comar.new -Exec=/usr/bin/comar --busname=tr.org.pardus.comar.new --debug=all +Name=tr.org.pardus.comar2 +Exec=/usr/bin/comar --busname=tr.org.pardus.comar2 --debug=all User=root From uludag-commits at pardus.org.tr Thu May 8 10:28:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:28:40 +0300 (EEST) Subject: [Uludag-commits] r17992 - branches/kaptan3/src/screens Message-ID: <20080508072840.977A713840DB@liste.pardus.org.tr> Author: pinar Date: Thu May 8 10:28:40 2008 New Revision: 17992 Modified: branches/kaptan3/src/screens/ScrGoodbye.py branches/kaptan3/src/screens/ScrPackage.py branches/kaptan3/src/screens/addrepo.py Log: add remove repo Modified: branches/kaptan3/src/screens/ScrGoodbye.py ================================================================= --- branches/kaptan3/src/screens/ScrGoodbye.py (original) +++ branches/kaptan3/src/screens/ScrGoodbye.py Thu May 8 10:28:40 2008 @@ -39,7 +39,7 @@ self.picMigration.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/migration.png"))) self.picTasma.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/tasma.png"))) - self.picFeedback.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/feedback.png"))) + #self.picFeedback.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/feedback.png"))) self.picHelp.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/user_groups.png"))) # set background image Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Thu May 8 10:28:40 2008 @@ -59,7 +59,13 @@ self.showTray.connect(self.showTray, SIGNAL("toggled(bool)"), self.enableCheckTime) self.checkUpdate.connect(self.checkUpdate, SIGNAL("toggled(bool)"), self.updateSelected) - self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.addRepo) + self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.slotContribRepo) + + def slotContribRepo(self): + if self.checkBoxContrib.isChecked(): + self.addRepo() + else: + self.removeRepo() def addRepo(self): try: @@ -72,11 +78,11 @@ return False elif e.get_dbus_name().endswith('policy.auth_admin'): print 'Access denied, root password required' - authResult = addrepo.auth() + authResult = addrepo.auth("addrepository") elif e.get_dbus_name().endswith('policy.auth_user'): print 'Access denied, user password required' - authResult = addrepo.auth() + authResult = addrepo.auth("addrepository") else: return False try: @@ -87,6 +93,32 @@ except: return False + def removeRepo(self): + try: + addrepo.removeRepo("contrib") + return True + except Exception, e: + print e + if e.get_dbus_name().endswith('policy.no'): + print 'Access denied' + return False + elif e.get_dbus_name().endswith('policy.auth_admin'): + print 'Access denied, root password required' + authResult = addrepo.auth("removerepository") + + elif e.get_dbus_name().endswith('policy.auth_user'): + print 'Access denied, user password required' + authResult = addrepo.auth("removerepository") + else: + return False + try: + if authResult: + addrepo.removeRepo("contrib") + else: + return False + except: + return False + def enableCheckTime(self): if self.showTray.isOn(): self.checkUpdate.setEnabled(True) Modified: branches/kaptan3/src/screens/addrepo.py ================================================================= --- branches/kaptan3/src/screens/addrepo.py (original) +++ branches/kaptan3/src/screens/addrepo.py Thu May 8 10:28:40 2008 @@ -9,12 +9,17 @@ obj = bus.get_object("tr.org.pardus.comar", "/package/pisi") obj.addRepository(name, uri, dbus_interface="tr.org.pardus.comar.System.Manager") -def auth(): +def removeRepo(name): + bus = dbus.SystemBus() + obj = bus.get_object("tr.org.pardus.comar", "/package/pisi") + obj.removeRepository(name, dbus_interface="tr.org.pardus.comar.System.Manager") + +def auth(action): bus = dbus.SessionBus() obj = bus.get_object("org.freedesktop.PolicyKit.AuthenticationAgent", "/") try: - auths = obj.ObtainAuthorization("tr.org.pardus.comar.system.manager.addrepository", 0, os.getpid(), dbus_interface="org.freedesktop.PolicyKit.AuthenticationAgent") + auths = obj.ObtainAuthorization("tr.org.pardus.comar.system.manager." + action, 0, os.getpid(), dbus_interface="org.freedesktop.PolicyKit.AuthenticationAgent") return auths except Exception, e: print e From uludag-commits at pardus.org.tr Thu May 8 10:31:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:31:29 +0300 (EEST) Subject: [Uludag-commits] r17993 - trunk/comar/comar Message-ID: <20080508073129.7552E13840BB@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 10:31:29 2008 New Revision: 17993 Modified: trunk/comar/comar/CMakeLists.txt Log: new alpha Modified: trunk/comar/comar/CMakeLists.txt ================================================================= --- trunk/comar/comar/CMakeLists.txt (original) +++ trunk/comar/comar/CMakeLists.txt Thu May 8 10:31:29 2008 @@ -10,7 +10,7 @@ SET (VERSION_PATCH "0") # Uncomment this for production releases. -SET (VERSION_SUFFIX "alpha3") +SET (VERSION_SUFFIX "alpha4") SET (FLAGS "-g -O0 -Werror -Wcast-align -Wno-uninitialized -Wall -fstrict-aliasing") # Uncomment this for gprof profiling From uludag-commits at pardus.org.tr Thu May 8 10:35:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:35:00 +0300 (EEST) Subject: [Uludag-commits] r17994 - trunk/tasma/package-manager/src Message-ID: <20080508073500.4FB6013840BB@liste.pardus.org.tr> Author: faik Date: Thu May 8 10:34:59 2008 New Revision: 17994 Modified: trunk/tasma/package-manager/src/Commander.py Log: do not try to get component info for every signal Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Thu May 8 10:34:59 2008 @@ -47,7 +47,7 @@ self.parent.displayProgress(data) elif signal == "error": self.comar.com_lock.unlock() - self.parent.showErrorMessage(args) + self.parent.showErrorMessage(str(args)) self.parent.resetState() self.parent.refreshState() elif signal == "status": @@ -55,7 +55,7 @@ self.parent.pisiNotify(operation, args) elif signal == "warning": self.comar.com_lock.unlock() - self.parent.showWarningMessage(args) + self.parent.showWarningMessage(str(args)) self.parent.resetState() self.parent.refreshState() else: @@ -66,10 +66,6 @@ # # if not reply.id == ID_TRAY_INTERVAL_CHECK: # # self.parent.showErrorMessage(unicode(reply.data)) - # if an error occured communicating with comar and components are not ready we should warn - if not PisiIface.get_components(): - self.parent.repoNotReady() - def startUpdate(self, repo = None): if repo is None: #FIXME: track id... anything needs to be added here? From uludag-commits at pardus.org.tr Thu May 8 10:35:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:35:27 +0300 (EEST) Subject: [Uludag-commits] r17995 - trunk/comar/comar Message-ID: <20080508073527.CD71813840BC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 10:35:27 2008 New Revision: 17995 Modified: trunk/comar/comar/CMakeLists.txt Log: comar.new -> comar2 Modified: trunk/comar/comar/CMakeLists.txt ================================================================= --- trunk/comar/comar/CMakeLists.txt (original) +++ trunk/comar/comar/CMakeLists.txt Thu May 8 10:35:27 2008 @@ -103,7 +103,7 @@ # Install comar service activation under /usr/share/dbus-1/system-services/ INSTALL (FILES etc/tr.org.pardus.comar.service - etc/tr.org.pardus.comar.new.service + etc/tr.org.pardus.comar2.service DESTINATION /usr/share/dbus-1/system-services/) # Install PK policies From uludag-commits at pardus.org.tr Thu May 8 10:38:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:38:58 +0300 (EEST) Subject: [Uludag-commits] r17996 - trunk/pisi/pisi Message-ID: <20080508073858.73D0D13840BD@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 10:38:58 2008 New Revision: 17996 Modified: trunk/pisi/pisi/comariface.py Log: new dbus address is tr.org.pardus.comar2 Modified: trunk/pisi/pisi/comariface.py ================================================================= --- trunk/pisi/pisi/comariface.py (original) +++ trunk/pisi/pisi/comariface.py Thu May 8 10:38:58 2008 @@ -139,7 +139,7 @@ raise Error, _("Script error: %s") % exception if package_name == 'comar': - pisi.api.set_comar_destination('tr.org.pardus.comar.new') + pisi.api.set_comar_destination('tr.org.pardus.comar2') def pre_remove(package_name, metapath, filepath): """Do package's pre removal operations""" From uludag-commits at pardus.org.tr Thu May 8 10:41:22 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:41:22 +0300 (EEST) Subject: [Uludag-commits] r17997 - trunk/pisi/pisi/db Message-ID: <20080508074122.A698713840BD@liste.pardus.org.tr> Author: faik Date: Thu May 8 10:41:22 2008 New Revision: 17997 Modified: trunk/pisi/pisi/db/repodb.py Log: Raise a meaningful exception. Modified: trunk/pisi/pisi/db/repodb.py ================================================================= --- trunk/pisi/pisi/db/repodb.py (original) +++ trunk/pisi/pisi/db/repodb.py Thu May 8 10:41:22 2008 @@ -21,6 +21,9 @@ import pisi.context as ctx import pisi.db.lazydb as lazydb +class RepoError(pisi.Error): + pass + class Repo: def __init__(self, indexuri): self.indexuri = indexuri @@ -40,7 +43,7 @@ repo_node = node.appendTag("Repo") except IndexError: repo_node = repo_doc.insertTag("Repo") - + name_node = repo_node.insertTag("Name") name_node.insertData(repo_name) @@ -81,7 +84,7 @@ if not os.path.exists(repos_file): return piksemel.newDocument("REPOS") return piksemel.parse(repos_file) - + def _get_repos(self): repo_doc = self._get_doc() order = {} @@ -109,8 +112,11 @@ if index_path.endswith("bz2"): index_path = index_path.split(".bz2")[0] - return piksemel.parse(index_path) - + try: + return piksemel.parse(index_path) + except Exception, e: + raise RepoError("Error parsing repository index information. Index file does not exist or is malformed.") + def get_repo(self, repo): return Repo(pisi.uri.URI(self.get_repo_url(repo))) From uludag-commits at pardus.org.tr Thu May 8 10:43:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:43:08 +0300 (EEST) Subject: [Uludag-commits] r17998 - branches/kaptan3/src/screens Message-ID: <20080508074309.152E713840BD@liste.pardus.org.tr> Author: pinar Date: Thu May 8 10:43:08 2008 New Revision: 17998 Added: branches/kaptan3/src/screens/contribrepo.py Removed: branches/kaptan3/src/screens/addrepo.py Modified: branches/kaptan3/src/screens/ScrPackage.py Log: rename addrepo -> contribrepo Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Thu May 8 10:43:08 2008 @@ -15,7 +15,7 @@ from kdeui import * import kdedesigner -import addrepo +import contribrepo from screens.Screen import ScreenWidget from screens.packagedlg import PackageWidget @@ -69,7 +69,7 @@ def addRepo(self): try: - addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2") + contribrepo.addRepo("contrib", "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2") return True except Exception, e: print e @@ -78,16 +78,16 @@ return False elif e.get_dbus_name().endswith('policy.auth_admin'): print 'Access denied, root password required' - authResult = addrepo.auth("addrepository") + authResult = contribrepo.auth("addrepository") elif e.get_dbus_name().endswith('policy.auth_user'): print 'Access denied, user password required' - authResult = addrepo.auth("addrepository") + authResult = contribrepo.auth("addrepository") else: return False try: if authResult: - addrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + contribrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") else: return False except: @@ -95,7 +95,7 @@ def removeRepo(self): try: - addrepo.removeRepo("contrib") + contribrepo.removeRepo("contrib") return True except Exception, e: print e @@ -104,16 +104,16 @@ return False elif e.get_dbus_name().endswith('policy.auth_admin'): print 'Access denied, root password required' - authResult = addrepo.auth("removerepository") + authResult = contribrepo.auth("removerepository") elif e.get_dbus_name().endswith('policy.auth_user'): print 'Access denied, user password required' - authResult = addrepo.auth("removerepository") + authResult = contribrepo.auth("removerepository") else: return False try: if authResult: - addrepo.removeRepo("contrib") + contribrepo.removeRepo("contrib") else: return False except: From uludag-commits at pardus.org.tr Thu May 8 10:43:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:43:27 +0300 (EEST) Subject: [Uludag-commits] r17999 - trunk/comar/comar Message-ID: <20080508074328.0D5B113840BD@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 10:43:27 2008 New Revision: 17999 Modified: trunk/comar/comar/CMakeLists.txt Log: install comar2.conf Modified: trunk/comar/comar/CMakeLists.txt ================================================================= --- trunk/comar/comar/CMakeLists.txt (original) +++ trunk/comar/comar/CMakeLists.txt Thu May 8 10:43:27 2008 @@ -97,6 +97,7 @@ # Install comar system bus configuration under /etc/dbus-1/system.d/ INSTALL (FILES etc/comar.conf + etc/comar2.conf DESTINATION /etc/dbus-1/system.d RENAME ${APP_NAME}.conf) From uludag-commits at pardus.org.tr Thu May 8 10:59:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 10:59:54 +0300 (EEST) Subject: [Uludag-commits] r18000 - branches/yali4/yali4 Message-ID: <20080508075954.19ED813840DF@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 10:59:53 2008 New Revision: 18000 Modified: branches/yali4/yali4/installer.py Log: * If OemInstall selected dont try to set user,host or root pass... Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 10:59:53 2008 @@ -422,11 +422,15 @@ {"text":"Setting Root Password...","operation":setRootPassword}, {"text":"Adding Users...","operation":addUsers}, {"text":"Writing Console Data...","operation":writeConsoleData}, - {"text":"Migrating X.org Configuration...","operation":migrateXorgConf}, - {"text":"Setting misc. package configurations...","operation":setPackages}, - {"text":"Installing BootLoader...","operation":self.installBootloader}] + {"text":"Migrating X.org Configuration...","operation":migrateXorgConf}] - rootWidget.steps.setOperations(steps) + stepsBase = [{"text":"Setting misc. package configurations...","operation":setPackages}, + {"text":"Installing BootLoader...","operation":self.installBootloader}] + + if self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: + rootWidget.steps.setOperations(steps.extend(stepsBase)) + elif self.install_type == YALI_OEMINSTALL: + rootWidget.steps.setOperations(stepsBase)) def installBootloader(self): if not ctx.installData.bootLoaderDev: From uludag-commits at pardus.org.tr Thu May 8 11:03:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 11:03:47 +0300 (EEST) Subject: [Uludag-commits] r18001 - branches/yali4/yali4 Message-ID: <20080508080347.405C913840DF@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 11:03:46 2008 New Revision: 18001 Modified: branches/yali4/yali4/installer.py Log: * ohom. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 11:03:46 2008 @@ -430,7 +430,7 @@ if self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: rootWidget.steps.setOperations(steps.extend(stepsBase)) elif self.install_type == YALI_OEMINSTALL: - rootWidget.steps.setOperations(stepsBase)) + rootWidget.steps.setOperations(stepsBase) def installBootloader(self): if not ctx.installData.bootLoaderDev: From uludag-commits at pardus.org.tr Thu May 8 11:31:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 11:31:28 +0300 (EEST) Subject: [Uludag-commits] r18002 - trunk/tasma/package-manager/src Message-ID: <20080508083128.3DC7F13840DF@liste.pardus.org.tr> Author: faik Date: Thu May 8 11:31:28 2008 New Revision: 18002 Modified: trunk/tasma/package-manager/src/MainWidget.py Log: nop for setCache and clearCache after finished return after setRepositories finished... repo is not ready until updaterepos finished Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Thu May 8 11:31:28 2008 @@ -41,6 +41,7 @@ import PisiIface (install_state, remove_state, upgrade_state) = range(3) +nop = ["System.Manager.setCache", "System.Manager.clearCache"] unremovable_packages = set(['qt','kdelibs','kdebase','sip','PyQt','PyKDE','pisi', 'package-manager']) @@ -661,7 +662,10 @@ # when pisi db version is upgraded, reload is needed before init packages = self.basket.packages + self.basket.extraPackages print "in finished(): command=%s" % command -# if command == "System.Manager.updatePackage" and "pisi" in packages: + + if command in nop: + return + #FIXME: Why do we need to reload pisi module every time. Added for not updating mem cached dbs of pisi PisiIface.reloadPisi() @@ -682,6 +686,7 @@ elif command == "System.Manager.setRepositories": self.updateCheck() + return elif command in ["System.Manager.updatePackage", "System.Manager.installPackage", From uludag-commits at pardus.org.tr Thu May 8 11:43:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 11:43:11 +0300 (EEST) Subject: [Uludag-commits] r18003 - branches/kaptan3/po Message-ID: <20080508084311.8CA5713840DF@liste.pardus.org.tr> Author: necmettin Date: Thu May 8 11:43:11 2008 New Revision: 18003 Modified: branches/kaptan3/po/tr.po Log: Turkish translation Modified: branches/kaptan3/po/tr.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu May 8 11:54:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 11:54:01 +0300 (EEST) Subject: [Uludag-commits] r18004 - branches/yali4/yali4 Message-ID: <20080508085401.332F213840DF@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 11:54:00 2008 New Revision: 18004 Modified: branches/yali4/yali4/installer.py Log: * Handle package installed or not. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 11:54:00 2008 @@ -404,20 +404,29 @@ global bus if self.install_type == YALI_OEMINSTALL: ctx.debugger.log("OemInstall selected.") - obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") - obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") - obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") - obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + try: + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + except: + ctx.debugger.log("Dbus error: package doesnt exist !") + return False elif self.install_type == YALI_FIRSTBOOT: ctx.debugger.log("FirstBoot selected.") - obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") - obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") - obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") - obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + try: + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4_firstBoot") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + except: + ctx.debugger.log("Dbus error: package doesnt exist !") + return False return True - steps = [{"text":"Trying to connect DBUS...","operation":connectToDBus}, - {"text":"Setting Hostname...","operation":setHostName}, + rootWidget.steps.setOperations([{"text":"Trying to connect DBUS...","operation":connectToDBus}]) + + steps = [{"text":"Setting Hostname...","operation":setHostName}, {"text":"Setting TimeZone...","operation":yali4.postinstall.setTimeZone}, {"text":"Setting Root Password...","operation":setRootPassword}, {"text":"Adding Users...","operation":addUsers}, @@ -428,9 +437,9 @@ {"text":"Installing BootLoader...","operation":self.installBootloader}] if self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: - rootWidget.steps.setOperations(steps.extend(stepsBase)) - elif self.install_type == YALI_OEMINSTALL: - rootWidget.steps.setOperations(stepsBase) + rootWidget.steps.setOperations(steps) + + rootWidget.steps.setOperations(stepsBase) def installBootloader(self): if not ctx.installData.bootLoaderDev: From uludag-commits at pardus.org.tr Thu May 8 12:03:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:03:04 +0300 (EEST) Subject: [Uludag-commits] r18005 - trunk/tasma/package-manager/src Message-ID: <20080508090304.C3D3913840DF@liste.pardus.org.tr> Author: faik Date: Thu May 8 12:03:04 2008 New Revision: 18005 Modified: trunk/tasma/package-manager/src/Commander.py Log: show internal pisi warning and errors in console (kmessagebox freezes... may be from qt-dbus-mainloop) Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Thu May 8 12:03:04 2008 @@ -47,7 +47,8 @@ self.parent.displayProgress(data) elif signal == "error": self.comar.com_lock.unlock() - self.parent.showErrorMessage(str(args)) + print "Error: ", str(data) +# self.parent.showErrorMessage(str(args)) self.parent.resetState() self.parent.refreshState() elif signal == "status": @@ -55,7 +56,8 @@ self.parent.pisiNotify(operation, args) elif signal == "warning": self.comar.com_lock.unlock() - self.parent.showWarningMessage(str(args)) +# self.parent.showWarningMessage(str(args)) + print "Warning: ", str(data) self.parent.resetState() self.parent.refreshState() else: From uludag-commits at pardus.org.tr Thu May 8 12:19:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:19:42 +0300 (EEST) Subject: [Uludag-commits] r18006 - in branches/yali4: po yali4/gui Message-ID: <20080508091942.D07D213840DD@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 12:19:42 2008 New Revision: 18006 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/gui/ScrInstall.py Log: * Po update. 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/gui/ScrInstall.py ================================================================= --- branches/yali4/yali4/gui/ScrInstall.py (original) +++ branches/yali4/yali4/gui/ScrInstall.py Thu May 8 12:19:42 2008 @@ -161,7 +161,7 @@ # run dbus in chroot yali4.sysutils.chroot_dbus() - ctx.yali.info.updateMessage(_("Configuring packages for your system!"), True) + ctx.yali.info.updateMessage(_("Configuring packages.."), True) # start configurator thread self.pkg_configurator = PkgConfigurator(self) From uludag-commits at pardus.org.tr Thu May 8 12:22:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:22:40 +0300 (EEST) Subject: [Uludag-commits] r18007 - branches/tasma-dbus/network-manager Message-ID: <20080508092240.4F38F13840DC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 12:22:40 2008 New Revision: 18007 Modified: branches/tasma-dbus/network-manager/comariface.py Log: fix KMessageBox.error arguments Modified: branches/tasma-dbus/network-manager/comariface.py ================================================================= --- branches/tasma-dbus/network-manager/comariface.py (original) +++ branches/tasma-dbus/network-manager/comariface.py Thu May 8 12:22:40 2008 @@ -224,7 +224,7 @@ self.error(exception) def error(self, exception): - KMessageBox.error(self, str(exception), i18n("COMAR Error")) + KMessageBox.error(None, str(exception), i18n("COMAR Error")) def errorDBus(self, exception): if self.dia: From uludag-commits at pardus.org.tr Thu May 8 12:29:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:29:57 +0300 (EEST) Subject: [Uludag-commits] r18008 - trunk/tasma/package-manager/src Message-ID: <20080508092957.EA26413840DC@liste.pardus.org.tr> Author: faik Date: Thu May 8 12:29:57 2008 New Revision: 18008 Modified: trunk/tasma/package-manager/src/package-manager.py Log: not used here Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Thu May 8 12:29:57 2008 @@ -32,7 +32,6 @@ description = I18N_NOOP("GUI for PiSi package manager") version = "1.2" -nop = ["System.Manager.setCache"] def AboutData(): global version,description From uludag-commits at pardus.org.tr Thu May 8 12:30:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:30:58 +0300 (EEST) Subject: [Uludag-commits] r18009 - trunk/tasma/package-manager/src Message-ID: <20080508093058.91A5713840DC@liste.pardus.org.tr> Author: faik Date: Thu May 8 12:30:58 2008 New Revision: 18009 Modified: trunk/tasma/package-manager/src/package-manager.py Log: package-manager_1.3 Comar 2.0 changes Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Thu May 8 12:30:58 2008 @@ -31,7 +31,7 @@ return str description = I18N_NOOP("GUI for PiSi package manager") -version = "1.2" +version = "1.3" def AboutData(): global version,description From uludag-commits at pardus.org.tr Thu May 8 12:42:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 12:42:13 +0300 (EEST) Subject: [Uludag-commits] r18010 - trunk/pisi/pisi Message-ID: <20080508094213.7CFFF13840DC@liste.pardus.org.tr> Author: faik Date: Thu May 8 12:42:13 2008 New Revision: 18010 Modified: trunk/pisi/pisi/__init__.py Log: pisi-2.0_alpha6 Modified: trunk/pisi/pisi/__init__.py ================================================================= --- trunk/pisi/pisi/__init__.py (original) +++ trunk/pisi/pisi/__init__.py Thu May 8 12:42:13 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "2.0_alpha5" +__version__ = "2.0_alpha6" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Thu May 8 14:05:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 14:05:41 +0300 (EEST) Subject: [Uludag-commits] r18011 - trunk/comar/comar Message-ID: <20080508110541.55D9913840D9@liste.pardus.org.tr> Author: caglar Date: Thu May 8 14:05:40 2008 New Revision: 18011 Modified: trunk/comar/comar/CMakeLists.txt Log: CMake Error: Error in cmake code at /home/caglar/sourcebox/svn/uludag/trunk/comar/comar/CMakeLists.txt:98: INSTALL FILES given RENAME option with more than one file. Current CMake stack: Modified: trunk/comar/comar/CMakeLists.txt ================================================================= --- trunk/comar/comar/CMakeLists.txt (original) +++ trunk/comar/comar/CMakeLists.txt Thu May 8 14:05:40 2008 @@ -98,8 +98,7 @@ INSTALL (FILES etc/comar.conf etc/comar2.conf - DESTINATION /etc/dbus-1/system.d - RENAME ${APP_NAME}.conf) + DESTINATION /etc/dbus-1/system.d) # Install comar service activation under /usr/share/dbus-1/system-services/ INSTALL (FILES From uludag-commits at pardus.org.tr Thu May 8 14:19:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 14:19:01 +0300 (EEST) Subject: [Uludag-commits] r18012 - branches/yali4/yali4 Message-ID: <20080508111901.A4BAC13840D9@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 14:19:01 2008 New Revision: 18012 Modified: branches/yali4/yali4/installer.py Log: * ohom. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 14:19:01 2008 @@ -463,8 +463,8 @@ if yali4.sysutils.is_windows_boot(p.getPath(), fs): ctx.debugger.log("Windows Found on device %s partition %s " % (p.getDevicePath(), p.getPath())) win_fs = fs - win_dev = basename(p.getDevicePath()) - win_root = basename(p.getPath()) + win_dev = os.path.basename(p.getDevicePath()) + win_root = os.path.basename(p.getPath()) loader.grub_conf_append_win(ctx.installData.bootLoaderDev, win_dev, win_root, From uludag-commits at pardus.org.tr Thu May 8 15:09:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 15:09:54 +0300 (EEST) Subject: [Uludag-commits] r18013 - branches/kaptan3/pics Message-ID: <20080508120954.053671384129@liste.pardus.org.tr> Author: pinar Date: Thu May 8 15:09:53 2008 New Revision: 18013 Added: branches/kaptan3/pics/text_bg.png (contents, props changed) Modified: branches/kaptan3/pics/middleWithCorner.png branches/kaptan3/pics/multiple_en.png branches/kaptan3/pics/multiple_tr.png Log: update/add pics Modified: branches/kaptan3/pics/middleWithCorner.png ================================================================= Binary files. No diff available. Modified: branches/kaptan3/pics/multiple_en.png ================================================================= Binary files. No diff available. Modified: branches/kaptan3/pics/multiple_tr.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Thu May 8 15:17:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 15:17:12 +0300 (EEST) Subject: [Uludag-commits] r18014 - branches/kaptan3/src Message-ID: <20080508121712.D77361384129@liste.pardus.org.tr> Author: pinar Date: Thu May 8 15:17:12 2008 New Revision: 18014 Modified: branches/kaptan3/src/kaptan.py Log: remove page title, not needed anymore Modified: branches/kaptan3/src/kaptan.py ================================================================= --- branches/kaptan3/src/kaptan.py (original) +++ branches/kaptan3/src/kaptan.py Thu May 8 15:17:12 2008 @@ -76,8 +76,7 @@ self.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) self.pixSteps.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/leftWithCorner.png"))) self.pageStack.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/middleWithCorner.png"))) - self.pageDesc.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) - self.pageTitle.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/bg.png"))) + self.pageDesc.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/text_bg.png"))) self.pageIcon.setPixmap(QPixmap(locate("data", icon))) # set button icons @@ -88,7 +87,6 @@ self.buttonFinish.setIconSet(QIconSet(loader.loadIcon("ok", KIcon.Small))) # set texts - self.pageTitle.setText(i18n("Welcome")) self.pageDesc.setText(i18n("Welcome to Kaptan Wizard :)")) self.buttonCancel.setText(i18n("&Cancel")) self.buttonBack.setText(i18n("&Back")) @@ -135,7 +133,6 @@ self.pageStack.raiseWidget(where) _w = self.pageStack.visibleWidget() - self.pageTitle.setText(_w.title) self.pageDesc.setText(_w.desc) self.pageIcon.setPixmap(QPixmap(locate("data", _w.icon))) From uludag-commits at pardus.org.tr Thu May 8 15:20:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 15:20:55 +0300 (EEST) Subject: [Uludag-commits] r18015 - branches/kaptan3/src/screens Message-ID: <20080508122055.58B3C1384129@liste.pardus.org.tr> Author: pinar Date: Thu May 8 15:20:54 2008 New Revision: 18015 Modified: branches/kaptan3/src/screens/ScrWallpaper.py Log: convert to PNG instead of BMP. thanx to onur for zlib fix =) Modified: branches/kaptan3/src/screens/ScrWallpaper.py ================================================================= --- branches/kaptan3/src/screens/ScrWallpaper.py (original) +++ branches/kaptan3/src/screens/ScrWallpaper.py Thu May 8 15:20:54 2008 @@ -164,7 +164,7 @@ try: im = Image.open(infile) im.thumbnail(self.thumbSize, Image.NEAREST) - im.save(tmpDir + ".jpg.thumbnail", "BMP") + im.save(tmpDir + ".jpg.thumbnail", "PNG") except IOError, e: logging.debug("IO Error: " + str(e)) From uludag-commits at pardus.org.tr Thu May 8 15:23:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 15:23:02 +0300 (EEST) Subject: [Uludag-commits] r18016 - branches/kaptan3/src/screens Message-ID: <20080508122302.2C1741384129@liste.pardus.org.tr> Author: pinar Date: Thu May 8 15:23:01 2008 New Revision: 18016 Modified: branches/kaptan3/src/screens/kaptanMain.ui branches/kaptan3/src/screens/multipledlg.ui branches/kaptan3/src/screens/paneldlg.ui Log: ui refactors due to koray's research Modified: branches/kaptan3/src/screens/kaptanMain.ui ================================================================= --- branches/kaptan3/src/screens/kaptanMain.ui (original) +++ branches/kaptan3/src/screens/kaptanMain.ui Thu May 8 15:23:01 2008 @@ -128,13 +128,38 @@ + + + spacerLeftTop + + + Vertical + + + Fixed + + + + 41 + 10 + + + + + 65 + 61 + 41 + 10 + + + pixSteps - 10 + 11 80 150 338 @@ -187,8 +212,8 @@ - 11 - 1 + 60 + 10 48 48 @@ -223,77 +248,18 @@ true - + - pageStack + pageDesc - 160 - 50 + 161 + 27 524 - 400 - - - - - 500 - 400 - - - - - 239 - 239 - 239 - - - - - WStackPage - - - 0 - - - - - - spacerLeftTop - - - Vertical - - - Fixed - - - - 41 - 30 - - - - - 65 - 51 - 41 30 - - - - pageTitle - - - - 70 - 0 - 620 - 23 - - 0 @@ -302,11 +268,10 @@ - ParentOrigin + WidgetOrigin - 12 1 @@ -314,37 +279,42 @@ - AlignBottom + AlignCenter - + - pageDesc + pageStack - 69 - 28 - 610 - 16 + 161 + 54 + 524 + 400 - + + + 524 + 400 + + + - 0 - 0 - 0 + 239 + 239 + 239 - - ParentOrigin - - - - - - AlignTop - + + + WStackPage + + + 0 + + Modified: branches/kaptan3/src/screens/multipledlg.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/kaptan3/src/screens/paneldlg.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu May 8 16:36:22 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 16:36:22 +0300 (EEST) Subject: [Uludag-commits] r18017 - branches/yali4/yali4/gui Message-ID: <20080508133622.6B4FA1384124@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 16:36:21 2008 New Revision: 18017 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * Dont try to use EDD when there is just one device.. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Thu May 8 16:36:21 2008 @@ -100,7 +100,12 @@ self.slotSelect) def shown(self): - ctx.installData.orderedDiskList = yali4.storage.getOrderedDiskList() + + if len(yali4.storage.devices) > 1: + ctx.installData.orderedDiskList = yali4.storage.getOrderedDiskList() + else: + ctx.installData.orderedDiskList = yali4.storage.detect_all() + ctx.debugger.log("Disks BIOS Boot order : %s " % ','.join(ctx.installData.orderedDiskList)) def backCheck(self): From uludag-commits at pardus.org.tr Thu May 8 17:31:37 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 17:31:37 +0300 (EEST) Subject: [Uludag-commits] r18018 - branches/yali4/yali4 Message-ID: <20080508143137.8C79E138417C@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 17:31:37 2008 New Revision: 18018 Modified: branches/yali4/yali4/installer.py Log: * If normal installation selected try to set yali4-firstboot service off. Modified: branches/yali4/yali4/installer.py ================================================================= --- branches/yali4/yali4/installer.py (original) +++ branches/yali4/yali4/installer.py Thu May 8 17:31:37 2008 @@ -412,8 +412,7 @@ except: ctx.debugger.log("Dbus error: package doesnt exist !") return False - elif self.install_type == YALI_FIRSTBOOT: - ctx.debugger.log("FirstBoot selected.") + elif self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: try: obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") From uludag-commits at pardus.org.tr Thu May 8 18:18:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 18:18:56 +0300 (EEST) Subject: [Uludag-commits] r18019 - branches/yali4/yali4 Message-ID: <20080508151856.276EE138417A@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 8 18:18:55 2008 New Revision: 18019 Modified: branches/yali4/yali4/constants.py Log: * Add 2008 Repo to the installed system. Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Thu May 8 18:18:55 2008 @@ -83,11 +83,8 @@ consts.cd_repo_uri = join(consts.source_dir, "repo/pisi-index.xml.bz2") # pardus repository -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" +consts.pardus_repo_name = "pardus-2008" +consts.pardus_repo_uri = "http://paketler.pardus.org.tr/pardus-2008/pisi-index.xml.bz2" # min root partition size consts.min_root_size = 3500 From uludag-commits at pardus.org.tr Thu May 8 19:17:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 19:17:35 +0300 (EEST) Subject: [Uludag-commits] r18020 - branches/tasma-dbus/network-manager Message-ID: <20080508161735.CB2E41384202@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu May 8 19:17:34 2008 New Revision: 18020 Modified: branches/tasma-dbus/network-manager/comariface.py branches/tasma-dbus/network-manager/network-applet.py Log: Window ID is 0 Modified: branches/tasma-dbus/network-manager/comariface.py ================================================================= --- branches/tasma-dbus/network-manager/comariface.py (original) +++ branches/tasma-dbus/network-manager/comariface.py Thu May 8 19:17:34 2008 @@ -177,7 +177,7 @@ self.nr_queried = 0 self.nr_conns = 0 self.nr_empty = 0 - self.winID = None + self.winID = 0 if self.openBus(): self.setup() Modified: branches/tasma-dbus/network-manager/network-applet.py ================================================================= --- branches/tasma-dbus/network-manager/network-applet.py (original) +++ branches/tasma-dbus/network-manager/network-applet.py Thu May 8 19:17:34 2008 @@ -120,7 +120,7 @@ self.nr_queried = 0 self.nr_conns = 0 self.nr_empty = 0 - self.winID = None + self.winID = 0 if self.openBus(): self.setup() @@ -453,7 +453,6 @@ tray.show() tray.connect(tray, SIGNAL("quitSelected()"), self.slotQuit) self.trays = [tray] - comlink.winID = tray.winId() def deviceGroup(self, id): if self.mode == 1: @@ -465,7 +464,6 @@ tray.show() tray.connect(tray, SIGNAL("quitSelected()"), self.slotQuit) self.trays.append(tray) - comlink.winID = self.trays[0].winId() def slotQuit(self): autostart = KMessageBox.questionYesNo(None, i18n("Should network-applet start automatically when you login?")) From uludag-commits at pardus.org.tr Thu May 8 21:19:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 21:19:19 +0300 (EEST) Subject: [Uludag-commits] r18021 - branches/kaptan3/src/screens Message-ID: <20080508181919.C1FD113841EA@liste.pardus.org.tr> Author: pinar Date: Thu May 8 21:19:19 2008 New Revision: 18021 Modified: branches/kaptan3/src/screens/ScrPackage.py Log: if there's a repo called contrib, hide add repo section. Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Thu May 8 21:19:19 2008 @@ -16,6 +16,7 @@ import kdedesigner import contribrepo +import pisi from screens.Screen import ScreenWidget from screens.packagedlg import PackageWidget @@ -50,7 +51,6 @@ self.textLabelContrib.setText(i18n("Contrib repo includes extra packages.")) self.checkBoxContrib.setText(i18n("Add contrib repo")) - #policykit olana kadar enabled self.checkBoxContrib.setEnabled(True) #set images @@ -61,6 +61,10 @@ self.checkUpdate.connect(self.checkUpdate, SIGNAL("toggled(bool)"), self.updateSelected) self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.slotContribRepo) + self.repodb = pisi.db.repodb.RepoDB() + if "contrib" in self.repodb.list_repos(): + self.groupBoxRepo.hide() + def slotContribRepo(self): if self.checkBoxContrib.isChecked(): self.addRepo() From uludag-commits at pardus.org.tr Thu May 8 21:24:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 21:24:47 +0300 (EEST) Subject: [Uludag-commits] r18022 - branches/kaptan3/src/screens Message-ID: <20080508182447.A924613841C4@liste.pardus.org.tr> Author: pinar Date: Thu May 8 21:24:47 2008 New Revision: 18022 Modified: branches/kaptan3/src/screens/ScrPackage.py Log: do not hardcode :) Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Thu May 8 21:24:47 2008 @@ -38,6 +38,8 @@ #set updateTime self.updateInterval.setValue(self.updateTime) + self.repoName = "contrib" + self.repoAddress = "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2" #set texts self.setCaption(i18n("Package")) @@ -62,7 +64,7 @@ self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.slotContribRepo) self.repodb = pisi.db.repodb.RepoDB() - if "contrib" in self.repodb.list_repos(): + if self.repoName in self.repodb.list_repos(): self.groupBoxRepo.hide() def slotContribRepo(self): @@ -73,7 +75,7 @@ def addRepo(self): try: - contribrepo.addRepo("contrib", "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2") + contribrepo.addRepo(self.repoName, self.repoAddress) return True except Exception, e: print e @@ -91,7 +93,7 @@ return False try: if authResult: - contribrepo.addRepo("contrib", "http://paketler.pardus.org.tr/pardus-2008-test/pisi-index.xml.bz2") + contribrepo.addRepo(self.repoName, self.repoAddress) else: return False except: @@ -99,7 +101,7 @@ def removeRepo(self): try: - contribrepo.removeRepo("contrib") + contribrepo.removeRepo(self.repoName) return True except Exception, e: print e @@ -117,7 +119,7 @@ return False try: if authResult: - contribrepo.removeRepo("contrib") + contribrepo.removeRepo(self.repoName) else: return False except: From uludag-commits at pardus.org.tr Thu May 8 23:12:30 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 23:12:30 +0300 (EEST) Subject: [Uludag-commits] r18023 - branches/tasma-dbus/user-manager Message-ID: <20080508201230.5CBEA13841C1@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 8 23:12:29 2008 New Revision: 18023 Modified: branches/tasma-dbus/user-manager/useredit.py Log: * Remove description tooltips for groups completely, because there are no descriptions of sytem groups anymore in new comar * Remove unnecessary spaces Modified: branches/tasma-dbus/user-manager/useredit.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu May 8 23:39:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 8 May 2008 23:39:33 +0300 (EEST) Subject: [Uludag-commits] r18024 - branches/tasma-dbus/user-manager Message-ID: <20080508203933.5AEA313841DD@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 8 23:39:32 2008 New Revision: 18024 Modified: branches/tasma-dbus/user-manager/useredit.py Log: Remove Permission column from groups list in user edit screen, we do not have group descriptions in new comar Modified: branches/tasma-dbus/user-manager/useredit.py ================================================================= --- branches/tasma-dbus/user-manager/useredit.py (original) +++ branches/tasma-dbus/user-manager/useredit.py Thu May 8 23:39:32 2008 @@ -248,9 +248,7 @@ self.groups = QListView(self) self.groups.addColumn(i18n("Group")) - self.groups.addColumn(i18n("Permission")) self.groups.setResizeMode(QListView.LastColumn) - self.groups.setAllColumnsShowFocus(True) vb.addWidget(self.groups, 2) w = QWidget(self) @@ -266,7 +264,6 @@ def populate(self, groups): self.main_sel = None - self.toggle.setChecked(False) group = groups.firstChild() self.groups.clear() while group: @@ -297,7 +294,6 @@ self.main_sel = unicode(text) def slotToggle(self, bool): - print "heloooooo" group = self.groups.firstChild() while group: group = group.nextSibling() @@ -415,8 +411,6 @@ else: lab = QLabel(u"%s" % i18n("Enter Information For New User"), w) hb.addWidget(lab) - toggle = QCheckBox(i18n("Show all groups"), w) - hb.addWidget(toggle, 0, Qt.AlignRight) hb = QHBox(self) self.setStretchFactor(hb, 4) @@ -453,8 +447,6 @@ grid.addMultiCellWidget(lab, row, row, 0, 1) self.u_groups = UserGroupList(self, hb) - self.u_groups.toggle = toggle - self.connect(toggle, SIGNAL("toggled(bool)"), self.u_groups.slotToggle) self.guide = Guide(self, edit) self.setStretchFactor(self.guide, 1) From uludag-commits at pardus.org.tr Fri May 9 00:19:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 9 May 2008 00:19:07 +0300 (EEST) Subject: [Uludag-commits] r18025 - branches/kaptan3/src/screens Message-ID: <20080508211907.B856113841DC@liste.pardus.org.tr> Author: pinar Date: Fri May 9 00:19:07 2008 New Revision: 18025 Modified: branches/kaptan3/src/screens/ScrPackage.py Log: control depo url instead of name Modified: branches/kaptan3/src/screens/ScrPackage.py ================================================================= --- branches/kaptan3/src/screens/ScrPackage.py (original) +++ branches/kaptan3/src/screens/ScrPackage.py Fri May 9 00:19:07 2008 @@ -36,12 +36,14 @@ def __init__(self, *args): apply(PackageWidget.__init__, (self,) + args) - #set updateTime + # set updateTime self.updateInterval.setValue(self.updateTime) + + # set repo name and address self.repoName = "contrib" self.repoAddress = "http://paketler.pardus.org.tr/contrib-2007/pisi-index.xml.bz2" - #set texts + # set texts self.setCaption(i18n("Package")) self.textPackage.setText(i18n("Package-manager is the graphical front-end of PiSi. You can easily install new programs and upgrade your system and also can see new upgrades of the programs periodically from the system tray with package manager.")) QToolTip.add(self.pixPackage,i18n("tooltipPisiPopup","Pisi Pop-Up Baloon")) @@ -55,7 +57,7 @@ self.checkBoxContrib.setEnabled(True) - #set images + # set images self.setPaletteBackgroundPixmap(QPixmap(locate("data", "kaptan/pics/middleWithCorner.png"))) self.pixPackage.setPixmap(QPixmap(locate("data", "kaptan/pics/package.png"))) @@ -64,14 +66,24 @@ self.checkBoxContrib.connect(self.checkBoxContrib, SIGNAL("toggled(bool)"), self.slotContribRepo) self.repodb = pisi.db.repodb.RepoDB() - if self.repoName in self.repodb.list_repos(): - self.groupBoxRepo.hide() + + n = 1 + + for repo in self.repodb.list_repos(): + if self.repoAddress == self.repodb.get_repo_url(repo): + self.groupBoxRepo.hide() + else: + for r in self.repodb.list_repos(): + if r == self.repoName + str(n): + n = n + 1 + else: + self.repoName = r + str(n) def slotContribRepo(self): if self.checkBoxContrib.isChecked(): - self.addRepo() + print self.addRepo() else: - self.removeRepo() + print self.removeRepo() def addRepo(self): try: From uludag-commits at pardus.org.tr Fri May 9 00:48:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 9 May 2008 00:48:11 +0300 (EEST) Subject: [Uludag-commits] r18026 - branches/kaptan3/src/screens Message-ID: <20080508214811.9752313841C4@liste.pardus.org.tr> Author: pinar Date: Fri May 9 00:48:11 2008 New Revision: 18026 Modified: branches/kaptan3/src/screens/ScrGoodbye.py Log: wtf mdsadigration-users? always clean debug staff. Modified: branches/kaptan3/src/screens/ScrGoodbye.py ================================================================= --- branches/kaptan3/src/screens/ScrGoodbye.py (original) +++ branches/kaptan3/src/screens/ScrGoodbye.py Fri May 9 00:48:11 2008 @@ -50,17 +50,21 @@ self.connect(self.buttonTasma, SIGNAL("clicked()"), self.startTasma) self.connect(self.buttonHelp, SIGNAL("clicked()"), self.startHelp) + self.isAppAvaiable("migration-users", self.groupBoxMigration) + + def isAppAvaiable(self, appName, widget2Hide): try: - p = subprocess.Popen(["mdsadigration-users"], stdout = subprocess.PIPE) + p = subprocess.Popen([appName], stdout = subprocess.PIPE) out, err = p.communicate() - isMigrationAvaiable = out - if isMigrationAvaiable: - self.groupBoxMigration.hide() + isAvaiable = out + if not isAvaiable: + widget2Hide.hide() + except OSError, e: - logging.debug("Migration is not installed: " + str(e)) - # hide migration part, if it's not installed. - self.groupBoxMigration.hide() + logging.debug(appName + " is not installed: " + str(e)) + # hide app part, if it's not installed. + widget2Hide.hide() def shown(self): pass From uludag-commits at pardus.org.tr Fri May 9 01:00:37 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 9 May 2008 01:00:37 +0300 (EEST) Subject: [Uludag-commits] r18027 - in branches/kaptan3: pics src/screens Message-ID: <20080508220037.B195A13841D9@liste.pardus.org.tr> Author: pinar Date: Fri May 9 01:00:37 2008 New Revision: 18027 Modified: branches/kaptan3/pics/text_bg.png branches/kaptan3/src/screens/ScrGoodbye.py branches/kaptan3/src/screens/goodbyedlg.ui Log: display manager thingies. Modified: branches/kaptan3/pics/text_bg.png ================================================================= Binary files. No diff available. Modified: branches/kaptan3/src/screens/ScrGoodbye.py ================================================================= --- branches/kaptan3/src/screens/ScrGoodbye.py (original) +++ branches/kaptan3/src/screens/ScrGoodbye.py Fri May 9 01:00:37 2008 @@ -37,6 +37,8 @@ else: self.helpUrl = "http://www.pardus.org.tr/eng/contact.html" + self.minimumResolution = 800 + self.picMigration.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/migration.png"))) self.picTasma.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/tasma.png"))) #self.picFeedback.setPixmap(QPixmap(locate("data", "kaptan/pics/icons/feedback.png"))) @@ -49,9 +51,15 @@ self.connect(self.buttonMigration, SIGNAL("clicked()"), self.startMigration) self.connect(self.buttonTasma, SIGNAL("clicked()"), self.startTasma) self.connect(self.buttonHelp, SIGNAL("clicked()"), self.startHelp) + self.connect(self.buttonResolution, SIGNAL("clicked()"), self.startDisplayManager) self.isAppAvaiable("migration-users", self.groupBoxMigration) + # if screen width smaller than + rect = QApplication.desktop().screenGeometry() + if rect.width() > self.minimumResolution: + self.groupBoxResolution.hide() + def isAppAvaiable(self, appName, widget2Hide): try: p = subprocess.Popen([appName], stdout = subprocess.PIPE) @@ -72,6 +80,11 @@ def execute(self): return True + def startDisplayManager(self): + self.proc = QProcess() + self.proc.addArgument("display-manager") + self.proc.start() + def startMigration(self): self.proc = QProcess() self.proc.addArgument("migration") Modified: branches/kaptan3/src/screens/goodbyedlg.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Fri May 9 01:42:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 9 May 2008 01:42:02 +0300 (EEST) Subject: [Uludag-commits] r18028 - trunk/comar/comar/etc/policy Message-ID: <20080508224202.A84DF1384183@liste.pardus.org.tr> Author: necmettin Date: Fri May 9 01:42:02 2008 New Revision: 18028 Modified: trunk/comar/comar/etc/policy/comar.bootloader.policy trunk/comar/comar/etc/policy/comar.modules.policy trunk/comar/comar/etc/policy/comar.netfilter.policy trunk/comar/comar/etc/policy/comar.netlink.policy trunk/comar/comar/etc/policy/comar.netstack.policy trunk/comar/comar/etc/policy/comar.pisi.policy trunk/comar/comar/etc/policy/comar.policy trunk/comar/comar/etc/policy/comar.service.policy trunk/comar/comar/etc/policy/comar.system.package.policy trunk/comar/comar/etc/policy/comar.system.packagehandler.policy trunk/comar/comar/etc/policy/comar.time.policy trunk/comar/comar/etc/policy/comar.user.policy trunk/comar/comar/etc/policy/comar.xorg.display.policy trunk/comar/comar/etc/policy/comar.xorg.driver.policy Log: Turkish translations and some tiny little text fixes Modified: trunk/comar/comar/etc/policy/comar.bootloader.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.bootloader.policy (original) +++ trunk/comar/comar/etc/policy/comar.bootloader.policy Fri May 9 01:42:02 2008 @@ -4,8 +4,10 @@ - Update kernel release on specified partition. - System policy prevents updating kernel. + Update kernel release on specified partition + Belirli disk bölümündeki çekirdek sürümünü güncelle + System policy prevents updating kernel + Sistem politikası çekirdek güncellemeyi engeller no no @@ -14,8 +16,10 @@ - Remove entry from boot loader. - System policy prevents removing entry. + Remove entry from boot loader + Önyükleyiciden girdi sil + System policy prevents removing entry + Sistem politikası girdi silmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -24,8 +28,10 @@ - Remove unused kernel from system. - System policy prevents removing unused kernels. + Remove unused kernel from system + Sistemden kullanılmayan çekirdeği sil + System policy prevents removing unused kernels + Sistem politikası kullanılmayan çekirdeği silmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -35,17 +41,22 @@ - Edit boot loader options and add new entries. - System policy prevents changing bootloader settings. + Edit boot loader options and add new entries + Önyükleyici seçeneklerini değiştir ve yeni girdiler ekle + System policy prevents changing bootloader settings + Sistem politikası önyükleyici ayarlarını değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session auth_admin_keep_session + - View boot loader options and list entries. - System policy prevents viewing bootloader settings. + View boot loader options and list entries + Önyükleyici seçeneklerine bak ve girdileri listele + System policy prevents viewing bootloader settings + Sistem politikası önyükleyici ayarlarına bakmayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.modules.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.modules.policy (original) +++ trunk/comar/comar/etc/policy/comar.modules.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Set module options - System policy prevents setting module options. + Modül seçeneklerini değiştir + System policy prevents setting module options + Sistem politikası modül seçeneklerini değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -15,7 +17,9 @@ Load kernel module - System policy prevents loading kernel module. + Çekirdek modülünü etkinleştir + System policy prevents loading kernel module + Sistem politikası çekirdek modülünü etkinleştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -25,7 +29,9 @@ Unload kernel module - System policy prevents unloading kernel module. + Çekirdek modülünü etkisiz kıl + System policy prevents unloading kernel module + Sistem politikası çekirdek modülünü etkisiz kılmayı engeller auth_admin_keep_session auth_admin_keep_session @@ -34,8 +40,10 @@ - Unload kernel module - System policy prevents unloading kernel module. + Add autoloading kernel module + Otomatik yüklenen çekirdek modülü ekle + System policy prevents adding an autoloading kernel module + Sistem politikası otomatik yüklenen çekirdek modülü eklenmesini engeller auth_admin_keep_session auth_admin_keep_session @@ -45,7 +53,9 @@ Update module configuration - System policy prevents updating module configuration. + Modül yapılandırmasını güncelle + System policy prevents updating module configuration + Sistem politikası modül yapılandırmasını güncellemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -56,7 +66,9 @@ Get module information - System policy prevents getting module information. + Modül bilgisini al + System policy prevents getting module information + Sistem politikası modül bilgisini almayı engeller yes yes @@ -65,8 +77,10 @@ - Edit autoload list. - System policy prevents editing autoload list. + Edit autoload list + Otomatik yükleme listesini değiştir + System policy prevents editing autoload list + Sistem politikası otomatik yükleme listesini değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -75,8 +89,10 @@ - Edit module blacklist. - System policy prevents editing module blacklist. + Edit module blacklist + Modül karalistesini değiştir + System policy prevents editing module blacklist + Sistem politikası modül karalistesini değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session Modified: trunk/comar/comar/etc/policy/comar.netfilter.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.netfilter.policy (original) +++ trunk/comar/comar/etc/policy/comar.netfilter.policy Fri May 9 01:42:02 2008 @@ -4,8 +4,10 @@ - Change firewall configuration. - System policy prevents changing firewall configuration. + Change firewall configuration + Güvenlik duvarı yapılandırmasını değiştir + System policy prevents changing firewall configuration + Sistem politikası güvenlik duvarı yapılandırmasını değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -14,8 +16,10 @@ - View firewall configuration. - System policy prevents viewing firewall configuration. + View firewall configuration + Güvenlik duvarı yapılandırmasına bak + System policy prevents viewing firewall configuration + Sistem politikası güvenlik duvarı yapılandırmasına bakmayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.netlink.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.netlink.policy (original) +++ trunk/comar/comar/etc/policy/comar.netlink.policy Fri May 9 01:42:02 2008 @@ -4,8 +4,10 @@ - Scan remote access points. - System policy prevents scanning remote access points. + Scan remote access points + Uzak erişim noktalarını tara + System policy prevents scanning remote access points + Sistem politikası uzak erişim noktalarını taramayı engeller yes yes @@ -14,8 +16,10 @@ - Delete connection. - System policy prevents removing connections. + Delete connection + Bağlantıyı sil + System policy prevents removing connections + Sistem politikası bağlantı silmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -24,8 +28,10 @@ - Set connection state. - System policy prevents changing connection state. + Set connection state + Bağlantı durumunu değiştir + System policy prevents changing connection state + Sistem politikası bağlantı durumunu değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -35,8 +41,10 @@ - Set connection details. - System policy prevents adding/editing connections. + Set connection details + Bağlantı detaylarını değiştir + System policy prevents adding/editing connections + Sistem politikası bağlantı eklemeyi/bağlantıda değişiklik yapmayı engeller auth_admin_keep_session auth_admin_keep_session @@ -46,7 +54,9 @@ Get connection/device details - System policy prevents getting connection/device details. + Bağlantı/aygıt detaylarını al + System policy prevents getting connection/device details + Sistem politikası bağlantı/aygıt detaylarını almayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.netstack.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.netstack.policy (original) +++ trunk/comar/comar/etc/policy/comar.netstack.policy Fri May 9 01:42:02 2008 @@ -6,7 +6,9 @@ Set hostname/nameserver info - System policy prevents changing host/nameserver information. + Makine adı/isim sunucu bilgisini değiştir + System policy prevents changing host/nameserver information + Sistem politikası makine adı/isim sunucu bilgisini değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -16,7 +18,9 @@ Get hostname/nameserver info - System policy prevents getting host/nameserver info. + Makine adı/isim sunucu bilgisini al + System policy prevents getting host/nameserver info + Sistem politikası makine adı/isim sunucu bilgisini almayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.pisi.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.pisi.policy (original) +++ trunk/comar/comar/etc/policy/comar.pisi.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Install package - System policy prevents installing package. + Paket yükle + System policy prevents installing package + Sistem politikası paket yüklemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -15,7 +17,9 @@ Remove package - System policy prevents removing package. + Paket kaldır + System policy prevents removing package + Sistem politikası paket kaldırmayı engeller auth_admin_keep_session auth_admin_keep_session @@ -25,7 +29,9 @@ Update package - System policy prevents updating package. + Paket güncelle + System policy prevents updating package + Sistem politikası paket güncellemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -35,7 +41,9 @@ Update repository - System policy prevents updating repository. + Sistem politikası depo güncellemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -45,7 +53,9 @@ Update all repositories - System policy prevents updating repositories. + Sistem politikası tüm depoları güncellemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -55,7 +65,9 @@ Add repository - System policy prevents adding repository. + Sistem politikası depo eklemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -65,7 +77,9 @@ Remove repository - System policy prevents removing repository. + Get installed packages list - System policy prevents getting installed packages list. + Sistem politikası yüklü paketlerin listesini almayı engeller auth_admin_keep_session auth_admin_keep_session @@ -85,7 +101,9 @@ Get upgradable packages list - System policy prevents getting upgradable packages list. + Sistem politikası güncellenebilir paketlerin listesini almayı engeller auth_admin_keep_session auth_admin_keep_session @@ -95,7 +113,9 @@ Get package info - System policy prevents getting package info. + Sistem politikası paket bilgisini almayı engeller auth_admin_keep_session auth_admin_keep_session @@ -105,7 +125,9 @@ Get repositories - System policy prevents getting repositories. + Sistem politikası depoları almayı engeller auth_admin_keep_session auth_admin_keep_session @@ -115,7 +137,9 @@ Set repositories - System policy prevents setting repositories. + Sistem politikası depoları yazmayı engeller auth_admin_keep_session auth_admin_keep_session @@ -124,8 +148,10 @@ - Set pisi package cache - System policy prevents setting pisi package cache. + Set PiSi package cache + Sistem politikası PiSi paket önbelleğini yazmayı engeller auth_admin_keep_session auth_admin_keep_session @@ -134,8 +160,10 @@ - Clear pisi caches - System policy prevents clearing pisi package cache. + Clear PiSi cache + Sistem politikası PiSi paket önbelleğini boşaltmayı engeller auth_admin_keep_session auth_admin_keep_session Modified: trunk/comar/comar/etc/policy/comar.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.policy (original) +++ trunk/comar/comar/etc/policy/comar.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Register new scripts - System policy prevents registering scripts. + Sistem politikası betiklerin sisteme kaydedilmesini engeller no no @@ -15,7 +17,9 @@ Remove application - System policy prevents removing applications. + Sistem politikası uygulamaların kaldırılmasını engeller no no @@ -25,7 +29,9 @@ List applications - ... + Sistem politikaları uygulamaların listelenmesini engeller yes yes @@ -35,7 +41,9 @@ List models - ... + Sistem politikası modellerin listelenmesini engeller yes yes @@ -45,7 +53,9 @@ List application models - ... + Sistem politikası uygulama modellerinin listelenmesini engeller yes yes @@ -55,7 +65,9 @@ List model applications - ... + Sistem politikası model uygulamaların listelenmesini engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.service.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.service.policy (original) +++ trunk/comar/comar/etc/policy/comar.service.policy Fri May 9 01:42:02 2008 @@ -4,16 +4,21 @@ Change service state - System policy prevents changing service state. + Sistem politikası servis durumunu değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session auth_admin_keep_session + Get service status - System policy prevents getting service status. + Sistem politikası servis durumunu okumayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.system.package.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.system.package.policy (original) +++ trunk/comar/comar/etc/policy/comar.system.package.policy Fri May 9 01:42:02 2008 @@ -4,8 +4,10 @@ - Execute post install script of a package - System policy prevents executing post install script. + Execute post-install script of a package + Bir paketin yükleme sonrası betiğini çalıştır + System policy prevents executing post-install script + Sistem politikası yükleme sonrası betiği çalıştırmayı engeller no no @@ -14,8 +16,10 @@ - Execute pre remove script of a package - System policy prevents executing pre remove script. + Execute pre-remove script of a package + Bir paketin kaldırma öncesi betiğini çalıştır + System policy prevents executing pre-remove script + Sistem politikası kaldırma öncesi betiği çalıştırmayı engeller no no Modified: trunk/comar/comar/etc/policy/comar.system.packagehandler.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.system.packagehandler.policy (original) +++ trunk/comar/comar/etc/policy/comar.system.packagehandler.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Execute package handler setup scripts - System policy prevents executing package handlers' setup scripts. + Sistem politikası paket işleyicilerinin kurulum betiklerinin çalıştırılmasını engeller no no @@ -15,7 +17,9 @@ Execute package handler cleanup scripts - System policy prevents executing package handlers' cleanup scripts. + Sistem politikası paket işleyicilerinin temizlik betiklerininin çalıştırılmasını engeller no no Modified: trunk/comar/comar/etc/policy/comar.time.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.time.policy (original) +++ trunk/comar/comar/etc/policy/comar.time.policy Fri May 9 01:42:02 2008 @@ -6,7 +6,9 @@ Set date/time - System policy prevents changing date/time. + Tarih/saat değiştir + System policy prevents changing date/time + Sistem politikası tarihi/saati değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -16,7 +18,9 @@ Get date/time - System policy prevents getting date/time info. + Tarih/saati oku + System policy prevents getting date/time info + Sistem politikası tarih/saat bilgisini okumayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.user.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.user.policy (original) +++ trunk/comar/comar/etc/policy/comar.user.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Add user - System policy prevents adding new user. + Kullanıcı ekle + System policy prevents adding new user + Sistem politikası yeni kullanıcı eklemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -15,7 +17,9 @@ Change user details - System policy prevents editing user details. + Kullanıcı bilgilerini değiştir + System policy prevents editing user details + Sistem politikası kullanıcı bilgilerini değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -25,7 +29,9 @@ Delete user - System policy prevents removing user. + Kullanıcı sil + System policy prevents removing user + Sistem politikası kullanıcı silmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -35,7 +41,9 @@ Add group - System policy prevents adding new group. + Grup ekle + System policy prevents adding new group + Sistem politikası yeni grup eklemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -45,7 +53,9 @@ Delete group - System policy prevents removing group. + Grup sil + System policy prevents removing group + Sistem politikası grup silmeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -56,7 +66,9 @@ Get user/groups - System policy prevents getting user/group details. + Kullanıcı/grupları al + System policy prevents getting user/group details + Sistem politikası kullanıcı/grup detaylarını almayı engeller yes yes Modified: trunk/comar/comar/etc/policy/comar.xorg.display.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.xorg.display.policy (original) +++ trunk/comar/comar/etc/policy/comar.xorg.display.policy Fri May 9 01:42:02 2008 @@ -5,7 +5,9 @@ Get display info - System policy prevents getting display info. + Görüntü bilgisini al + System policy prevents getting display info + Sistem politikası görüntü bilgisini almayı engeller yes yes @@ -15,7 +17,9 @@ Change display configuration - System policy prevents setting display configuration. + Görüntü yapılandırmasını değiştir + System policy prevents setting display configuration + Sistem politikası görüntü yapılandırmasını değiştirmeyi engeller auth_admin_keep_session auth_admin_keep_session Modified: trunk/comar/comar/etc/policy/comar.xorg.driver.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.xorg.driver.policy (original) +++ trunk/comar/comar/etc/policy/comar.xorg.driver.policy Fri May 9 01:42:02 2008 @@ -4,7 +4,9 @@ Enable driver - System policy prevents enabling driver. + Sürücü etkinleştir + System policy prevents enabling driver + Sistem politikası sürücü etkileştirmeyi engeller no auth_admin_keep_session @@ -14,7 +16,9 @@ Disable driver - System policy prevents disabling driver. + Sürücü etkisiz kıl + System policy prevents disabling driver + Sistem politikası sürücü geçersiz kılmayı engeller no auth_admin_keep_session @@ -24,7 +28,9 @@ Probe display - System policy prevents probing display. + Ekranı sorgula + System policy prevents probing display + Sistem politikası ekranı sorgulamayı engeller no auth_admin_keep_session @@ -34,7 +40,9 @@ Get driver options - System policy prevents getting driver options. + Sürücü seçeneklerini al + System policy prevents getting driver options + Sistem politikası sürücü seçeneklerini almayı engeller auth_admin_keep_session auth_admin_keep_session From uludag-commits at pardus.org.tr Fri May 9 08:53:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 9 May 2008 08:53:06 +0300 (EEST) Subject: [Uludag-commits] r18029 - trunk/comar/comar/etc/policy Message-ID: <20080509055306.6C8E61384183@liste.pardus.org.tr> Author: gokcen.eraslan Date: Fri May 9 08:53:05 2008 New Revision: 18029 Modified: trunk/comar/comar/etc/policy/comar.pisi.policy Log: Some fixes Modified: trunk/comar/comar/etc/policy/comar.pisi.policy ================================================================= --- trunk/comar/comar/etc/policy/comar.pisi.policy (original) +++ trunk/comar/comar/etc/policy/comar.pisi.policy Fri May 9 08:53:05 2008 @@ -41,9 +41,9 @@ Update repository - Depo güncelle System policy prevents updating repository - Sistem politikası depo güncellemeyi engeller auth_admin_keep_session auth_admin_keep_session @@ -53,9 +53,9 @@ Update all repositories - Tüm depoları güncelle System policy prevents updating all repositories -