From uludag-commits at pardus.org.tr Fri Feb 1 00:17:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 00:17:15 +0200 (EET) Subject: [Uludag-commits] r16916 - branches/yali4/yali4/gui Message-ID: <20080131221716.07C3D7C012F@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Feb 1 00:17:15 2008 New Revision: 16916 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * Forget the thread.. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Fri Feb 1 00:17:15 2008 @@ -179,8 +179,6 @@ ctx.mainScreen.processEvents() - requestThread = ApplyAllRequestThread() - # We should do partitioning operations in here. # Auto Partitioning @@ -194,11 +192,15 @@ # Manual Partitioning else: ctx.debugger.log("Format Operation Started") - requestThread.start() - while not ctx.requestsCompleted: + for dev in yali4.storage.devices: ctx.mainScreen.processEvents() - time.sleep(0.1) + dev.commit() + # wait for udev to create device nodes + time.sleep(2) + ctx.mainScreen.processEvents() + ctx.partrequests.applyAll() ctx.debugger.log("Format Operation Finished") + ctx.mainScreen.processEvents() self.checkSwap() root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, @@ -236,17 +238,3 @@ def getDevice(self): return self._dev - -from threading import Thread - -class ApplyAllRequestThread(Thread): - - def run(self): - # wait.. - time.sleep(0.01) - for dev in yali4.storage.devices: - dev.commit() - # wait for udev to create device nodes - time.sleep(2) - ctx.partrequests.applyAll() - ctx.requestsCompleted = True From uludag-commits at pardus.org.tr Fri Feb 1 09:00:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 09:00:11 +0200 (EET) Subject: [Uludag-commits] r16917 - trunk/pisi/pisi/operations Message-ID: <20080201070012.02CD97C0439@liste.uludag.org.tr> Author: gokcen.eraslan Date: Fri Feb 1 09:00:11 2008 New Revision: 16917 Modified: trunk/pisi/pisi/operations/build.py Log: Let build dependencies install. Fixes #6902 BUG:FIXED:6902 Modified: trunk/pisi/pisi/operations/build.py ================================================================= --- trunk/pisi/pisi/operations/build.py (original) +++ trunk/pisi/pisi/operations/build.py Fri Feb 1 09:00:11 2008 @@ -29,7 +29,7 @@ import pisi.file import pisi.context as ctx import pisi.dependency as dependency -import pisi.operations.install as install +import pisi.api import pisi.sourcearchive import pisi.files import pisi.fetcher @@ -511,7 +511,7 @@ if ctx.ui.confirm( _('Do you want to install the unsatisfied build dependencies')): ctx.ui.info(_('Installing build dependencies.')) - install.install([dep.package for dep in dep_unsatis]) + pisi.api.install([dep.package for dep in dep_unsatis]) else: fail() else: From uludag-commits at pardus.org.tr Fri Feb 1 20:14:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 20:14:55 +0200 (EET) Subject: [Uludag-commits] r16918 - trunk/pisi/pisi Message-ID: <20080201181455.B97267C03A8@liste.uludag.org.tr> Author: caglar Date: Fri Feb 1 20:14:55 2008 New Revision: 16918 Modified: trunk/pisi/pisi/fetcher.py Log: raise it Modified: trunk/pisi/pisi/fetcher.py ================================================================= --- trunk/pisi/pisi/fetcher.py (original) +++ trunk/pisi/pisi/fetcher.py Fri Feb 1 20:14:55 2008 @@ -148,7 +148,7 @@ if os.stat(self.partial_file).st_size == 0: os.remove(self.partial_file) - FetchError(_('A problem occurred. Please check the archive address and/or permissions again.')) + raise FetchError(_('A problem occurred. Please check the archive address and/or permissions again.')) shutil.move(self.partial_file, self.archive_file) From uludag-commits at pardus.org.tr Fri Feb 1 20:16:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 20:16:17 +0200 (EET) Subject: [Uludag-commits] r16919 - trunk/pisi Message-ID: <20080201181617.39A9E7C03A8@liste.uludag.org.tr> Author: caglar Date: Fri Feb 1 20:16:16 2008 New Revision: 16919 Modified: trunk/pisi/comar-dbus.patch Log: rediff Modified: trunk/pisi/comar-dbus.patch ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Fri Feb 1 21:31:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 21:31:09 +0200 (EET) Subject: [Uludag-commits] r16920 - branches/pisi-1.1/pisi Message-ID: <20080201193109.7CC7F7C03C8@liste.uludag.org.tr> Author: caglar Date: Fri Feb 1 21:31:09 2008 New Revision: 16920 Modified: branches/pisi-1.1/pisi/index.py Log: obsoletes_list.patch Modified: branches/pisi-1.1/pisi/index.py ================================================================= --- branches/pisi-1.1/pisi/index.py (original) +++ branches/pisi-1.1/pisi/index.py Fri Feb 1 21:31:09 2008 @@ -101,7 +101,10 @@ if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) - obsoletes_list = map(str, self.distribution.obsoletes) + try: + obsoletes_list = map(str, self.distribution.obsoletes) + except AttributeError: + obsoletes_list = [] for pkg in util.filter_latest_packages(packages): pkg_name = util.parse_package_name(os.path.basename(pkg))[0] @@ -126,7 +129,8 @@ for comp in self.components: ctx.componentdb.update_component(comp, repo, txn) ctx.packagedb.remove_repo(repo, txn=txn) - ctx.packagedb.add_obsoletes(self.distribution.obsoletes, repo, txn=txn) + if self.distribution is not None: + ctx.packagedb.add_obsoletes(self.distribution.obsoletes, repo, txn=txn) for pkg in self.packages: ctx.packagedb.add_package(pkg, repo, txn=txn) update_progress() From uludag-commits at pardus.org.tr Fri Feb 1 23:38:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 23:38:10 +0200 (EET) Subject: [Uludag-commits] r16921 - branches/yali4-md/yali4/gui Message-ID: <20080201213810.406347C039A@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Feb 1 23:38:10 2008 New Revision: 16921 Modified: branches/yali4-md/yali4/gui/ScrBootloader.py Log: * sync with release version Modified: branches/yali4-md/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4-md/yali4/gui/ScrBootloader.py (original) +++ branches/yali4-md/yali4/gui/ScrBootloader.py Fri Feb 1 23:38:10 2008 @@ -19,6 +19,7 @@ from PyQt4.QtCore import * import time +import thread from os.path import basename import yali4.storage @@ -72,7 +73,6 @@ if not yali4.storage.init_devices(): raise GUIException, _("Can't find a storage device!") - if len(yali4.storage.devices) > 1: self.device_list_state = True # fill device list @@ -98,15 +98,10 @@ self.connect(self.ui.device_list, SIGNAL("clicked()"), self.slotSelect) - def shown(self): - if ctx.autoInstall: - ctx.mainScreen.next() - def backCheck(self): # we need to go partition auto screen, not manual ;) - num = ctx.mainScreen.mainStack.getCurrentIndex() - 2 - ctx.mainScreen.stackMove(num) - return False + ctx.mainScreen.moveInc = 2 + return True def slotSelect(self): self.ui.installMBR.setChecked(True) @@ -182,7 +177,6 @@ ctx.mainScreen.enableBack() return False - #info_window = InformationWindow(self, _("Please wait while formatting!")) ctx.mainScreen.processEvents() # We should do partitioning operations in here. @@ -191,20 +185,23 @@ if ctx.installData.autoPartDev: ctx.partrequests.remove_all() ctx.use_autopart = True - self.autopartDevice() + # self.autopartDevice() time.sleep(1) - ctx.partrequests.applyAll() + #ctx.partrequests.applyAll() # Manual Partitioning else: + ctx.debugger.log("Format Operation Started") for dev in yali4.storage.devices: + ctx.mainScreen.processEvents() dev.commit() # wait for udev to create device nodes time.sleep(2) - self.checkSwap() + ctx.mainScreen.processEvents() ctx.partrequests.applyAll() - - #info_window.close() + ctx.debugger.log("Format Operation Finished") + ctx.mainScreen.processEvents() + self.checkSwap() root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, request.mountRequestType) From uludag-commits at pardus.org.tr Fri Feb 1 23:41:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 23:41:00 +0200 (EET) Subject: [Uludag-commits] r16922 - in branches/yali4-md/yali4: . gui Message-ID: <20080201214100.5BEC17C036B@liste.uludag.org.tr> Author: gokmen.goksel Date: Fri Feb 1 23:41:00 2008 New Revision: 16922 Modified: branches/yali4-md/yali4/gui/ScrPartitionAuto.py branches/yali4-md/yali4/gui/ScreenWidget.py branches/yali4-md/yali4/gui/YaliDialog.py branches/yali4-md/yali4/gui/YaliWindow.py branches/yali4-md/yali4/gui/context.py branches/yali4-md/yali4/gui/installdata.py branches/yali4-md/yali4/partitionrequest.py Log: sync.. Modified: branches/yali4-md/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4-md/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4-md/yali4/gui/ScrPartitionAuto.py Fri Feb 1 23:41:00 2008 @@ -30,6 +30,9 @@ from yali4.gui.GUIException import * import yali4.gui.context as ctx +# Auto Partition Methods +methodUseAvail, methodEraseAll = range(2) + ## # Partition Choice Widget class Widget(QtGui.QWidget, ScreenWidget): @@ -80,12 +83,10 @@ 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, SIGNAL("clicked()"), - self.slotSelectAuto) - self.connect(self.ui.manual, SIGNAL("clicked()"), - self.slotSelectManual) - self.connect(self.ui.device_list, SIGNAL("itemChanged(QListWidgetItem*)"), - self.slotDeviceChanged) + 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.manual, SIGNAL("clicked()"),self.slotSelectManual) + self.connect(self.ui.device_list, SIGNAL("itemChanged(QListWidgetItem*)"),self.slotDeviceChanged) def shown(self): ctx.mainScreen.disableNext() @@ -94,14 +95,14 @@ def execute(self): ctx.installData.autoPartDev = None - if self.ui.accept_auto.isChecked(): + if self.ui.accept_auto_1.isChecked() or self.ui.accept_auto_2.isChecked(): ctx.installData.autoPartDev = self.device ctx.debugger.log("Automatic Partition selected..") - + if self.ui.accept_auto_2.isChecked(): + ctx.installData.autoPartMethod = methodEraseAll # skip next screen() # We pass the Manual Partitioning screen - num = ctx.mainScreen.getCurrentIndex() + 1 - ctx.mainScreen.goToScreen(num) + ctx.mainScreen.moveInc = 2 return True Modified: branches/yali4-md/yali4/gui/ScreenWidget.py ================================================================= --- branches/yali4-md/yali4/gui/ScreenWidget.py (original) +++ branches/yali4-md/yali4/gui/ScreenWidget.py Fri Feb 1 23:41:00 2008 @@ -25,7 +25,7 @@ return True def backCheck(self): - return True + return False def update(self): pass Modified: branches/yali4-md/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4-md/yali4/gui/YaliDialog.py (original) +++ branches/yali4-md/yali4/gui/YaliDialog.py Fri Feb 1 23:41:00 2008 @@ -87,7 +87,7 @@ QObject.connect(self.windowTitle.pushButton,SIGNAL("clicked()"),self.reject) QMetaObject.connectSlotsByName(self) - self.setStyleSheet("QFrame#windowTitle {background-color:white;border:1px solid #CCC;border-radius:4px;}") + self.setStyleSheet("QFrame#windowTitle {background-color:#70A73C;color:#FFF;border:1px solid #CCC;border-radius:4px;}") class WarningDialog(Dialog): @@ -153,3 +153,9 @@ self.emit(SIGNAL("signalCancel"), ()) +class InformationWindow(QtGui.QWidget): + + def __init__(self, *args): + pass + + Modified: branches/yali4-md/yali4/gui/YaliWindow.py ================================================================= --- branches/yali4-md/yali4/gui/YaliWindow.py (original) +++ branches/yali4-md/yali4/gui/YaliWindow.py Fri Feb 1 23:41:00 2008 @@ -35,6 +35,8 @@ self.screenData = None self.debugShortCut = QtGui.QShortcut(QtGui.QKeySequence(Qt.Key_F2),self.ui) + self.moveInc = 1 + # Dont need help as default self.slotToggleHelp() @@ -70,10 +72,14 @@ def slotNext(self): _w = self.mainStack.currentWidget() _w.execute() - self.stackMove(self.getCur(+1)) + self.stackMove(self.getCur(self.moveInc)) + self.moveInc = 1 def slotBack(self): - self.stackMove(self.getCur(-1)) + _w = self.mainStack.currentWidget() + _w.backCheck() + self.stackMove(self.getCur(self.moveInc * -1)) + self.moveInc = 1 def stackMove(self,new): self.mainStack.setCurrentIndex(new) Modified: branches/yali4-md/yali4/gui/context.py ================================================================= --- branches/yali4-md/yali4/gui/context.py (original) +++ branches/yali4-md/yali4/gui/context.py Fri Feb 1 23:41:00 2008 @@ -18,6 +18,8 @@ from yali4.options import options from yali4.partitionrequest import partrequests +# lock for format request +requestsCompleted = False # bind some constant values # There are more values defined in yali/constants.py! Modified: branches/yali4-md/yali4/gui/installdata.py ================================================================= --- branches/yali4-md/yali4/gui/installdata.py (original) +++ branches/yali4-md/yali4/gui/installdata.py Fri Feb 1 23:41:00 2008 @@ -10,6 +10,9 @@ # Please read the COPYING file. # +# Auto Partition Methods +methodUseAvail, methodEraseAll = range(2) + class InstallData: keyData = None rootPassword = None @@ -17,6 +20,8 @@ users = [] autoLoginUser = None autoPartDev = None + autoPartMethod = methodUseAvail bootLoaderDev = None repoAddr = None useYaliFirstBoot = False + Modified: branches/yali4-md/yali4/partitionrequest.py ================================================================= --- branches/yali4-md/yali4/partitionrequest.py (original) +++ branches/yali4-md/yali4/partitionrequest.py Fri Feb 1 23:41:00 2008 @@ -385,3 +385,4 @@ # partition requests singleton. partrequests = RequestList() + From uludag-commits at pardus.org.tr Fri Feb 1 23:43:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 1 Feb 2008 23:43:24 +0200 (EET) Subject: [Uludag-commits] r16923 - trunk/pisi/pisi/db Message-ID: <20080201214324.516007C0367@liste.uludag.org.tr> Author: cartman Date: Fri Feb 1 23:43:23 2008 New Revision: 16923 Modified: trunk/pisi/pisi/db/filesdb.py Log: Escape the search string before passing it to re module, fixes : [~]> pisi -d sf "/etc/env.d/99libstdc++" /etc/env.d/99libstdc++'i arıyor DEBUG: InstallDB initialized in 0.275934934616. Sistem Hatası: Program Sonlandırıldı. : multiple repeat Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/bin/pisi", line 85, in cli.run_command() File "/usr/lib/pardus/pisi/cli/pisicli.py", line 135, in run_command self.command.run() File "/usr/lib/pardus/pisi/cli/searchfile.py", line 69, in run self.search_file(path) File "/usr/lib/pardus/pisi/cli/searchfile.py", line 46, in search_file found = pisi.api.search_file(path) File "/usr/lib/pardus/pisi/api.py", line 261, in search_file return filesdb.search_file(term) File "/usr/lib/pardus/pisi/db/filesdb.py", line 48, in search_file paths = re.compile("(.*?'%s'.*?)" % term, re.I).findall(files_xml) File "/usr/lib/python2.5/re.py", line 180, in compile return _compile(pattern, flags) File "/usr/lib/python2.5/re.py", line 233, in _compile raise error, v # invalid expression Modified: trunk/pisi/pisi/db/filesdb.py ================================================================= --- trunk/pisi/pisi/db/filesdb.py (original) +++ trunk/pisi/pisi/db/filesdb.py Fri Feb 1 23:43:23 2008 @@ -45,7 +45,7 @@ found = [] for pkg in installdb.list_installed(): files_xml = open(os.path.join(installdb.package_path(pkg), ctx.const.files_xml)).read() - paths = re.compile('(.*?%s.*?)' % term, re.I).findall(files_xml) + paths = re.compile('(.*?%s.*?)' % re.escape(term), re.I).findall(files_xml) if paths: found.append((pkg, paths)) return found From uludag-commits at pardus.org.tr Sat Feb 2 02:35:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 02:35:38 +0200 (EET) Subject: [Uludag-commits] r16924 - branches/yali4/yali4/gui Message-ID: <20080202003538.4E8927C00CD@liste.uludag.org.tr> Author: isbaran Date: Sat Feb 2 02:35:38 2008 New Revision: 16924 Modified: branches/yali4/yali4/gui/DiskWidgets.py Log: partition update'leri garip davranıyor :/ Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Sat Feb 2 02:35:38 2008 @@ -68,6 +68,7 @@ """) self.vbox = QtGui.QVBoxLayout(self) + # FIXME this is a tabwidget not a toolbox, use tabWidget instead self.toolBox = QtGui.QTabWidget(self) self.toolBox.setAutoFillBackground(False) self.toolBox.setFocusPolicy(Qt.NoFocus) @@ -92,6 +93,7 @@ ## # GUI Operations # + # FIXME infinite loop here def updatePartEdit(self, dw): dw.updatePartEdit() @@ -247,7 +249,7 @@ disk = partition.getDevice() flags = t.parted_flags - # There must only one bootable partition on disk + # There must be only one bootable partition on disk if (parted.PARTITION_BOOT in flags) and disk.hasBootablePartition(): flags = list(set(flags) - set([parted.PARTITION_BOOT])) partition.setPartedFlags(flags) From uludag-commits at pardus.org.tr Sat Feb 2 06:08:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 06:08:04 +0200 (EET) Subject: [Uludag-commits] r16925 - trunk/comar/mudur Message-ID: <20080202040804.B273F7C03F6@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 06:08:04 2008 New Revision: 16925 Removed: trunk/comar/mudur/new-coreutils.patch Log: Remove patch From uludag-commits at pardus.org.tr Sat Feb 2 06:08:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 06:08:25 +0200 (EET) Subject: [Uludag-commits] r16926 - trunk/comar/mudur/bin Message-ID: <20080202040825.95ECD8640C9@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 06:08:25 2008 New Revision: 16926 Modified: trunk/comar/mudur/bin/mudur.py Log: Use FHS paths Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Sat Feb 2 06:08:25 2008 @@ -484,7 +484,7 @@ ui.info(_("Restoring saved device states")) for name in os.listdir(devpath): run_quiet( - "/usr/bin/cp", + "/bin/cp", "--preserve=all", "--recursive", "--update", "%s/%s" % (devpath, name), "/dev/" ) @@ -863,8 +863,8 @@ ents.sort(key=proc_key, reverse=True) if ents: - run("/usr/bin/sync") - run("/usr/bin/sync") + run("/bin/sync") + run("/bin/sync") time.sleep(1) ret = 0 @@ -971,8 +971,8 @@ # when we exit this runlevel, init will write a boot record to utmp write("/var/run/utmp", "") touch("/var/log/wtmp") - run("/usr/bin/chgrp", "utmp", "/var/run/utmp", "/var/log/wtmp") - run("/usr/bin/chmod", "0664", "/var/run/utmp", "/var/log/wtmp") + run("/bin/chgrp", "utmp", "/var/run/utmp", "/var/log/wtmp") + run("/bin/chmod", "0664", "/var/run/utmp", "/var/log/wtmp") elif sys.argv[1] == "boot": ui.info(_("Setting up localhost")) From uludag-commits at pardus.org.tr Sat Feb 2 06:08:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 06:08:57 +0200 (EET) Subject: [Uludag-commits] r16927 - trunk/comar/mudur/bin Message-ID: <20080202040857.352EC7C03F6@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 06:08:56 2008 New Revision: 16927 Modified: trunk/comar/mudur/bin/mudur.py Log: pam_console is gone Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Sat Feb 2 06:08:56 2008 @@ -786,17 +786,6 @@ os.chown("/tmp/.X11-unix", 0, 0) os.chmod("/tmp/.X11-unix", 01777) -def resetConPerms(): - # reset console permissions if we are actually using it - if os.path.exists("/sbin/pam_console_apply"): - for pamd in os.listdir("/etc/pam.d"): - data = loadFile(os.path.join("/etc/pam.d", pamd)).split("\n") - m = filter(lambda x: "pam_console" in x and not x.startswith("#"), data) - if len(m) > 0: - run("/sbin/pam_console_apply", "-r") - break - - # # Finalization functions # @@ -988,8 +977,6 @@ ui.info(_("Updating environment variables")) run("/sbin/update-environment") - resetConPerms() - cleanupTmp() startComar() From uludag-commits at pardus.org.tr Sat Feb 2 06:09:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 06:09:35 +0200 (EET) Subject: [Uludag-commits] r16928 - trunk/comar/mudur/bin Message-ID: <20080202040935.8F4CF7C03F6@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 06:09:35 2008 New Revision: 16928 Modified: trunk/comar/mudur/bin/muavin.py trunk/comar/mudur/bin/mudur.py trunk/comar/mudur/bin/network.py trunk/comar/mudur/bin/service.py trunk/comar/mudur/bin/update-environment.py Log: remove trailing space Modified: trunk/comar/mudur/bin/muavin.py ================================================================= --- trunk/comar/mudur/bin/muavin.py (original) +++ trunk/comar/mudur/bin/muavin.py Sat Feb 2 06:09:35 2008 @@ -27,7 +27,7 @@ path = os.path.join(root, "modalias") aliases.append(file(path).read().rstrip("\n")) return aliases - + def _match(self, match, alias, mod): # bu garip fonksiyon pythonun re ve fnmatch modullerinin # acayip yavas olmasindan turedi, 5 sn yerine 0.5 saniyede @@ -52,7 +52,7 @@ if j == -1: return False alias = alias[j:] - + def aliasModules(self, aliases): modules = set() if len(aliases) == 0: @@ -71,7 +71,7 @@ if self._match(a, alias, mod): modules.add(mod) return modules - + def plug(self, current, env=None): aliases = [] if env: @@ -83,7 +83,7 @@ aliases = self.coldAliases() mods = self.aliasModules(aliases) current.update(mods) - + def debug(self): aliases = self.coldAliases() mods = self.aliasModules(aliases) @@ -102,14 +102,14 @@ if id == "PNP0400" or id == "PNP0401": return [ "parport_pc", "lp" ] return [] - + def plug(self, current, env=None): if env: # ISA bus doesn't support hotplugging return - + current.update(self.detect()) - + def debug(self): print "ISAPNP: %s" % ", ".join(self.detect()) @@ -123,7 +123,7 @@ "5": ["sr_mod"], "7": ["sd_mod"], } - + def detect(self, devpath): path = "/sys" + devpath + "/type" # If type information is not ready, wait a bit @@ -131,17 +131,17 @@ while timeout > 0 and not os.path.exists(path): time.sleep(0.1) timeout -= 0.1 - + type = file(path).read().rstrip("\n") return self.modmap.get(type, None) - + def plug(self, current, env=None): if not env or env.get("ACTION", "") != "add" or env.get("SUBSYSTEM", "") != "scsi": return mods = self.detect(env["DEVPATH"]) if mods: current.update(mods) - + def debug(self): pass @@ -156,7 +156,7 @@ loading = devpath + "/loading" if not os.path.exists(loading): time.sleep(1) - + f = file(loading, "w") if not os.path.exists(firm): f.write("-1\n") @@ -169,7 +169,7 @@ f = file(loading, "w") f.write("0\n") f.close() - + def debug(self): pass @@ -200,7 +200,7 @@ self.name = line.split(":")[1].strip() elif line.startswith("flags"): self.flags = line.split(":", 1)[1].strip().split() - + def _find_pci(self, vendor, device): path = "/sys/bus/pci/devices" for item in os.listdir(path): @@ -209,7 +209,7 @@ if ven == vendor and dev == device: return item return None - + def _detect_ich(self): ich = 0 if self._find_pci("0x8086", "0x24cc"): @@ -224,7 +224,7 @@ if not self._find_pci("0x8086", "0x"): ich = 2 return ich - + def _detect_acpi_pps(self): # NOTE: This may not be a correct way to detect this if os.path.exists("/proc/acpi/processor/CPU0/info"): @@ -233,7 +233,7 @@ if line.split(":")[1].strip() == "yes": return True return False - + def detect(self): modules = set() if self.vendor == "GenuineIntel": @@ -256,7 +256,7 @@ # harm than good #elif "acpi" in self.flags and "tm" in self.flags: # modules.add("p4-clockmod") - + elif self.vendor == "AuthenticAMD": # Mobile K6-1/2 CPUs if self.family == 5 and (self.model == 12 or self.model == 13): @@ -267,20 +267,20 @@ # AMD Opteron/Athlon64 elif self.family == 15: modules.add("powernow_k8") - + elif self.vendor == "CentaurHauls": # VIA Cyrix III Longhaul if self.family == 6: if self.model >= 6 and self.model <= 9: modules.add("longhaul") - + elif self.vendor == "GenuineTMx86": # Transmeta LongRun if "longrun" in self.flags: modules.add("longrun") - + return modules - + def plug(self, current, env=None): if env: return @@ -294,7 +294,7 @@ mods.add("cpufreq_powersave") mods.add("cpufreq_ondemand") current.update(mods) - + def debug(self): print "CPU: %s" % ", ".join(self.detect()) @@ -305,7 +305,7 @@ # This card is detected over bttv module's api # If we have a bttv hardware, give the module a chance current.add("dvb_bt8xx") - + def debug(self): pass @@ -354,10 +354,10 @@ if __name__ == "__main__": if len(sys.argv) == 2 and sys.argv[1] == "--debug": debug() - + elif len(sys.argv) == 2 and sys.argv[1] == "--coldplug": plug() - + else: # This file is written by mudur, after loading of modules in the # modules.autoload.d finishes, thus preventing udevtrigger events Modified: trunk/comar/mudur/bin/mudur.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/bin/network.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Sat Feb 2 06:09:35 2008 @@ -59,7 +59,7 @@ "script": _("script"), "server": _("server"), } - + def __init__(self, name, info=None): self.name = name self.running = "" @@ -93,12 +93,12 @@ run_title = _("Status") auto_title = _("Autostart") desc_title = _("Description") - + name_size = max(max(map(lambda x: len(x.name), services)), len(name_title)) run_size = max(max(map(lambda x: len(x.running), services)), len(run_title)) auto_size = max(max(map(lambda x: len(x.autostart), services)), len(auto_title)) desc_size = len(desc_title) - + line = "%s | %s | %s | %s" % ( name_title.center(name_size), run_title.center(run_size), @@ -107,7 +107,7 @@ ) print line print "-" * (len(line)) - + cstart = "" cend = "" if use_color: @@ -134,14 +134,14 @@ data = collect(c) services = filter(lambda x: x.command == "result", data) errors = filter(lambda x: x.command != "result", data) - + if len(services) > 0: services.sort(key=lambda x: x.script) lala = [] for item in services: lala.append(Service(item.script, item.data)) format_service_list(lala, use_color) - + if len(errors) > 0: print map(report_error, errors) @@ -163,27 +163,27 @@ sys.exit(3) print _("Comar service is running.") sys.exit(0) - + if os.getuid() != 0: print _("You should be the root user in order to control the comar service.") sys.exit(1) - + comar_pid = "/var/run/comar.pid" - + if op == "stop" or op == "restart": os.system("/sbin/start-stop-daemon --stop --pidfile %s" % comar_pid) - + timeout = 5 while checkDaemon(comar_pid) and timeout > 0: time.sleep(0.2) timeout -= 0.2 - + if op == "start" or op == "restart": os.system("/sbin/start-stop-daemon -b --start --pidfile %s --make-pidfile --exec /usr/bin/comar" % comar_pid) def manage_service(service, op, use_color=True): c = comlink() - + if op == "start": c.ask_notify("System.Service.changed") c.System.Service[service].start() @@ -202,7 +202,7 @@ manage_service(service, "stop") manage_service(service, "start") return - + while True: reply = c.read_cmd() if reply.command == "result": @@ -218,7 +218,7 @@ if op == "status": sys.exit(4) sys.exit(1) - + if op in ["info", "status", "list"]: s = Service(reply.script, reply.data) format_service_list([s], use_color) @@ -257,7 +257,7 @@ def main(args): operations = ("start", "stop", "info", "list", "restart", "reload", "status", "on", "off") use_color = True - + # Parameters if "--no-color" in args: args.remove("--no-color") @@ -265,26 +265,26 @@ if "-N" in args: args.remove("-N") use_color = False - + # Operations if args == []: list_services(use_color) - + elif args[0] == "list" and len(args) == 1: list_services(use_color) - + elif args[0] == "help": usage() - + elif len(args) < 2: usage() - + elif args[0] == "comar": manage_comar(args[1]) - + elif args[1] in operations: manage_service(args[0], args[1], use_color) - + else: usage() Modified: trunk/comar/mudur/bin/update-environment.py ================================================================= --- trunk/comar/mudur/bin/update-environment.py (original) +++ trunk/comar/mudur/bin/update-environment.py Sat Feb 2 06:09:35 2008 @@ -48,7 +48,7 @@ def read_env_d(envdir): dict = {} - + paths = [] for name in os.listdir(envdir): path = os.path.join(envdir, name) @@ -64,12 +64,12 @@ continue paths.append(path) paths.sort() - + for path in paths: for line in file(path): if line == "" or line.startswith("#"): continue - + line = line.rstrip("\n") if "=" in line: key, value = line.split("=", 1) @@ -77,7 +77,7 @@ value = value.strip() if value.startswith('"') or value.startswith("'"): value = value[1:-1] - + # Merge for special variables, override for others if key in specials: if dict.has_key(key): @@ -86,7 +86,7 @@ dict[key] = value.split(":") else: dict[key] = value - + return dict def generate_profile_env(envdict, format='export %s="%s"\n'): @@ -113,7 +113,7 @@ def update_environment(prefix): join = os.path.join - + env = read_env_d(join(prefix, "etc/env.d")) update_file(join(prefix, "etc/profile.env"), generate_profile_env(env)) update_file(join(prefix, "etc/csh.env"), generate_profile_env(env, 'setenv %s %s\n')) @@ -130,19 +130,19 @@ def main(argv): prefix = "/" - + try: opts, args = getopt.gnu_getopt(argv, "h", [ "help", "destdir=" ]) except getopt.GetoptError: usage() - + for o, a in opts: if o in ("-h", "--help"): usage() sys.exit(0) if o in ("--destdir"): prefix = a - + update_environment(prefix) if __name__ == "__main__": From uludag-commits at pardus.org.tr Sat Feb 2 08:03:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 08:03:53 +0200 (EET) Subject: [Uludag-commits] r16930 - trunk/pisi Message-ID: <20080202060353.4D7047C03AC@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 08:03:53 2008 New Revision: 16930 Removed: trunk/pisi/python-2.5.patch Log: remove patch From uludag-commits at pardus.org.tr Sat Feb 2 08:03:43 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 08:03:43 +0200 (EET) Subject: [Uludag-commits] r16929 - trunk/pisi/pisi Message-ID: <20080202060343.743757C00C5@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 08:03:27 2008 New Revision: 16929 Modified: trunk/pisi/pisi/archive.py Log: Support python 2.5 Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Sat Feb 2 08:03:27 2008 @@ -19,6 +19,7 @@ import tarfile import zipfile import gzip +import struct import gettext __trans = gettext.translation('pisi', fallback=True) @@ -212,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') From uludag-commits at pardus.org.tr Sat Feb 2 10:50:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 10:50:41 +0200 (EET) Subject: [Uludag-commits] r16931 - trunk/pisi/pisi Message-ID: <20080202085041.D8CCA7C0448@liste.uludag.org.tr> Author: cartman Date: Sat Feb 2 10:50:41 2008 New Revision: 16931 Modified: trunk/pisi/pisi/configfile.py Log: fixup flags, mcpu is gone, -Wstrict-overflow is not useful for all apps Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Sat Feb 2 10:50:41 2008 @@ -25,8 +25,8 @@ #host = i686-pc-linux-gnu #generateDebug = False #jobs = "-j1" -#CFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow -#CXXFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow +#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer +#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer #LDFLAGS= #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream From uludag-commits at pardus.org.tr Sat Feb 2 15:06:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 15:06:27 +0200 (EET) Subject: [Uludag-commits] r16932 - trunk/comar/mudur/bin Message-ID: <20080202130628.0D0A67C0444@liste.uludag.org.tr> Author: bahadir.kandemir Date: Sat Feb 2 15:06:27 2008 New Revision: 16932 Modified: trunk/comar/mudur/bin/network.py Log: BUG:COMMENT:6904 Show device name in connection list Modified: trunk/comar/mudur/bin/network.py ================================================================= --- trunk/comar/mudur/bin/network.py (original) +++ trunk/comar/mudur/bin/network.py Sat Feb 2 15:06:27 2008 @@ -260,12 +260,14 @@ profiles.sort(key=lambda x: x.devname + x.name) #profiles are sorted by device_name + name name_title = "" # _("Profile") + dev_title = "" # _("Device") state_title = "" # _("Status") addr_title = "" # _("Address") #name_size and state_size are set to the maximum length of name/state of profiles # -for ljust operations in output format- name_size = max(max(map(lambda x: len(x.name), profiles)), len(name_title)) + device_size = max(max(map(lambda x: len(x.devname.rsplit("(")[-1][:-1]), profiles)), len(dev_title)) state_size = max(max(map(lambda x: len(x.get_state()), profiles)), len(state_title)) cstart = "" @@ -278,10 +280,12 @@ if len(link_profiles) > 0: print "%s:" % link.name for profile in link_profiles: - line = " %s%s%s | %s%s%s | %s%s%s" % ( + line = " %s%s%s | %s%s%s | %s%s%s | %s%s%s" % ( cstart, profile.name.ljust(name_size), cend, cstart, + profile.devname.rsplit("(")[-1][:-1].ljust(device_size), + cend, cstart, profile.get_state().center(state_size), cend, cstart, profile.get_address(), From uludag-commits at pardus.org.tr Sat Feb 2 19:44:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 19:44:32 +0200 (EET) Subject: [Uludag-commits] r16933 - in branches/pisi-1.1/pisi: . cli pxml Message-ID: <20080202174432.4F1307C0473@liste.uludag.org.tr> Author: caglar Date: Sat Feb 2 19:44:31 2008 New Revision: 16933 Modified: branches/pisi-1.1/pisi/api.py branches/pisi-1.1/pisi/archive.py branches/pisi-1.1/pisi/atomicoperations.py branches/pisi-1.1/pisi/build.py branches/pisi-1.1/pisi/cli/commands.py branches/pisi-1.1/pisi/comariface.py branches/pisi-1.1/pisi/component.py branches/pisi-1.1/pisi/configfile.py branches/pisi-1.1/pisi/metadata.py branches/pisi-1.1/pisi/operations.py branches/pisi-1.1/pisi/package.py branches/pisi-1.1/pisi/packagedb.py branches/pisi-1.1/pisi/pxml/autoxml.py branches/pisi-1.1/pisi/util.py Log: trailing whitespace Modified: branches/pisi-1.1/pisi/api.py ================================================================= --- branches/pisi-1.1/pisi/api.py (original) +++ branches/pisi-1.1/pisi/api.py Sat Feb 2 19:44:31 2008 @@ -52,10 +52,10 @@ comar_sockname = None, signal_handling = True): """Initialize PiSi subsystem. - + You should call finalize() when your work is finished. Otherwise you can left the database in a bad state. - + """ # UI comes first @@ -171,10 +171,10 @@ def package_graph(A, repo = pisi.itembyrepodb.installed, ignore_installed = False): """Construct a package relations graph. - + Graph will contain all dependencies of packages A, if ignore_installed option is True, then only uninstalled deps will be added. - + """ ctx.ui.debug('A = %s' % str(A)) @@ -184,7 +184,7 @@ G_f = pgraph.PGraph(ctx.packagedb, repo) # construct G_f - # find the "install closure" graph of G_f by package + # find the "install closure" graph of G_f by package # set A using packagedb for x in A: G_f.add_package(x) @@ -225,7 +225,7 @@ def generate_base_upgrade(A): # all the packages of the system.base must be installed on the system. - # method returns the currently needed system.base component install and + # method returns the currently needed system.base component install and # upgrade needs base = upgrade_base(A, ignore_package_conflicts = True) return list(base) Modified: branches/pisi-1.1/pisi/archive.py ================================================================= --- branches/pisi-1.1/pisi/archive.py (original) +++ branches/pisi-1.1/pisi/archive.py Sat Feb 2 19:44:31 2008 @@ -137,7 +137,7 @@ # accessed. Removing and creating the file will also # change the inode and will do the trick (in fact, old # file will be deleted only when its closed). - # + # # Also, tar.extract() doesn't write on symlinks... Not any # more :). if self.file_path == install_tar_path: Modified: branches/pisi-1.1/pisi/atomicoperations.py ================================================================= --- branches/pisi-1.1/pisi/atomicoperations.py (original) +++ branches/pisi-1.1/pisi/atomicoperations.py Sat Feb 2 19:44:31 2008 @@ -163,14 +163,14 @@ # If it is explicitly specified that package conflicts with this package and also # we passed check_conflicts tests in operations.py than this means a non-conflicting - # pkg is in "order" to be installed that has no file conflict problem with this package. + # pkg is in "order" to be installed that has no file conflict problem with this package. # PS: we need this because "order" generating code does not consider conflicts. def really_conflicts(pkg): if not self.pkginfo.conflicts: return True return not pkg in map(lambda x:x.package, self.pkginfo.conflicts) - + # check file conflicts file_conflicts = [] for f in self.files.list: @@ -312,22 +312,22 @@ # may contain same config typed files with same hashes, so the delta # package will not have that config file. In order to protect user # changed config files, they are renamed with ".old" prefix in case - # of the hashes of these files on the filesystem and the new config + # of the hashes of these files on the filesystem and the new config # file that is coming from the new package. But in delta package case # with the given scenario there wont be any, so we can pass this one. # If the config files were not be the same between these packages the # delta package would have it and extract it and the path would point - # to that new config file. If they are same and the user had changed - # that file and using the changed config file, there is no problem + # to that new config file. If they are same and the user had changed + # that file and using the changed config file, there is no problem # here. if os.path.exists(path): os.rename(path, newconfig) os.rename(oldconfig, path) - # Delta package does not contain the files that have the same hash as in - # the old package's. Because it means the file has not changed. But some - # of these files may be relocated to some other directory in the new package. + # Delta package does not contain the files that have the same hash as in + # the old package's. Because it means the file has not changed. But some + # of these files may be relocated to some other directory in the new package. # We handle these cases here. def relocate_files(): for old_file, new_file in pisi.delta.find_relocations(self.old_files, self.files): @@ -337,7 +337,7 @@ if not os.path.exists(destdir): os.makedirs(destdir) - if os.path.islink(old_path): + if os.path.islink(old_path): if not os.path.lexists(new_path): os.symlink(os.readlink(old_path), new_path) else: Modified: branches/pisi-1.1/pisi/build.py ================================================================= --- branches/pisi-1.1/pisi/build.py (original) +++ branches/pisi-1.1/pisi/build.py Sat Feb 2 19:44:31 2008 @@ -454,7 +454,7 @@ else: if mandatory: raise Error(_("unable to call function from actions: %s") % func) - + os.chdir(curDir) return True Modified: branches/pisi-1.1/pisi/cli/commands.py ================================================================= --- branches/pisi-1.1/pisi/cli/commands.py (original) +++ branches/pisi-1.1/pisi/cli/commands.py Sat Feb 2 19:44:31 2008 @@ -528,7 +528,7 @@ def run(self): - from pisi.delta import create_delta_package + from pisi.delta import create_delta_package self.init(database=False, write=False) Modified: branches/pisi-1.1/pisi/comariface.py ================================================================= --- branches/pisi-1.1/pisi/comariface.py (original) +++ branches/pisi-1.1/pisi/comariface.py Sat Feb 2 19:44:31 2008 @@ -31,14 +31,14 @@ def get_comar(): """Connect to the comar daemon and return the handle""" - + sockname = "/var/run/comar.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 - + # This function is sometimes called when comar has recently started # or restarting after an update. So we give comar a chance to become # active in a reasonable time. @@ -75,7 +75,7 @@ if ctx.keyboard_interrupt_pending(): return raise Error, _("connection with comar unexpectedly closed") - + cmd = reply[0] if cmd == com.RESULT and not multiple: return @@ -95,22 +95,22 @@ def post_install(package_name, provided_scripts, scriptpath, metapath, filepath): """Do package's post install operations""" - + ctx.ui.info(_("Configuring %s package") % package_name) self_post = False com = get_comar() - + 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) - + ctx.ui.debug(_("Calling post install handlers")) com.call("System.PackageHandler.setupPackage", [ "metapath", metapath, "filepath", filepath ]) wait_for_result(com) - + if self_post: ctx.ui.debug(_("Running package's post install script")) com.call_package("System.Package.postInstall", package_name) @@ -118,18 +118,18 @@ 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() - + ctx.ui.debug(_("Running package's pre remove script")) com.call_package("System.Package.preRemove", package_name) wait_for_result(com) - + ctx.ui.debug(_("Calling pre remove handlers")) com.call("System.PackageHandler.cleanupPackage", [ "metapath", metapath, "filepath", filepath ]) wait_for_result(com) - + ctx.ui.debug(_("Unregistering comar scripts")) com.remove(package_name) wait_for_result(com) Modified: branches/pisi-1.1/pisi/component.py ================================================================= --- branches/pisi-1.1/pisi/component.py (original) +++ branches/pisi-1.1/pisi/component.py Sat Feb 2 19:44:31 2008 @@ -132,9 +132,9 @@ # walk: walks through the underlying components' packages def get_union_packages(self, component_name, walk=False, repo=pisi.itembyrepodb.repos, txn = None): - """returns union of all repository component's packages, not just the first repo's + """returns union of all repository component's packages, not just the first repo's component's in order""" - + component = self.get_union_comp(component_name, txn, repo) if not walk: return component.packages @@ -149,7 +149,7 @@ # walk: walks through the underlying components' packages def get_packages(self, component_name, walk=False, repo=None, txn = None): """returns the given component's and underlying recursive components' packages""" - + component = self.get_component(component_name, repo, txn) if not walk: return component.packages Modified: branches/pisi-1.1/pisi/configfile.py ================================================================= --- branches/pisi-1.1/pisi/configfile.py (original) +++ branches/pisi-1.1/pisi/configfile.py Sat Feb 2 19:44:31 2008 @@ -192,7 +192,7 @@ r'(?P\s*)' r'(?P.*)$' ) - + fp = open(self.filePath, "r+") # Default to " = " to match write(), but use the most recent # separator found if the file has any options. @@ -299,4 +299,4 @@ fp.write(sect.getvalue()) fp.close() - + Modified: branches/pisi-1.1/pisi/metadata.py ================================================================= --- branches/pisi-1.1/pisi/metadata.py (original) +++ branches/pisi-1.1/pisi/metadata.py Sat Feb 2 19:44:31 2008 @@ -29,7 +29,7 @@ class Delta: __metaclass__ = autoxml.autoxml - + t_PackageURI = [ autoxml.String, autoxml.optional] t_PackageSize = [ autoxml.Long, autoxml.optional] t_PackageHash = [ autoxml.String, autoxml.optional, "SHA1Sum" ] Modified: branches/pisi-1.1/pisi/operations.py ================================================================= --- branches/pisi-1.1/pisi/operations.py (original) +++ branches/pisi-1.1/pisi/operations.py Sat Feb 2 19:44:31 2008 @@ -266,7 +266,7 @@ raise except Exception, e: #FIXME: what exception could we catch here, replace with that. return False - + if ignore_build or (not build) or (not pkg.build): return pisi.version.Version(release) < pisi.version.Version(pkg.release) else: @@ -448,7 +448,7 @@ ctx.ui.info(_('Package %s is already at the latest build %s.') % (pkg.name, pkg.build), True) - + A = set(Ap) if len(A)==0: @@ -506,7 +506,7 @@ remove_replaced_packages(order, replaces) remove_obsoleted_packages() - + for path in paths: ctx.ui.info(util.colorize(_("Installing %d / %d") % (paths.index(path)+1, len(paths)), "yellow")) install_op = atomicoperations.Install(path, ignore_file_conflicts = True) @@ -539,7 +539,7 @@ # add packages that can be upgraded if ctx.installdb.is_installed(dep.package) and dependency.installed_satisfies_dep(dep): continue - + if dependency.repo_satisfies_dep(dep): if not dep.package in G_f.vertices(): Bp.add(str(dep.package)) @@ -547,7 +547,7 @@ else: ctx.ui.error(_('Dependency %s of %s cannot be satisfied') % (dep, x)) raise Error(_("Upgrade is not possible.")) - + B = Bp # now, search reverse dependencies to see if anything # should be upgraded Modified: branches/pisi-1.1/pisi/package.py ================================================================= --- branches/pisi-1.1/pisi/package.py (original) +++ branches/pisi-1.1/pisi/package.py Sat Feb 2 19:44:31 2008 @@ -99,7 +99,7 @@ self.impl.unpack_dir_flat(dir, outdir) def extract_to(self, outdir, clean_dir = False): - """Extracts contents of the archive to outdir. Before extracting if clean_dir + """Extracts contents of the archive to outdir. Before extracting if clean_dir is set, outdir is deleted with its contents""" self.impl.unpack(outdir, clean_dir) Modified: branches/pisi-1.1/pisi/packagedb.py ================================================================= --- branches/pisi-1.1/pisi/packagedb.py (original) +++ branches/pisi-1.1/pisi/packagedb.py Sat Feb 2 19:44:31 2008 @@ -77,7 +77,7 @@ replaces = self.get_replaces(repo) return set(str(o) for o in obsoletes) - set(replaces.keys()) - + # replacesdb holds the info about the replaced packages (ex. gaim -> pidgin) def get_replaces(self, repo = None): pairs = {} @@ -88,7 +88,7 @@ pairs[r.package] = pkg_name return pairs - + def get_rev_deps(self, name, repo = None, txn = None): if self.dr.has_key(name, repo, txn=txn): return self.dr.get_item(name, repo, txn=txn) @@ -127,7 +127,7 @@ if package_info.replaces: self.drp.add_item(name, package_info.replaces, repo, txn) - + # add component ctx.componentdb.add_package(package_info.partOf, package_info.name, repo, txn) Modified: branches/pisi-1.1/pisi/pxml/autoxml.py ================================================================= --- branches/pisi-1.1/pisi/pxml/autoxml.py (original) +++ branches/pisi-1.1/pisi/pxml/autoxml.py Sat Feb 2 19:44:31 2008 @@ -270,7 +270,7 @@ errorss = [] formatters = [] - # FIXME: What is this? Remove this crap and try to fix autoxml, if can not be fixed then + # FIXME: What is this? Remove this crap and try to fix autoxml, if can not be fixed then # really throw whole autoxml to junk. But not this. # read declaration order from source @@ -440,7 +440,7 @@ def read(self, uri, keepDoc = False, tmpDir = '/tmp', sha1sum = False, compress = None, sign = None, copylocal = False): "read XML file and decode it into a python object" - self.readxml(uri, tmpDir, sha1sum=sha1sum, + self.readxml(uri, tmpDir, sha1sum=sha1sum, compress=compress, sign=sign, copylocal=copylocal) errs = [] self.decode(self.rootNode(), errs) Modified: branches/pisi-1.1/pisi/util.py ================================================================= --- branches/pisi-1.1/pisi/util.py (original) +++ branches/pisi-1.1/pisi/util.py Sat Feb 2 19:44:31 2008 @@ -241,9 +241,9 @@ def join_path(a, *p): """Join two or more pathname components. - + Python os.path.join cannot handle '/' at the start of latter components. - + """ path = a for b in p: @@ -344,7 +344,7 @@ # We pad them with zeroes, thus hash will be stable clean_ar_timestamps(path) value = sha1_file(path) - + return (path, value) def get_file_hashes(top, excludePrefix=None, removePrefix=None): @@ -355,20 +355,20 @@ if len(filter(lambda x: temp.startswith(x), excludePrefix)) > 0: return False return True - + # single file/symlink case if not os.path.isdir(top) or os.path.islink(top): if is_included(top): yield calculate_hash(top) return - + for root, dirs, files in os.walk(top): # Hash files and file symlinks for name in files: path = os.path.join(root, name) if is_included(path): yield calculate_hash(path) - + # Hash symlink dirs # os.walk doesn't enter them, we don't want to follow them either # but their name and hashes must be reported @@ -378,7 +378,7 @@ if os.path.islink(path): if is_included(path): yield calculate_hash(path) - + # Hash empty dir # Discussed in bug #340 if len(files) == 0 and len(dirs) == 0: @@ -573,9 +573,9 @@ def is_package_name(fn, package_name = None): """Check if fn is a valid filename for given package_name. - + If not given a package name, see if fn fits the package name rules - + """ if (package_name==None) or fn.startswith(package_name + '-'): if fn.endswith(ctx.const.package_suffix): @@ -591,9 +591,9 @@ def parse_package_name(package_name): """Separate package name and version string. - + example: tasma-1.0.3-5-2 -> (tasma, 1.0.3-5-2) - + """ # We should handle package names like 855resolution name = [] @@ -609,14 +609,14 @@ def parse_delta_package_name(package_name): """Separate delta package name and release infos - + example: tasma-5-7.pisi.delta -> (tasma, 5, 7) - + """ name, build = parse_package_name(package_name) build = build[:-len(ctx.const.delta_package_suffix)] buildFrom, buildTo = build.split("-") - + return name, buildFrom, buildTo def filter_latest_packages(package_paths): From uludag-commits at pardus.org.tr Sat Feb 2 20:04:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 2 Feb 2008 20:04:15 +0200 (EET) Subject: [Uludag-commits] r16934 - trunk/pisi/po Message-ID: <20080202180415.3A9B47C0447@liste.uludag.org.tr> Author: wpmhia Date: Sat Feb 2 20:04:14 2008 New Revision: 16934 Modified: trunk/pisi/po/nl.po Log: Modified: trunk/pisi/po/nl.po ================================================================= --- trunk/pisi/po/nl.po (original) +++ trunk/pisi/po/nl.po Sat Feb 2 20:04:14 2008 @@ -2,16 +2,15 @@ # Andre van der Lubben , 2006. # Willem Gielen , 2006, 2007. # Rinse de Vries , 2006. -# W.P.M.H.I.A. Gielen , 2006, 2007. -# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +# W.P.M.H.I.A. Gielen , 2006, 2007, 2008. +# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. msgid "" msgstr "" "Project-Id-Version: nl\n" "POT-Creation-Date: 2008-01-31 16:42+EET\n" -"PO-Revision-Date: 2007-11-24 12:15+0100\n" +"PO-Revision-Date: 2008-02-02 19:03+0100\n" "Last-Translator: W.P.M.H.I.A. Gielen \n" -"Language-Team: Nederlands \n" +"Language-Team: Nederlands \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -752,7 +751,7 @@ #: pisi/api.py:492 msgid "%s repository information is up-to-date." -msgstr "" +msgstr "%s repository informatie is nog recent." #: pisi/api.py:494 msgid "Updating database at any rate as requested" @@ -884,8 +883,7 @@ msgstr "Niet verwijderen conflicterend bestand: %s" #: pisi/atomicoperations.py:529 -msgid "" -"Installed file %s is not exists on system [Probably you manually deleted]" +msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Geïnstalleerd bestand %s bestaat niet op systeem [mogelijk met de hand " "verwijderd]" @@ -977,8 +975,7 @@ msgstr "Maak een statisch pakket met ar-bestanden aan" #: pisi/cli/build.py:70 -msgid "" -"Do not install build dependencies, fail if a build dependency is present" +msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "" "Installeer geen bouwafhankelijkheden, stoppen als zich een " "compileerafhankelijkheid voordoet" @@ -1348,8 +1345,7 @@ # pisi/cli/commands.py:542 :729 #: pisi/cli/listinstalled.py:65 pisi/cli/listupgrades.py:69 -msgid "" -"Package Name |St| Version| Rel.| Build| Distro| Date" +msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "Pakketnaam |St| Versie| Rel.| Bouw | Distro| Datum" #: pisi/cli/listpending.py:43 @@ -1855,8 +1851,7 @@ msgstr "kan functie niet aanroepen vanuit actions: %s" #: pisi/operations/build.py:482 -msgid "" -"Safety switch: following extra packages in system.devel will be installed: " +msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Veiligheidsprocedure: de volgende extra pakketten in system.devel zullen " "geïnstalleerd worden:" @@ -1967,10 +1962,8 @@ msgstr "Verlaten bestanden in de installatiemap (%s):" #: pisi/operations/build.py:932 -msgid "" -"All of the files under the install dir (%s) has been collected by package(s)" -msgstr "" -"Alle bestanden in de installatiemap (%s) zijn verzameld door pakket(ten)." +msgid "All of the files under the install dir (%s) has been collected by package(s)" +msgstr "Alle bestanden in de installatiemap (%s) zijn verzameld door pakket(ten)." #: pisi/operations/build.py:936 msgid "Cleaning Build Directory..." @@ -2404,9 +2397,8 @@ msgstr "Commando 'strip' mislukte voor bestand '%s'!" #: pisi/util.py:533 -#, fuzzy msgid "chrpath command failed for file '%s'!" -msgstr "Commando 'strip' mislukte voor bestand '%s'!" +msgstr "chrpath commando 'mislukte voor bestand '%s'!" #: pisi/util.py:540 msgid "objcopy (keep-debug) command failed for file '%s'!" @@ -2437,10 +2429,8 @@ "%s\n" #: scripts/repostats.py:371 -msgid "" -"Developer '%s <%s>' has another mail address '%s' in source package '%s'" -msgstr "" -"Ontwikkelaar '%s <%s>' heeft een ander e-mailadres '%s' in bronpakket '%s'" +msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "Ontwikkelaar '%s <%s>' heeft een ander e-mailadres '%s' in bronpakket '%s'" #: scripts/repostats.py:467 msgid "" @@ -2466,5 +2456,3 @@ msgid "Scanning binary packages...\n" msgstr "Scannen binaire pakketten...\n" -#~ msgid "No updates available for repository %s." -#~ msgstr "Geen bijgewerkte pakketten in repository %s." From uludag-commits at pardus.org.tr Sun Feb 3 00:14:46 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 3 Feb 2008 00:14:46 +0200 (EET) Subject: [Uludag-commits] r16936 - in branches/yali4/yali4: . gui gui/pics Message-ID: <20080202221446.0DAA77C031D@liste.uludag.org.tr> Author: gokmen.goksel Date: Sun Feb 3 00:14:45 2008 New Revision: 16936 Added: branches/yali4/yali4/gui/pics/working.png (contents, props changed) Modified: branches/yali4/yali4/data.qrc branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/YaliDialog.py Log: * Use QSplash as information Window.. Modified: branches/yali4/yali4/data.qrc ================================================================= --- branches/yali4/yali4/data.qrc (original) +++ branches/yali4/yali4/data.qrc Sun Feb 3 00:14:45 2008 @@ -34,6 +34,7 @@ gui/pics/users.png gui/pics/welcome.png gui/pics/windows.png + gui/pics/working.png images/checkbox_checked.png images/checkbox_checked_hover.png images/checkbox_checked_pressed.png Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Sun Feb 3 00:14:45 2008 @@ -29,8 +29,7 @@ from yali4.gui.ScreenWidget import ScreenWidget from yali4.gui.Ui.bootloaderwidget import Ui_BootLoaderWidget -from yali4.gui.YaliDialog import WarningDialog, WarningWidget -#from yali4.gui.InformationWindow import InformationWindow +from yali4.gui.YaliDialog import WarningDialog, WarningWidget, InformationWindow from yali4.gui.GUIException import * import yali4.gui.context as ctx @@ -178,16 +177,19 @@ return False ctx.mainScreen.processEvents() + info = InformationWindow(_("Writing disk tables ...")) # We should do partitioning operations in here. # Auto Partitioning if ctx.installData.autoPartDev: + info.show() ctx.partrequests.remove_all() ctx.use_autopart = True - # self.autopartDevice() - time.sleep(1) - #ctx.partrequests.applyAll() + self.autopartDevice() + time.sleep(2) + info.updateMessage(_("Formatting ...")) + ctx.partrequests.applyAll() # Manual Partitioning else: @@ -197,12 +199,15 @@ dev.commit() # wait for udev to create device nodes time.sleep(2) + info.updateMessage(_("Formatting ...")) ctx.mainScreen.processEvents() ctx.partrequests.applyAll() ctx.debugger.log("Format Operation Finished") ctx.mainScreen.processEvents() self.checkSwap() + info.close() + root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root, request.mountRequestType) Modified: branches/yali4/yali4/gui/YaliDialog.py ================================================================= --- branches/yali4/yali4/gui/YaliDialog.py (original) +++ branches/yali4/yali4/gui/YaliDialog.py Sun Feb 3 00:14:45 2008 @@ -153,9 +153,14 @@ self.emit(SIGNAL("signalCancel"), ()) -class InformationWindow(QtGui.QWidget): +class InformationWindow(QtGui.QSplashScreen): - def __init__(self, *args): - pass + def __init__(self, message): + Pix = QtGui.QPixmap(':/gui/pics/working.png') + QtGui.QSplashScreen.__init__(self, ctx.mainScreen.ui, Pix) + self.updateMessage(message) + ctx.mainScreen.processEvents() + def updateMessage(self, message): + self.showMessage(message,Qt.AlignBottom | Qt.AlignHCenter) From uludag-commits at pardus.org.tr Sun Feb 3 23:01:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 3 Feb 2008 23:01:34 +0200 (EET) Subject: [Uludag-commits] r16937 - trunk/pisi/pisi Message-ID: <20080203210134.F4178864236@liste.uludag.org.tr> Author: cartman Date: Sun Feb 3 23:01:33 2008 New Revision: 16937 Modified: trunk/pisi/pisi/configfile.py Log: 2008 için üzerinde anlaşılan C(XX)FLAGS, LDFLAGS -Wl,-z,relro kısmı bizim Çağlar'la önceden konuştuğumuz birşeydi. Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Sun Feb 3 23:01:33 2008 @@ -25,9 +25,9 @@ #host = i686-pc-linux-gnu #generateDebug = False #jobs = "-j1" -#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -#LDFLAGS= +#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie +#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie +#LDFLAGS= -pie -Wl,-O1 -Wl,--hash-style=both -Wl,-z,relro #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 From uludag-commits at pardus.org.tr Sun Feb 3 23:02:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 3 Feb 2008 23:02:11 +0200 (EET) Subject: [Uludag-commits] r16938 - trunk/pisi/pisi Message-ID: <20080203210211.B18CB864236@liste.uludag.org.tr> Author: cartman Date: Sun Feb 3 23:02:11 2008 New Revision: 16938 Modified: trunk/pisi/pisi/configfile.py Log: hash style işini gcc yapıyor, Redhat'ten aldığımız yama ile Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Sun Feb 3 23:02:11 2008 @@ -27,7 +27,7 @@ #jobs = "-j1" #CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie #CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -#LDFLAGS= -pie -Wl,-O1 -Wl,--hash-style=both -Wl,-z,relro +#LDFLAGS= -pie -Wl,-z,relro #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 From uludag-commits at pardus.org.tr Sun Feb 3 23:04:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 3 Feb 2008 23:04:54 +0200 (EET) Subject: [Uludag-commits] r16939 - trunk/pisi/pisi Message-ID: <20080203210454.E08B5864A02@liste.uludag.org.tr> Author: cartman Date: Sun Feb 3 23:04:46 2008 New Revision: 16939 Modified: trunk/pisi/pisi/configfile.py Log: defaultlar da düzelse süper olacak Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Sun Feb 3 23:04:46 2008 @@ -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 -fpie" + cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie" + ldflags = "-pie -Wl,-z,relro" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Sun Feb 3 23:07:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 3 Feb 2008 23:07:21 +0200 (EET) Subject: [Uludag-commits] r16940 - trunk/pisi/pisi Message-ID: <20080203210721.AD8AE864236@liste.uludag.org.tr> Author: cartman Date: Sun Feb 3 23:07:21 2008 New Revision: 16940 Modified: trunk/pisi/pisi/configfile.py Log: -Wl,-O1 yeme, %40 a kadar optimizasyon sağlıyor kendisi Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Sun Feb 3 23:07:21 2008 @@ -27,7 +27,7 @@ #jobs = "-j1" #CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie #CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -#LDFLAGS= -pie -Wl,-z,relro +#LDFLAGS= -pie -Wl,-O1 -Wl,-z,relro #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -80,7 +80,7 @@ generateDebug = False cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie" cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie" - ldflags = "-pie -Wl,-z,relro" + ldflags = "-pie -Wl,-O1 -Wl,-z,relro" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Mon Feb 4 00:16:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 00:16:27 +0200 (EET) Subject: [Uludag-commits] r16941 - trunk/pisi/pisi Message-ID: <20080203221627.228FD864236@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 00:16:26 2008 New Revision: 16941 Modified: trunk/pisi/pisi/configfile.py Log: enable fortify source Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 00:16:26 2008 @@ -25,8 +25,8 @@ #host = i686-pc-linux-gnu #generateDebug = False #jobs = "-j1" -#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie +#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2 +#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2 #LDFLAGS= -pie -Wl,-O1 -Wl,-z,relro #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream @@ -78,8 +78,8 @@ host = "i686-pc-linux-gnu" jobs = "-j1" generateDebug = False - cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie" - cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie" + cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2" + cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2" ldflags = "-pie -Wl,-O1 -Wl,-z,relro" buildno = False buildhelper = None From uludag-commits at pardus.org.tr Mon Feb 4 00:45:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 00:45:52 +0200 (EET) Subject: [Uludag-commits] r16942 - trunk/pisi/pisi Message-ID: <20080203224552.1A92E7C011C@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 00:45:51 2008 New Revision: 16942 Modified: trunk/pisi/pisi/configfile.py Log: pie & pic is NOT compatible, revert this Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 00:45:51 2008 @@ -25,9 +25,9 @@ #host = i686-pc-linux-gnu #generateDebug = False #jobs = "-j1" -#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2 -#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2 -#LDFLAGS= -pie -Wl,-O1 -Wl,-z,relro +#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 #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -78,9 +78,9 @@ host = "i686-pc-linux-gnu" jobs = "-j1" generateDebug = False - cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2" - cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -fpie -D_FORTIFY_SOURCE=2" - ldflags = "-pie -Wl,-O1 -Wl,-z,relro" + 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" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Mon Feb 4 01:50:43 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 01:50:43 +0200 (EET) Subject: [Uludag-commits] r16943 - trunk/pisi/pisi Message-ID: <20080203235043.9B9F77C043D@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 01:50:43 2008 New Revision: 16943 Modified: trunk/pisi/pisi/archive.py Log: nice try Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Mon Feb 4 01:50:43 2008 @@ -196,7 +196,7 @@ ret, out, err = util.run_batch(batch) if ret != 0: - raise LzmaRunTimeError(err) + raise LzmaRuntimeError(err) class MyZipFile(zipfile.ZipFile): From uludag-commits at pardus.org.tr Mon Feb 4 09:20:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 09:20:09 +0200 (EET) Subject: [Uludag-commits] r16944 - trunk/pisi/pisi Message-ID: <20080204072009.202487C04B9@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 09:19:57 2008 New Revision: 16944 Modified: trunk/pisi/pisi/configfile.py Log: Add --hash-style=gnu just in case but gcc should be handling this already Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 09:19:57 2008 @@ -27,7 +27,7 @@ #jobs = "-j1" #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 +#LDFLAGS= -Wl,-O1 -Wl,-z,relro --hash-style=gnu #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -80,7 +80,7 @@ generateDebug = False 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" + ldflags = "-Wl,-O1 -Wl,-z,relro --hash-style=gnu" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Mon Feb 4 09:21:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 09:21:15 +0200 (EET) Subject: [Uludag-commits] r16945 - trunk/pisi/pisi Message-ID: <20080204072115.26B4A7C04B9@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 09:21:14 2008 New Revision: 16945 Modified: trunk/pisi/pisi/configfile.py Log: bump for Pardus 2008 Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 09:21:14 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 @@ -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 From uludag-commits at pardus.org.tr Mon Feb 4 09:43:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 09:43:04 +0200 (EET) Subject: [Uludag-commits] r16946 - trunk/pisi/pisi Message-ID: <20080204074304.4C8E286C90E@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 09:43:04 2008 New Revision: 16946 Modified: trunk/pisi/pisi/configfile.py Log: linker options should be prefixed by -Wl, Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 09:43:04 2008 @@ -27,7 +27,7 @@ #jobs = "-j1" #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 --hash-style=gnu +#LDFLAGS= -Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -80,7 +80,7 @@ generateDebug = False 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 --hash-style=gnu" + ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Mon Feb 4 10:15:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 10:15:06 +0200 (EET) Subject: [Uludag-commits] r16947 - trunk/pisi/pisi/actionsapi Message-ID: <20080204081506.8653086C87E@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 10:15:06 2008 New Revision: 16947 Modified: trunk/pisi/pisi/actionsapi/autotools.py Log: if you find an ltmain.sh be sure to run libtoolize --copy --force so our libtool is used instead of some buggy version Modified: trunk/pisi/pisi/actionsapi/autotools.py ================================================================= --- trunk/pisi/pisi/actionsapi/autotools.py (original) +++ trunk/pisi/pisi/actionsapi/autotools.py Mon Feb 4 10:15:06 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=''): @@ -58,6 +59,9 @@ if can_access_file('configure'): gnuconfig_update() + if can_access_file('ltmain.sh'): + libtoolize("--copy --force") + args = './configure \ --prefix=/%s \ --build=%s \ From uludag-commits at pardus.org.tr Mon Feb 4 10:38:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 10:38:19 +0200 (EET) Subject: [Uludag-commits] r16948 - trunk/pisi/pisi Message-ID: <20080204083819.6D2777C0467@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 10:38:19 2008 New Revision: 16948 Modified: trunk/pisi/pisi/util.py Log: disable chrpath here too Modified: trunk/pisi/pisi/util.py ================================================================= --- trunk/pisi/pisi/util.py (original) +++ trunk/pisi/pisi/util.py Mon Feb 4 10:38:19 2008 @@ -563,7 +563,7 @@ check_dir(os.path.dirname(outpath)) save_elf_debug(filepath, outpath) run_strip(filepath, "--strip-unneeded") - run_chrpath(filepath) + # run_chrpath(filepath) # FIXME: warn for TEXTREL return True From uludag-commits at pardus.org.tr Mon Feb 4 11:27:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 11:27:15 +0200 (EET) Subject: [Uludag-commits] r16949 - trunk/pisi/pisi/actionsapi Message-ID: <20080204092715.3F39A7C00B4@liste.uludag.org.tr> Author: cartman Date: Mon Feb 4 11:27:14 2008 New Revision: 16949 Modified: trunk/pisi/pisi/actionsapi/autotools.py Log: Oops don't raise an error if ltmain.sh is not found Modified: trunk/pisi/pisi/actionsapi/autotools.py ================================================================= --- trunk/pisi/pisi/actionsapi/autotools.py (original) +++ trunk/pisi/pisi/actionsapi/autotools.py Mon Feb 4 11:27:14 2008 @@ -56,12 +56,13 @@ def configure(parameters = ''): '''configure source with given parameters = "--with-nls --with-libusb --with-something-usefull"''' - if can_access_file('configure'): - gnuconfig_update() if can_access_file('ltmain.sh'): libtoolize("--copy --force") + if can_access_file('configure'): + gnuconfig_update() + args = './configure \ --prefix=/%s \ --build=%s \ From uludag-commits at pardus.org.tr Mon Feb 4 12:10:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 12:10:14 +0200 (EET) Subject: [Uludag-commits] r16950 - in branches/yali4/yali4/gui: . pics Message-ID: <20080204101014.99307CADA@liste.uludag.org.tr> Author: gokmen.goksel Date: Mon Feb 4 12:10:14 2008 New Revision: 16950 Modified: branches/yali4/yali4/gui/ScrBootloader.py branches/yali4/yali4/gui/pics/working.png Log: Update the working graphic.. Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Mon Feb 4 12:10:14 2008 @@ -194,6 +194,7 @@ # Manual Partitioning else: ctx.debugger.log("Format Operation Started") + info.show() for dev in yali4.storage.devices: ctx.mainScreen.processEvents() dev.commit() Modified: branches/yali4/yali4/gui/pics/working.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Mon Feb 4 14:10:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 14:10:10 +0200 (EET) Subject: [Uludag-commits] r16951 - branches/yali4/yali4/gui Message-ID: <20080204121010.560937C04A1@liste.uludag.org.tr> Author: gokmen.goksel Date: Mon Feb 4 14:10:10 2008 New Revision: 16951 Modified: branches/yali4/yali4/gui/GUIGPL.py Log: * Remove test condition Modified: branches/yali4/yali4/gui/GUIGPL.py ================================================================= --- branches/yali4/yali4/gui/GUIGPL.py (original) +++ branches/yali4/yali4/gui/GUIGPL.py Mon Feb 4 14:10:10 2008 @@ -60,6 +60,4 @@ if exists(f): return f else: - # For testing. Dont forget to remove .. - return "/home/rat/pardus/uludag/CD-image/CD-image-version-2007.3/license/license-tr.txt" raise GUIException, _("Can't open License file!") From uludag-commits at pardus.org.tr Mon Feb 4 14:36:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 14:36:25 +0200 (EET) Subject: [Uludag-commits] r16952 - trunk/comar/comar Message-ID: <20080204123625.E97767C04B5@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 14:36:25 2008 New Revision: 16952 Modified: trunk/comar/comar/SConstruct Log: 1.17 Modified: trunk/comar/comar/SConstruct ================================================================= --- trunk/comar/comar/SConstruct (original) +++ trunk/comar/comar/SConstruct Mon Feb 4 14:36:25 2008 @@ -11,7 +11,7 @@ # Parameters -version = ARGUMENTS.get('version', '1.17') +version = ARGUMENTS.get('version', '1.18') prefix = ARGUMENTS.get('prefix', 'install') pyprefix = ARGUMENTS.get('pythondir', 'auto') From uludag-commits at pardus.org.tr Mon Feb 4 14:37:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 14:37:11 +0200 (EET) Subject: [Uludag-commits] r16953 - tags/RELEASE/comar-1.17 Message-ID: <20080204123711.43BBF7C04B4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 14:37:10 2008 New Revision: 16953 Added: tags/RELEASE/comar-1.17/ - copied from r16951, trunk/comar/comar/ tags/RELEASE/comar-1.17/SConstruct - copied unchanged from r16952, trunk/comar/comar/SConstruct Log: tag 1.17 From uludag-commits at pardus.org.tr Mon Feb 4 14:43:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 14:43:53 +0200 (EET) Subject: [Uludag-commits] r16954 - in tags/RELEASE: comar-1.17 comar-1.18 Message-ID: <20080204124353.B21E07C04B4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 14:43:53 2008 New Revision: 16954 Added: tags/RELEASE/comar-1.18/ - copied from r16953, tags/RELEASE/comar-1.17/ Removed: tags/RELEASE/comar-1.17/ Log: pffff. 1.18, not 1.17 From uludag-commits at pardus.org.tr Mon Feb 4 15:35:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:35:13 +0200 (EET) Subject: [Uludag-commits] r16955 - branches/pisi-devel Message-ID: <20080204133514.03F2F7C00AC@liste.uludag.org.tr> Author: faik Date: Mon Feb 4 15:35:13 2008 New Revision: 16955 Added: branches/pisi-devel/ - copied from r16954, trunk/pisi/ Log: pisi-devel from revision 16954 of trunk/pisi From uludag-commits at pardus.org.tr Mon Feb 4 15:41:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:41:09 +0200 (EET) Subject: [Uludag-commits] r16956 - in trunk/pisi: . pisi pisi/actionsapi Message-ID: <20080204134109.869CE7C04B2@liste.uludag.org.tr> Author: faik Date: Mon Feb 4 15:41:09 2008 New Revision: 16956 Added: trunk/pisi/python-2.5.patch - copied unchanged from r16924, trunk/pisi/python-2.5.patch Modified: trunk/pisi/pisi/actionsapi/autotools.py trunk/pisi/pisi/archive.py trunk/pisi/pisi/configfile.py Log: Revert to revision 16924 to keep 2007 compatibility until a workable 2008 packages and environment is ready. Modified: trunk/pisi/pisi/actionsapi/autotools.py ================================================================= --- trunk/pisi/pisi/actionsapi/autotools.py (original) +++ trunk/pisi/pisi/actionsapi/autotools.py Mon Feb 4 15:41:09 2008 @@ -26,7 +26,6 @@ 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=''): @@ -56,10 +55,6 @@ def configure(parameters = ''): '''configure source with given parameters = "--with-nls --with-libusb --with-something-usefull"''' - - if can_access_file('ltmain.sh'): - libtoolize("--copy --force") - if can_access_file('configure'): gnuconfig_update() Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Mon Feb 4 15:41:09 2008 @@ -19,7 +19,6 @@ import tarfile import zipfile import gzip -import struct import gettext __trans = gettext.translation('pisi', fallback=True) @@ -213,23 +212,7 @@ "Attempt to read ZIP archive that was already closed" zinfo = self.getinfo(name) filepos = self.fp.tell() - - 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) + self.fp.seek(zinfo.file_offset, 0) destfile = file(outname, 'wb') Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Mon Feb 4 15:41:09 2008 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005 - 2008, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, 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 -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 +#CFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow +#CXXFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow +#LDFLAGS= #buildno=True # necessary for generating build nos #buildhelper = None / ccache / icecream #compressionlevel = 7 @@ -65,7 +65,7 @@ destinationdirectory = "/" autoclean = False distribution = "Pardus" - distribution_release = "2008" + distribution_release = "2007" 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=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" + cflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" + cxxflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" + ldflags = "" buildno = False buildhelper = None compressionlevel = 7 From uludag-commits at pardus.org.tr Mon Feb 4 15:48:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:48:25 +0200 (EET) Subject: [Uludag-commits] r16957 - branches/pardus-python/pardus Message-ID: <20080204134825.B323E7C04B2@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 15:48:25 2008 New Revision: 16957 Modified: branches/pardus-python/pardus/procutils.py Log: script() returns application name Modified: branches/pardus-python/pardus/procutils.py ================================================================= --- branches/pardus-python/pardus/procutils.py (original) +++ branches/pardus-python/pardus/procutils.py Mon Feb 4 15:48:25 2008 @@ -27,7 +27,7 @@ """ class Handler: def handler(self, *args, **kwargs): - lock = FileLock("/var/run/comar-%s-%s.lock" % (script()[0], self.myfunc.__name__)) + lock = FileLock("/var/run/comar-%s-%s.lock" % (script(), self.myfunc.__name__)) lock.lock() self.myfunc(*args, **kwargs) lock.unlock() From uludag-commits at pardus.org.tr Mon Feb 4 15:48:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:48:59 +0200 (EET) Subject: [Uludag-commits] r16958 - branches/pardus-python/pardus Message-ID: <20080204134859.7ACB47C04B2@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 15:48:59 2008 New Revision: 16958 Modified: branches/pardus-python/pardus/serviceutils.py Log: Get saved service states from /etc/conf.d/mudur Modified: branches/pardus-python/pardus/serviceutils.py ================================================================= --- branches/pardus-python/pardus/serviceutils.py (original) +++ branches/pardus-python/pardus/serviceutils.py Mon Feb 4 15:48:59 2008 @@ -26,16 +26,14 @@ # utility functions -def is_on(): - return "off" - -def loadConfig(): +def loadConfig(filename=None): conf = {} - try: - from csl import serviceConf - except ImportError: - serviceConf = script()[0] - filename = "/etc/conf.d/%s" % serviceConf + if not filename: + try: + from csl import serviceConf + except ImportError: + serviceConf = script()[0] + filename = "/etc/conf.d/%s" % serviceConf if not os.path.exists(filename): return conf for line in file(filename): @@ -48,6 +46,19 @@ conf[key] = value return conf +def is_on(): + state = "off" + try: + from csl import serviceDefault + state = serviceDefault + except: + pass + config = loadConfig("/etc/conf.d/mudur") + services = config.get("services", "").split() + if script() in services: + state = "on" + return state + def loadEnvironment(): basePath = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:" if os.path.exists("/etc/profile.env"): @@ -90,7 +101,10 @@ Arguments are service names. """ for service in services: - call(service, "System.Service", "start") + try: + call(service, "System.Service", "start") + except: + pass # Service control utilities @@ -372,7 +386,7 @@ state = "stopped" except: pass - return "\n".join([serviceType, state, serviceDesc]) + return serviceType, serviceDesc, state def ready(): if is_on() == "on": @@ -382,4 +396,18 @@ def setState(state=None): if state != "on" and state != "off": fail("Unknown state '%s'" % state) + + config = loadConfig("/etc/conf.d/mudur") + services = set(config.get("services", "").split()) + + if state == "on": + services.add(script()) + elif script() in services: + services.remove(script()) + + import re + content = file("/etc/conf.d/mudur").read() + content = re.sub("services\s*=.*", "services = %s" % " ".join(services), content) + file("/etc/conf.d/mudur", "w").write(content) + notify("System.Service", "Changed", (script(), state)) From uludag-commits at pardus.org.tr Mon Feb 4 15:50:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:50:53 +0200 (EET) Subject: [Uludag-commits] r16959 - branches/mudur/bin Message-ID: <20080204135053.169047C04B2@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 15:50:52 2008 New Revision: 16959 Added: branches/mudur/bin/service2.py (contents, props changed) Modified: branches/mudur/bin/mudur.py Log: Mudur now uses COMAR2 if mudur=dbus passed as kernel parameter. Modified: branches/mudur/bin/mudur.py ================================================================= --- branches/mudur/bin/mudur.py (original) +++ branches/mudur/bin/mudur.py Mon Feb 4 15:50:52 2008 @@ -188,8 +188,10 @@ "debug": False, "livecd": False, "safe": False, + "dbus": False, "forcefsck": False, - "head_start": "kdebase", + "head_start": "", + "services": "", } # load config file if exists if os.path.exists("/etc/conf.d/mudur"): @@ -237,6 +239,8 @@ self.opts["debug"] = True elif opt == "safe": self.opts["safe"] = True + elif opt == "dbus": + self.opts["dbus"] = True elif opt.startswith("language:"): self.opts["language"] = opt[9:] elif opt.startswith("keymap:"): @@ -423,47 +427,124 @@ # def startComar(): - ui.info(_("Starting COMAR")) - # If a job crashes before finishing a transaction, Berkeley DB halts. - # We are deleting DB log files before starting Comar, so a reboot fixes - # the problem if it ever happens. - delete("/var/db/comar/__*") - delete("/var/db/comar/log*") - run("/sbin/start-stop-daemon", "-b", "--start", "--quiet", - "--pidfile", "/var/run/comar.pid", "--make-pidfile", - "--exec", "/usr/bin/comar") + if config.get("dbus"): + if not os.path.exists("/var/lib/dbus/machine-id"): + run("/usr/bin/dbus-uuidgen", "--ensure") + run("/sbin/start-stop-daemon", "-b", "--start", "--quiet", + "--pidfile", "/var/run/dbus/pid", "--exec", "/usr/bin/dbus-daemon", + "--", "--system") + waitBus("/var/run/dbus/system_bus_socket") + else: + ui.info(_("Starting COMAR")) + # If a job crashes before finishing a transaction, Berkeley DB halts. + # We are deleting DB log files before starting Comar, so a reboot fixes + # the problem if it ever happens. + delete("/var/db/comar/__*") + delete("/var/db/comar/log*") + run("/sbin/start-stop-daemon", "-b", "--start", "--quiet", + "--pidfile", "/var/run/comar.pid", "--make-pidfile", + "--exec", "/usr/bin/comar") + +def startService(service, bus, detach=False): + if not detach: + ui.info("Starting %s..." % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) + obj.start(dbus_interface="tr.org.pardus.comar.System.Service") + else: + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) + obj.start(dbus_interface="tr.org.pardus.comar.System.Service", ignore_reply=True) + +def stopService(service, bus): + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) + ui.info("Stopping %s..." % service) + obj.stop(dbus_interface="tr.org.pardus.comar.System.Service") + +def getServices(startupOnly, bus): + if startupOnly: + return config.get('services').split() + else: + obj = bus.get_object("tr.org.pardus.comar", "/", introspect=False) + return obj.listModelApplications("System.Service", dbus_interface="tr.org.pardus.comar") def startServices(extras=None): if extras is None: - ui.info(_("Starting services")) - import comar - waitBus("/var/run/comar.socket") - try: - link = comar.Link() - except: - ui.error(_("Cannot connect to COMAR, services won't be started")) - return - # Almost everything depends on logger, so start manually - link.call_package("System.Service.start", "sysklogd") - if not waitBus("/dev/log", stream=False): - ui.warn(_("Cannot start system logger")) - if extras: - for service in extras: - link.System.Service[service].start() - return - # Give login screen a headstart - link.call_package("System.Service.ready", config.get("head_start")) - if not config.get("safe"): - waitBus("/tmp/.X11-unix/X0", timeout=3) - link.call("System.Service.ready") + if config.get("dbus"): + ui.info(_("Starting services with DBus")) + else: + ui.info(_("Starting services")) + if config.get("dbus"): + import dbus + try: + bus = dbus.SystemBus() + except dbus.DBusException: + ui.error(_("Cannot connect to DBus, services won't be started")) + return + + # Almost everything depends on logger, so start manually + try: + startService("sysklogd", bus) + except dbus.DBusException, exception: + pass + if extras: + for service in extras: + try: + startService(service, bus, detach=True) + except dbus.DBusException: + pass + return + # Give login screen a headstart + #if config.get("head_start"): + # startService(config.get("head_start"), bus, detach=True) + if not config.get("safe"): + for service in getServices(True, bus): + startService(str(service), bus, detach=True) + else: + import comar + waitBus("/var/run/comar.socket") + try: + link = comar.Link() + except: + ui.error(_("Cannot connect to COMAR, services won't be started")) + return + # Almost everything depends on logger, so start manually + link.call_package("System.Service.start", "sysklogd") + if not waitBus("/dev/log", stream=False): + ui.warn(_("Cannot start system logger")) + if extras: + for service in extras: + link.System.Service[service].start() + return + # Give login screen a headstart + link.call_package("System.Service.ready", config.get("head_start")) + if not config.get("safe"): + waitBus("/tmp/.X11-unix/X0", timeout=3) + link.call("System.Service.ready") def stopServices(): - ui.info(_("Stopping services")) - run_quiet("/usr/bin/hav", "call", "System.Service.stop") + if config.get("dbus"): + ui.info(_("Stopping services with DBus")) + import dbus + try: + bus = dbus.SystemBus() + except dbus.DBusException: + return + + for service in getServices(False, bus): + try: + stopService(service, bus) + except dbus.DBusException: + pass + else: + ui.info(_("Stopping services")) + run_quiet("/usr/bin/hav", "call", "System.Service.stop") def stopComar(): - ui.info(_("Stopping COMAR")) - run("start-stop-daemon", "--stop", "--quiet", "--pidfile", "/var/run/comar.pid") + if config.get("dbus"): + ui.info(_("Stopping DBus")) + run("start-stop-daemon", "--stop", "--quiet", "--pidfile", "/var/run/dbus/pid") + else: + ui.info(_("Stopping COMAR")) + run("start-stop-daemon", "--stop", "--quiet", "--pidfile", "/var/run/comar.pid") # From uludag-commits at pardus.org.tr Mon Feb 4 15:56:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 15:56:57 +0200 (EET) Subject: [Uludag-commits] r16960 - trunk/common Message-ID: <20080204135657.45FBC7C04B2@liste.uludag.org.tr> Author: gokcen.eraslan Date: Mon Feb 4 15:56:57 2008 New Revision: 16960 Modified: trunk/common/accounts Log: my entry Modified: trunk/common/accounts ================================================================= --- trunk/common/accounts (original) +++ trunk/common/accounts Mon Feb 4 15:56:57 2008 @@ -29,6 +29,7 @@ fatih:Fatih Aşıcı:fatih.asici [at] gmail.com:fatih [at] jabber.pardus.org.tr fduman:Furkan Duman:coderlord [at] yahoo.com: ftugrul:Fahri Tuğrul Gürkaynak:ftugrul [at] gmail.com: +gokcen.eraslan:Gökçen Eraslan:gokcen [at] pardus.org.tr:gokcen [at] jabber.pardus.org.tr gokmen.goksel:Gökmen Göksel:gokmen [at] pardus.org.tr:gokmen.goksel [at] jabber.pardus.org.tr gorkem:Görkem Çetin:gorkem [at] pardus.org.tr:gorkem [at] jabber.pardus.org.tr gurer:Gürer Özen:gurer [at] pardus.org.tr:gurer [at] jabber.pardus.org.tr From uludag-commits at pardus.org.tr Mon Feb 4 16:10:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:10:50 +0200 (EET) Subject: [Uludag-commits] r16961 - trunk/pisi/pisi Message-ID: <20080204141050.BAB3D7C00E7@liste.uludag.org.tr> Author: faik Date: Mon Feb 4 16:10:50 2008 New Revision: 16961 Modified: trunk/pisi/pisi/archive.py Log: lzma 4.32 is not in 2007 or 2007-test. Revert this too, for keeping 2007 compatilibity. For trunk/pisi please use lzma 4.27.1 from stable. For all 2008 spesific work please use branches/pisi-devel Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Mon Feb 4 16:10:50 2008 @@ -114,7 +114,8 @@ elif self.type == 'tarlzma': rmode = 'r:' self.file_path = self.file_path.rstrip(ctx.const.lzma_suffix) - ret, out, err = util.run_batch("lzma -k -f -d %s%s" % (self.file_path,ctx.const.lzma_suffix)) + ret, out, err = util.run_batch("lzma d %s %s" % (self.file_path + ctx.const.lzma_suffix, + self.file_path)) if ret != 0: raise LzmaRuntimeError(err) else: @@ -189,9 +190,9 @@ if self.tar.mode == 'wb' and self.type == 'tarlzma': batch = None if ctx.config.values.build.compressionlevel: - batch = "lzma -%s -z %s" % (ctx.config.values.build.compressionlevel, self.file_path) + batch = "lzmash -%s %s" % (ctx.config.values.build.compressionlevel, self.file_path) else: - batch = "lzma -z %s" % self.file_path + batch = "lzmash %s" % self.file_path ret, out, err = util.run_batch(batch) if ret != 0: From uludag-commits at pardus.org.tr Mon Feb 4 16:25:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:25:01 +0200 (EET) Subject: [Uludag-commits] r16962 - trunk/pisi/pisi Message-ID: <20080204142501.25C307C04B0@liste.uludag.org.tr> Author: faik Date: Mon Feb 4 16:25:00 2008 New Revision: 16962 Modified: trunk/pisi/pisi/__init__.py Log: 2.0_alpha1 Modified: trunk/pisi/pisi/__init__.py ================================================================= --- trunk/pisi/pisi/__init__.py (original) +++ trunk/pisi/pisi/__init__.py Mon Feb 4 16:25:00 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "1.1.6" +__version__ = "2.0_alpha1" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Mon Feb 4 16:25:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:25:40 +0200 (EET) Subject: [Uludag-commits] r16963 - branches/pisi-devel/pisi Message-ID: <20080204142541.08C7F7C0346@liste.uludag.org.tr> Author: faik Date: Mon Feb 4 16:25:40 2008 New Revision: 16963 Modified: branches/pisi-devel/pisi/__init__.py Log: 2.0_alpha1 Modified: branches/pisi-devel/pisi/__init__.py ================================================================= --- branches/pisi-devel/pisi/__init__.py (original) +++ branches/pisi-devel/pisi/__init__.py Mon Feb 4 16:25:40 2008 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "1.1.6" +__version__ = "2.0_alpha1" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Mon Feb 4 16:39:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:39:20 +0200 (EET) Subject: [Uludag-commits] r16964 - branches/mudur/bin Message-ID: <20080204143920.B675E7C048F@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 16:39:20 2008 New Revision: 16964 Modified: branches/mudur/bin/muavin.py branches/mudur/bin/mudur.py branches/mudur/bin/network.py branches/mudur/bin/service.py branches/mudur/bin/service2.py branches/mudur/bin/update-environment.py Log: merge with trunk Modified: branches/mudur/bin/muavin.py ================================================================= --- branches/mudur/bin/muavin.py (original) +++ branches/mudur/bin/muavin.py Mon Feb 4 16:39:20 2008 @@ -27,7 +27,7 @@ path = os.path.join(root, "modalias") aliases.append(file(path).read().rstrip("\n")) return aliases - + def _match(self, match, alias, mod): # bu garip fonksiyon pythonun re ve fnmatch modullerinin # acayip yavas olmasindan turedi, 5 sn yerine 0.5 saniyede @@ -52,7 +52,7 @@ if j == -1: return False alias = alias[j:] - + def aliasModules(self, aliases): modules = set() if len(aliases) == 0: @@ -71,7 +71,7 @@ if self._match(a, alias, mod): modules.add(mod) return modules - + def plug(self, current, env=None): aliases = [] if env: @@ -83,7 +83,7 @@ aliases = self.coldAliases() mods = self.aliasModules(aliases) current.update(mods) - + def debug(self): aliases = self.coldAliases() mods = self.aliasModules(aliases) @@ -102,14 +102,14 @@ if id == "PNP0400" or id == "PNP0401": return [ "parport_pc", "lp" ] return [] - + def plug(self, current, env=None): if env: # ISA bus doesn't support hotplugging return - + current.update(self.detect()) - + def debug(self): print "ISAPNP: %s" % ", ".join(self.detect()) @@ -123,7 +123,7 @@ "5": ["sr_mod"], "7": ["sd_mod"], } - + def detect(self, devpath): path = "/sys" + devpath + "/type" # If type information is not ready, wait a bit @@ -131,17 +131,17 @@ while timeout > 0 and not os.path.exists(path): time.sleep(0.1) timeout -= 0.1 - + type = file(path).read().rstrip("\n") return self.modmap.get(type, None) - + def plug(self, current, env=None): if not env or env.get("ACTION", "") != "add" or env.get("SUBSYSTEM", "") != "scsi": return mods = self.detect(env["DEVPATH"]) if mods: current.update(mods) - + def debug(self): pass @@ -156,7 +156,7 @@ loading = devpath + "/loading" if not os.path.exists(loading): time.sleep(1) - + f = file(loading, "w") if not os.path.exists(firm): f.write("-1\n") @@ -169,7 +169,7 @@ f = file(loading, "w") f.write("0\n") f.close() - + def debug(self): pass @@ -200,7 +200,7 @@ self.name = line.split(":")[1].strip() elif line.startswith("flags"): self.flags = line.split(":", 1)[1].strip().split() - + def _find_pci(self, vendor, device): path = "/sys/bus/pci/devices" for item in os.listdir(path): @@ -209,7 +209,7 @@ if ven == vendor and dev == device: return item return None - + def _detect_ich(self): ich = 0 if self._find_pci("0x8086", "0x24cc"): @@ -224,7 +224,7 @@ if not self._find_pci("0x8086", "0x"): ich = 2 return ich - + def _detect_acpi_pps(self): # NOTE: This may not be a correct way to detect this if os.path.exists("/proc/acpi/processor/CPU0/info"): @@ -233,7 +233,7 @@ if line.split(":")[1].strip() == "yes": return True return False - + def detect(self): modules = set() if self.vendor == "GenuineIntel": @@ -256,7 +256,7 @@ # harm than good #elif "acpi" in self.flags and "tm" in self.flags: # modules.add("p4-clockmod") - + elif self.vendor == "AuthenticAMD": # Mobile K6-1/2 CPUs if self.family == 5 and (self.model == 12 or self.model == 13): @@ -267,20 +267,20 @@ # AMD Opteron/Athlon64 elif self.family == 15: modules.add("powernow_k8") - + elif self.vendor == "CentaurHauls": # VIA Cyrix III Longhaul if self.family == 6: if self.model >= 6 and self.model <= 9: modules.add("longhaul") - + elif self.vendor == "GenuineTMx86": # Transmeta LongRun if "longrun" in self.flags: modules.add("longrun") - + return modules - + def plug(self, current, env=None): if env: return @@ -294,7 +294,7 @@ mods.add("cpufreq_powersave") mods.add("cpufreq_ondemand") current.update(mods) - + def debug(self): print "CPU: %s" % ", ".join(self.detect()) @@ -305,7 +305,7 @@ # This card is detected over bttv module's api # If we have a bttv hardware, give the module a chance current.add("dvb_bt8xx") - + def debug(self): pass @@ -354,10 +354,10 @@ if __name__ == "__main__": if len(sys.argv) == 2 and sys.argv[1] == "--debug": debug() - + elif len(sys.argv) == 2 and sys.argv[1] == "--coldplug": plug() - + else: # This file is written by mudur, after loading of modules in the # modules.autoload.d finishes, thus preventing udevtrigger events Modified: branches/mudur/bin/mudur.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/mudur/bin/network.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/mudur/bin/service.py ================================================================= --- branches/mudur/bin/service.py (original) +++ branches/mudur/bin/service.py Mon Feb 4 16:39:20 2008 @@ -59,7 +59,7 @@ "script": _("script"), "server": _("server"), } - + def __init__(self, name, info=None): self.name = name self.running = "" @@ -93,12 +93,12 @@ run_title = _("Status") auto_title = _("Autostart") desc_title = _("Description") - + name_size = max(max(map(lambda x: len(x.name), services)), len(name_title)) run_size = max(max(map(lambda x: len(x.running), services)), len(run_title)) auto_size = max(max(map(lambda x: len(x.autostart), services)), len(auto_title)) desc_size = len(desc_title) - + line = "%s | %s | %s | %s" % ( name_title.center(name_size), run_title.center(run_size), @@ -107,7 +107,7 @@ ) print line print "-" * (len(line)) - + cstart = "" cend = "" if use_color: @@ -134,14 +134,14 @@ data = collect(c) services = filter(lambda x: x.command == "result", data) errors = filter(lambda x: x.command != "result", data) - + if len(services) > 0: services.sort(key=lambda x: x.script) lala = [] for item in services: lala.append(Service(item.script, item.data)) format_service_list(lala, use_color) - + if len(errors) > 0: print map(report_error, errors) @@ -163,27 +163,27 @@ sys.exit(3) print _("Comar service is running.") sys.exit(0) - + if os.getuid() != 0: print _("You should be the root user in order to control the comar service.") sys.exit(1) - + comar_pid = "/var/run/comar.pid" - + if op == "stop" or op == "restart": os.system("/sbin/start-stop-daemon --stop --pidfile %s" % comar_pid) - + timeout = 5 while checkDaemon(comar_pid) and timeout > 0: time.sleep(0.2) timeout -= 0.2 - + if op == "start" or op == "restart": os.system("/sbin/start-stop-daemon -b --start --pidfile %s --make-pidfile --exec /usr/bin/comar" % comar_pid) def manage_service(service, op, use_color=True): c = comlink() - + if op == "start": c.ask_notify("System.Service.changed") c.System.Service[service].start() @@ -202,7 +202,7 @@ manage_service(service, "stop") manage_service(service, "start") return - + while True: reply = c.read_cmd() if reply.command == "result": @@ -218,7 +218,7 @@ if op == "status": sys.exit(4) sys.exit(1) - + if op in ["info", "status", "list"]: s = Service(reply.script, reply.data) format_service_list([s], use_color) @@ -257,7 +257,7 @@ def main(args): operations = ("start", "stop", "info", "list", "restart", "reload", "status", "on", "off") use_color = True - + # Parameters if "--no-color" in args: args.remove("--no-color") @@ -265,26 +265,26 @@ if "-N" in args: args.remove("-N") use_color = False - + # Operations if args == []: list_services(use_color) - + elif args[0] == "list" and len(args) == 1: list_services(use_color) - + elif args[0] == "help": usage() - + elif len(args) < 2: usage() - + elif args[0] == "comar": manage_comar(args[1]) - + elif args[1] in operations: manage_service(args[0], args[1], use_color) - + else: usage() Modified: branches/mudur/bin/service2.py ================================================================= --- branches/mudur/bin/service2.py (original) +++ branches/mudur/bin/service2.py Mon Feb 4 16:39:20 2008 @@ -113,17 +113,17 @@ print line def startService(service, bus): - obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) print _("Starting %s..." % service) obj.start(dbus_interface="tr.org.pardus.comar.System.Service") def stopService(service, bus): - obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) print _("Stopping %s..." % service) obj.stop(dbus_interface="tr.org.pardus.comar.System.Service") def setServiceState(service, state, bus): - obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) obj.setState(state, dbus_interface="tr.org.pardus.comar.System.Service") if state == "on": print _("Service '%s' will be auto started.") % service @@ -131,16 +131,16 @@ print _("Service '%s' won't be auto started.") % service def reloadService(service, bus): - obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) print _("Reloading %s..." % service) obj.reload(dbus_interface="tr.org.pardus.comar.System.Service") def getServiceInfo(service, bus): - obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service) + obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) return obj.info(dbus_interface="tr.org.pardus.comar.System.Service") def getServices(bus): - obj = bus.get_object("tr.org.pardus.comar", "/") + obj = bus.get_object("tr.org.pardus.comar", "/", introspect=False) return obj.listModelApplications("System.Service", dbus_interface="tr.org.pardus.comar") def list_services(use_color=True): Modified: branches/mudur/bin/update-environment.py ================================================================= --- branches/mudur/bin/update-environment.py (original) +++ branches/mudur/bin/update-environment.py Mon Feb 4 16:39:20 2008 @@ -48,7 +48,7 @@ def read_env_d(envdir): dict = {} - + paths = [] for name in os.listdir(envdir): path = os.path.join(envdir, name) @@ -64,12 +64,12 @@ continue paths.append(path) paths.sort() - + for path in paths: for line in file(path): if line == "" or line.startswith("#"): continue - + line = line.rstrip("\n") if "=" in line: key, value = line.split("=", 1) @@ -77,7 +77,7 @@ value = value.strip() if value.startswith('"') or value.startswith("'"): value = value[1:-1] - + # Merge for special variables, override for others if key in specials: if dict.has_key(key): @@ -86,7 +86,7 @@ dict[key] = value.split(":") else: dict[key] = value - + return dict def generate_profile_env(envdict, format='export %s="%s"\n'): @@ -113,7 +113,7 @@ def update_environment(prefix): join = os.path.join - + env = read_env_d(join(prefix, "etc/env.d")) update_file(join(prefix, "etc/profile.env"), generate_profile_env(env)) update_file(join(prefix, "etc/csh.env"), generate_profile_env(env, 'setenv %s %s\n')) @@ -130,19 +130,19 @@ def main(argv): prefix = "/" - + try: opts, args = getopt.gnu_getopt(argv, "h", [ "help", "destdir=" ]) except getopt.GetoptError: usage() - + for o, a in opts: if o in ("-h", "--help"): usage() sys.exit(0) if o in ("--destdir"): prefix = a - + update_environment(prefix) if __name__ == "__main__": From uludag-commits at pardus.org.tr Mon Feb 4 16:40:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:40:58 +0200 (EET) Subject: [Uludag-commits] r16965 - branches/mudur/etc Message-ID: <20080204144058.BE0387C048F@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 16:40:58 2008 New Revision: 16965 Modified: branches/mudur/etc/mudur.conf Log: new conf Modified: branches/mudur/etc/mudur.conf ================================================================= --- branches/mudur/etc/mudur.conf (original) +++ branches/mudur/etc/mudur.conf Mon Feb 4 16:40:58 2008 @@ -30,3 +30,7 @@ # First service to run with a head start # Öncelikle başlatılacak servis #head_start="kdebase" + +# Services to run on startup +# Açılışta çalıştırılacak servisler +#services="" From uludag-commits at pardus.org.tr Mon Feb 4 16:46:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:46:33 +0200 (EET) Subject: [Uludag-commits] r16966 - branches/mudur/bin Message-ID: <20080204144633.AB4B67C0495@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Feb 4 16:46:33 2008 New Revision: 16966 Modified: branches/mudur/bin/mudur.py Log: remove resetConPerms() Modified: branches/mudur/bin/mudur.py ================================================================= --- branches/mudur/bin/mudur.py (original) +++ branches/mudur/bin/mudur.py Mon Feb 4 16:46:33 2008 @@ -1058,8 +1058,6 @@ ui.info(_("Updating environment variables")) run("/sbin/update-environment") - resetConPerms() - cleanupTmp() startComar() From uludag-commits at pardus.org.tr Mon Feb 4 16:48:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 4 Feb 2008 16:48:32 +0200 (EET) Subject: [Uludag-commits] r16967 - branches/mudur/bin Message-ID: <20080204144832.689527C0496@liste.uludag.org.tr> A