From uludag-commits at pardus.org.tr Tue Jan 1 00:01:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Jan 2008 00:01:03 +0200 (EET) Subject: [Uludag-commits] r16492 - in trunk/pisi: . pisi Message-ID: <20071231220103.33A707C02A2@liste.uludag.org.tr> Author: cartman Date: Tue Jan 1 00:01:02 2008 New Revision: 16492 Added: trunk/pisi/python-2.5.patch Modified: trunk/pisi/pisi/archive.py Log: Python 2.5 fixes, pisi works so far Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Tue Jan 1 00:01:02 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 Tue Jan 1 00:02:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Jan 2008 00:02:02 +0200 (EET) Subject: [Uludag-commits] r16493 - trunk/pisi/pisi Message-ID: <20071231220202.998537C02DE@liste.uludag.org.tr> Author: cartman Date: Tue Jan 1 00:01:54 2008 New Revision: 16493 Modified: trunk/pisi/pisi/archive.py Log: don't apply the change Modified: trunk/pisi/pisi/archive.py ================================================================= --- trunk/pisi/pisi/archive.py (original) +++ trunk/pisi/pisi/archive.py Tue Jan 1 00:01:54 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') From uludag-commits at pardus.org.tr Tue Jan 1 00:24:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 1 Jan 2008 00:24:05 +0200 (EET) Subject: [Uludag-commits] r16494 - trunk/comar/comar Message-ID: <20071231222406.0B2C47C02DE@liste.uludag.org.tr> Author: cartman Date: Tue Jan 1 00:24:05 2008 New Revision: 16494 Added: trunk/comar/comar/python-2.5.patch Log: Python 2.5 patch From uludag-commits at pardus.org.tr Wed Jan 2 09:49:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 09:49:26 +0200 (EET) Subject: [Uludag-commits] r16495 - branches/comar-dbus/comar/src Message-ID: <20080102074926.DC5877C013B@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Jan 2 09:49:26 2008 New Revision: 16495 Modified: branches/comar-dbus/comar/src/pydbus.c Log: DBUS_TYPE_BYTE: Subclass of int DBUS_TYPE_OBJECT_PATH: Subclass of str DBUS_TYPE_SIGNATURE: Subclass of str Modified: branches/comar-dbus/comar/src/pydbus.c ================================================================= --- branches/comar-dbus/comar/src/pydbus.c (original) +++ branches/comar-dbus/comar/src/pydbus.c Wed Jan 2 09:49:26 2008 @@ -339,7 +339,13 @@ int type = dbus_message_iter_get_arg_type(iter); switch (type) { + case DBUS_TYPE_BYTE: + dbus_message_iter_get_basic(iter, &obj.y); + ret = Py_BuildValue("i", (int)obj.y); + break; case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: + case DBUS_TYPE_SIGNATURE: dbus_message_iter_get_basic(iter, &obj.s); ret = Py_BuildValue("s", obj.s); // ret = Py_BuildValue("N", PyUnicode_DecodeUTF8(obj.s, strlen(obj.s), NULL)); @@ -384,9 +390,6 @@ dbus_message_iter_recurse(iter, &sub); ret = dbus_py_get_dict(&sub); } - else if (type == DBUS_TYPE_BYTE) { - // FIXME - } else { dbus_message_iter_recurse(iter, &sub); ret = dbus_py_get_list(&sub); @@ -401,11 +404,6 @@ type = dbus_message_iter_get_arg_type(&sub); ret = dbus_py_get_item(&sub); break; - case DBUS_TYPE_BYTE: - case DBUS_TYPE_SIGNATURE: - case DBUS_TYPE_OBJECT_PATH: - // FIXME - break; } return ret; } From uludag-commits at pardus.org.tr Wed Jan 2 09:49:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 09:49:33 +0200 (EET) Subject: [Uludag-commits] r16496 - trunk/tasma/package-manager/src Message-ID: <20080102074934.080287C013D@liste.uludag.org.tr> Author: gokcen.eraslan Date: Wed Jan 2 09:49:33 2008 New Revision: 16496 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/Notifier.py trunk/tasma/package-manager/src/Tray.py trunk/tasma/package-manager/src/package-manager.py Log: notify-python support Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Wed Jan 2 09:49:33 2008 @@ -216,6 +216,9 @@ self.updateStatusBar() Globals.setNormalCursor() + #TESTING + self.parent.tray.showPopup() + # Executed when 'Show Installed Packages' is clicked def removeState(self, reset=True): Globals.setWaitCursor() @@ -747,7 +750,7 @@ id = 0 if not forced: id = Tray.ID_TRAY_INTERVAL_CHECK - + self.command.startUpdate(repo, id) # update repo command is given by the user if forced and not self.parent.isHidden(): Modified: trunk/tasma/package-manager/src/Notifier.py ================================================================= --- trunk/tasma/package-manager/src/Notifier.py (original) +++ trunk/tasma/package-manager/src/Notifier.py Wed Jan 2 09:49:33 2008 @@ -6,38 +6,39 @@ import traceback from kdecore import i18n +from qt import QObject, PYSIGNAL -class Notifier: +class Notifier(QObject): def click_handler(self, id, button): if id == self.notifyid: - print "%s clicked!" % button + if button == "default" or button == "ignore": + pass + else: + self.emit(PYSIGNAL("showUpgrades"), ()) - def __init__(self, icon, header, msg, pos=None): + def __init__(self): + QObject.__init__(self) dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) bus = dbus.SessionBus() try: - object = bus.get_object("org.freedesktop.Notifications","/org/freedesktop/Notifications") + object = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") self.iface = dbus.Interface(object, dbus_interface='org.freedesktop.Notifications') object.connect_to_signal("ActionInvoked", self.click_handler, dbus_interface="org.freedesktop.Notifications") except dbus.DBusException: traceback.print_exc() + def show(self, icon, header, msg, pos=None): if not pos or pos[0] < 0 or pos[1] < 0: - self.hints = {} + hints = {} else: - self.hints= {"x": pos[0], "y": pos[1]} + hints= {"x": pos[0], "y": pos[1]} - self.icon = icon - self.header = header - self.msg = msg - - def show(self): self.notifyid = self.iface.Notify("package-manager", 0, - "file://%s" % self.icon, - unicode(self.header), - unicode(self.msg), + "file://%s" % icon, + unicode(header), + unicode(msg), ["showupdates", unicode(i18n("Show Updates")), "ignore", unicode(i18n("Ignore"))], - self.hints, + hints, 0) Modified: trunk/tasma/package-manager/src/Tray.py ================================================================= --- trunk/tasma/package-manager/src/Tray.py (original) +++ trunk/tasma/package-manager/src/Tray.py Wed Jan 2 09:49:33 2008 @@ -24,7 +24,7 @@ ID_TRAY_INTERVAL_CHECK=30 class Tray(KSystemTray): - def __init__(self, parent=None): + def __init__(self, parent): KSystemTray.__init__(self, parent) self.parent = parent self.icon = self.loadIcon("package-manager") @@ -44,7 +44,10 @@ self.popupMenu.insertSeparator() self.id = self.popupMenu.insertItem(i18n("All")) + self.notifier = Notifier() + self.connect(self.popupMenu, SIGNAL("activated(int)"), self.slotUpdateRepo) + self.connect(self.notifier, PYSIGNAL("showUpgrades"), self.showUpgrades) def slotUpdateRepo(self, id): if id == self.id: @@ -68,9 +71,24 @@ message = i18n("There are %1 updates available!").arg(5) header = i18n("Updates Available!") - pos = self.mapToGlobal(self.pos()) - self.popup = Notifier(icon, header, message, (pos.x(), pos.y())) - self.popup.show() + self.notifier.show(icon, header, message, self.getPos()) + + def showUpgrades(self): + self.parent.mainwidget.trayUpgradeSwitch() + self.parent.show() + + def getPos(self): + pt = self.mapToGlobal(QPoint(0,0)) + print "mapToGlobal(): %d, %d" % (pt.x(), pt.y()) + screen = QDesktopWidget() + incr = 0 + if pt.y() < screen.screenGeometry().height()/2 and pt.y() < self.height(): + incr = self.width() - 4 + elif pt.y() > screen.screenGeometry().height() - self.height() - 80: + incr = 0 + else: + incr = self.width() / 2 + return (pt.x() + self.height()/2, pt.y() + incr) def updateInterval(self, min): # minutes to milliseconds conversion Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Wed Jan 2 09:49:33 2008 @@ -74,9 +74,6 @@ self.tray.updateInterval(interval) self.tray.show() - #TESTING... - self.tray.showPopup() - self.connect(self.tray, SIGNAL("quitSelected()"), self.slotQuit) self.connect(kapp, SIGNAL("shutDown()"), self.slotQuit) From uludag-commits at pardus.org.tr Wed Jan 2 09:49:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 09:49:36 +0200 (EET) Subject: [Uludag-commits] r16497 - trunk/tasma/package-manager/src Message-ID: <20080102074936.4F5E62CEDA@liste.uludag.org.tr> Author: gokcen.eraslan Date: Wed Jan 2 09:49:36 2008 New Revision: 16497 Removed: trunk/tasma/package-manager/src/BalloonMessage.py Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/Tray.py Log: remove notify-python testing code Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Wed Jan 2 09:49:36 2008 @@ -216,9 +216,6 @@ self.updateStatusBar() Globals.setNormalCursor() - #TESTING - self.parent.tray.showPopup() - # Executed when 'Show Installed Packages' is clicked def removeState(self, reset=True): Globals.setWaitCursor() Modified: trunk/tasma/package-manager/src/Tray.py ================================================================= --- trunk/tasma/package-manager/src/Tray.py (original) +++ trunk/tasma/package-manager/src/Tray.py Wed Jan 2 09:49:36 2008 @@ -61,14 +61,11 @@ upgrades = pisi.api.list_upgradable() newUpgrades = set(upgrades) - set(self.lastUpgrades) self.lastUpgrades = upgrades - #if not len(upgrades) or not newUpgrades: - # return + if not len(upgrades) or not newUpgrades: + return icon = getIconPath("package-manager") - print icon - #message = i18n("There are %1 updates available!").arg(len(upgrades)) - # TESTING - message = i18n("There are %1 updates available!").arg(5) + message = i18n("There are %1 updates available!").arg(len(upgrades)) header = i18n("Updates Available!") self.notifier.show(icon, header, message, self.getPos()) @@ -79,7 +76,6 @@ def getPos(self): pt = self.mapToGlobal(QPoint(0,0)) - print "mapToGlobal(): %d, %d" % (pt.x(), pt.y()) screen = QDesktopWidget() incr = 0 if pt.y() < screen.screenGeometry().height()/2 and pt.y() < self.height(): From uludag-commits at pardus.org.tr Wed Jan 2 09:50:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 09:50:55 +0200 (EET) Subject: [Uludag-commits] r16498 - branches/comar-dbus/comar/src Message-ID: <20080102075055.B028B7C013B@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Jan 2 09:50:55 2008 New Revision: 16498 Modified: branches/comar-dbus/comar/src/dbus.c Log: * Return error if iterface/path/member is not specified. * Remove residuary conditional expression Modified: branches/comar-dbus/comar/src/dbus.c ================================================================= --- branches/comar-dbus/comar/src/dbus.c (original) +++ branches/comar-dbus/comar/src/dbus.c Wed Jan 2 09:50:55 2008 @@ -543,11 +543,11 @@ csl_init(); - if (strcmp(interface, "org.freedesktop.DBus.Introspectable") == 0) { - dbus_introspection_methods(path); + if (!interface || !path || !method) { + dbus_reply_error("dbus", "missing", "Missing interface, path or method."); } - else if (strcmp(interface, "org.freedesktop.DBus.Peer") == 0) { - // dbus_peer_methods(path); + else if (strcmp(interface, "org.freedesktop.DBus.Introspectable") == 0) { + dbus_introspection_methods(path); } else if (strncmp(interface, cfg_bus_name, strlen(cfg_bus_name)) == 0) { #ifdef HAVE_POLICYKIT From uludag-commits at pardus.org.tr Wed Jan 2 16:38:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 16:38:09 +0200 (EET) Subject: [Uludag-commits] r16499 - in branches/comar-dbus/comar: include src Message-ID: <20080102143809.2EDDD7C03E4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Jan 2 16:38:08 2008 New Revision: 16499 Modified: branches/comar-dbus/comar/include/model.h branches/comar-dbus/comar/src/model.c branches/comar-dbus/comar/src/policy.c Log: Allow defining labels in models.xml to group similar tasks. Modified: branches/comar-dbus/comar/include/model.h ================================================================= --- branches/comar-dbus/comar/include/model.h (original) +++ branches/comar-dbus/comar/include/model.h Wed Jan 2 16:38:08 2008 @@ -13,6 +13,7 @@ int model_lookup_interface(const char *iface); int model_lookup_method(const char *iface, const char *method); +char *model_get_method_access_label(int node_no); int model_lookup_signal(const char *iface, const char *signal); int model_get_iks(char *iface, iks **parent); int model_init(); Modified: branches/comar-dbus/comar/src/model.c ================================================================= --- branches/comar-dbus/comar/src/model.c (original) +++ branches/comar-dbus/comar/src/model.c Wed Jan 2 16:38:08 2008 @@ -29,6 +29,7 @@ const char *path; struct node *next; int parent_no; + char *access_label; int type; int no; }; @@ -171,6 +172,16 @@ return -1; } +//! Return the access keyword of node numbered 'node_no' +char * +model_get_method_access_label(int node_no) +{ + struct node *n; + + n = &nodes[node_no]; + return n->access_label; +} + //! Looks up signal in node table int model_lookup_signal(const char *iface, const char *signal) @@ -203,7 +214,7 @@ //! Adds node to table static int -add_node(int parent_no, const char *path, int type) +add_node(int parent_no, const char *path, char *label, int type) { /*! * Adds node to node table. @@ -223,6 +234,7 @@ n->parent_no = parent_no; n->type = type; n->no = model_nr_nodes++; + n->access_label = label; val = hash_string(path, len) % TABLE_SIZE; n->next = node_table[val]; @@ -311,13 +323,20 @@ if (iks_strcmp(iks_find_attrib(obj, "name"), "Comar") == 0) { continue; } - obj_no = add_node(-1, build_path(obj, NULL), N_INTERFACE); + obj_no = add_node(-1, build_path(obj, NULL), "", N_INTERFACE); for (met = iks_first_tag(obj); met; met = iks_next_tag(met)) { if (iks_strcmp(iks_name(met), "method") == 0) { - add_node(obj_no, build_path(obj, met), N_METHOD); + char *label = iks_find_attrib(met, "access_label"); + if (label) { + iks_insert_attrib(met, "access_label", NULL); + } + else { + label = iks_find_attrib(met, "name"); + } + add_node(obj_no, build_path(obj, met), label, N_METHOD); } else if (iks_strcmp(iks_name(met), "signal") == 0) { - add_node(obj_no, build_path(obj, met), N_SIGNAL); + add_node(obj_no, build_path(obj, met), "", N_SIGNAL); } } } Modified: branches/comar-dbus/comar/src/policy.c ================================================================= --- branches/comar-dbus/comar/src/policy.c (original) +++ branches/comar-dbus/comar/src/policy.c Wed Jan 2 16:38:08 2008 @@ -14,7 +14,10 @@ #include #include +#include "cfg.h" #include "policy.h" +#include "model.h" +#include "utility.h" //! Check if sender is allowed to call method int @@ -36,8 +39,8 @@ PolKitAction *polkit_act; PolKitError *perr; uid_t uid; - int size; - char *action, *t; + int size, node_no; + char *action, *access_label = NULL, *model, *t; *result = (PolKitResult) POLKIT_RESULT_NO; @@ -65,10 +68,26 @@ return 1; } - // action = interface.method - size = strlen(interface) + 1 + strlen(method) + 1; - action = malloc(size); - snprintf(action, size, "%s.%s\0", interface, method); + model = (char *) strsub(interface, strlen(cfg_bus_name) + 1, 0); + node_no = model_lookup_method(model, method); + free(model); + + if (node_no > -1) { + access_label = model_get_method_access_label(node_no); + } + + if (access_label) { + // action = interface.access_label + size = strlen(interface) + 1 + strlen(access_label) + 1; + action = malloc(size); + snprintf(action, size, "%s.%s\0", interface, access_label); + } + else { + // action = interface.method + size = strlen(interface) + 1 + strlen(method) + 1; + action = malloc(size); + snprintf(action, size, "%s.%s\0", interface, method); + } for (t = action; *t != '\0'; t++) { *t = tolower(*t); From uludag-commits at pardus.org.tr Wed Jan 2 16:38:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 16:38:45 +0200 (EET) Subject: [Uludag-commits] r16500 - in branches/comar-dbus/comar/etc: . policy Message-ID: <20080102143845.E16E37C03E4@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Jan 2 16:38:45 2008 New Revision: 16500 Added: branches/comar-dbus/comar/etc/policy/comar.modules.policy branches/comar-dbus/comar/etc/policy/comar.netlink.policy branches/comar-dbus/comar/etc/policy/comar.netstack.policy branches/comar-dbus/comar/etc/policy/comar.time.policy branches/comar-dbus/comar/etc/policy/comar.user.policy Modified: branches/comar-dbus/comar/etc/model.xml branches/comar-dbus/comar/etc/policy/comar.bootloader.policy branches/comar-dbus/comar/etc/policy/comar.policy branches/comar-dbus/comar/etc/policy/comar.system.package.policy Log: Policies for models Modified: branches/comar-dbus/comar/etc/model.xml ================================================================= --- branches/comar-dbus/comar/etc/model.xml (original) +++ branches/comar-dbus/comar/etc/model.xml Wed Jan 2 16:38:45 2008 @@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -90,17 +90,17 @@ - + - + - + @@ -109,42 +109,42 @@ - + - + - + - + - + - + - + - + @@ -164,10 +164,10 @@ - + - + @@ -198,7 +198,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -219,25 +219,25 @@ - + - + - + - + - + @@ -251,25 +251,25 @@ - + - + - + - + - + - + @@ -277,21 +277,21 @@ - + - + - + - + - + Modified: branches/comar-dbus/comar/etc/policy/comar.bootloader.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.bootloader.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.bootloader.policy Wed Jan 2 16:38:45 2008 @@ -40,44 +40,41 @@ yes - - Set boot loader option. - System policy prevents setting option. - - no - auth_admin - - Update kernel release on specified partition. System policy prevents updating kernel. + no + no no - auth_admin - - - - Add new entry to boot loader or change existing one. - System policy prevents adding or changing entry. - - no - auth_admin Remove entry from boot loader. System policy prevents removing entry. - no - auth_admin + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session Remove unused kernel from system. System policy prevents removing unused kernels. - no - auth_admin + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Edit boot loader options and add new entries. + System policy prevents changing bootloader settings. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session Modified: branches/comar-dbus/comar/etc/policy/comar.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.policy Wed Jan 2 16:38:45 2008 @@ -8,16 +8,18 @@ Register new scripts System policy prevents registering scripts. - no - no + yes + yes + yes Remove application System policy prevents removing applications. - no - no + yes + yes + yes Modified: branches/comar-dbus/comar/etc/policy/comar.system.package.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.system.package.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.system.package.policy Wed Jan 2 16:38:45 2008 @@ -8,6 +8,7 @@ Execute post install script of a package System policy prevents executing post install script. + no no no @@ -16,6 +17,7 @@ Execute pre remove script of a package System policy prevents executing pre remove script. + no no no From uludag-commits at pardus.org.tr Wed Jan 2 18:33:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 18:33:52 +0200 (EET) Subject: [Uludag-commits] r16501 - in branches/yali4/yali4: . gui Message-ID: <20080102163353.03BEE864CA7@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Jan 2 18:33:52 2008 New Revision: 16501 Added: branches/yali4/yali4/gui/DiskWidgets.py Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py branches/yali4/yali4/gui/ScrPartitionManual.py branches/yali4/yali4/gui/runner.py branches/yali4/yali4/storage.py Log: Something happened in town.. Modified: branches/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ branches/yali4/yali4/gui/ScrPartitionAuto.py Wed Jan 2 18:33:52 2008 @@ -93,14 +93,14 @@ def execute(self): ctx.installData.autoPartDev = None - if self.accept_auto.isChecked(): + if self.ui.accept_auto.isChecked(): ctx.installData.autoPartDev = self.device ctx.debugger.log("Automatic Partition selected..") # skip next screen() # We pass the Manual Partitioning screen - num = ctx.screens.getCurrentIndex() + 1 - ctx.screens.goToScreen(num) + num = ctx.mainScreen.getCurrentIndex() + 1 + ctx.mainScreen.goToScreen(num) return True Modified: branches/yali4/yali4/gui/ScrPartitionManual.py ================================================================= --- branches/yali4/yali4/gui/ScrPartitionManual.py (original) +++ branches/yali4/yali4/gui/ScrPartitionManual.py Wed Jan 2 18:33:52 2008 @@ -23,14 +23,15 @@ from yali4.gui.YaliDialog import Dialog, WarningDialog, WarningWidget #from yali4.gui.InformationWindow import InformationWindow from yali4.gui.GUIException import * +from yali4.gui.DiskWidgets import * from yali4.gui.ScreenWidget import ScreenWidget -from yali4.gui.PartListImpl import PartList -from yali4.gui.PartEditImpl import PartEdit, \ - editState, createState, deleteState, resizeState +#from yali4.gui.PartListImpl import PartList +#from yali4.gui.PartEditImpl import PartEdit, \ +# editState, createState, deleteState, resizeState ## # Partitioning screen. -class Widget(QGui.QWidget, ScreenWidget): +class Widget(QtGui.QWidget, ScreenWidget): title = _('Manual Partitioning') desc = _('You can easily configure your partitions..') help = _(''' @@ -75,14 +76,15 @@ def __init__(self, *args): QtGui.QWidget.__init__(self,None) - self.partlist = PartList(self) - self.partedit = PartEdit(self) - self.partedit.hide() + self.partlist = DiskList(self) + self.dialog = None - vbox = QVBoxLayout(self) + vbox = QtGui.QVBoxLayout(self) vbox.addWidget(self.partlist) + self.partlist.show() + """ self.connect(self.partlist, PYSIGNAL("signalCreate"), self.slotCreatePart) @@ -100,12 +102,10 @@ self.connect(self.partedit, PYSIGNAL("signalCanceled"), self.slotCanceled) - + """ def shown(self): - from os.path import basename - ctx.debugger.log("%s loaded" % basename(__file__)) - ctx.screens.disableNext() + ctx.mainScreen.disableNext() self.partlist.update() ## @@ -115,6 +115,7 @@ ctx.screens.processEvents() return True + """ def slotCreatePart(self, parent, d): self.partedit.setState(createState, d) self.dialog = Dialog(_("Create Partition"), self.partedit, self) @@ -142,4 +143,6 @@ def slotCanceled(self): self.dialog.reject() + """ + Modified: branches/yali4/yali4/gui/runner.py ================================================================= --- branches/yali4/yali4/gui/runner.py (original) +++ branches/yali4/yali4/gui/runner.py Wed Jan 2 18:33:52 2008 @@ -35,8 +35,8 @@ import ScrAdmin import ScrUsers import ScrPartitionAuto +import ScrPartitionManual -#import ScrPartitionManual #import ScrInstall #import ScrBootloader #import ScrGoodbye @@ -57,7 +57,8 @@ ScrKeyboard, ScrAdmin, ScrUsers, - ScrPartitionAuto + ScrPartitionAuto, + ScrPartitionManual ] """ Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Wed Jan 2 18:33:52 2008 @@ -239,7 +239,7 @@ else: return 1 l = self.getPartitions() - l.sort(comp) + l.sort(comp,reverse=True) return l ## From uludag-commits at pardus.org.tr Wed Jan 2 19:46:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 2 Jan 2008 19:46:15 +0200 (EET) Subject: [Uludag-commits] r16502 - branches/comar-dbus/comar/etc Message-ID: <20080102174615.E652E864CA7@liste.uludag.org.tr> Author: bahadir.kandemir Date: Wed Jan 2 19:46:15 2008 New Revision: 16502 Modified: branches/comar-dbus/comar/etc/model.xml Log: rename output variable Modified: branches/comar-dbus/comar/etc/model.xml ================================================================= --- branches/comar-dbus/comar/etc/model.xml (original) +++ branches/comar-dbus/comar/etc/model.xml Wed Jan 2 19:46:15 2008 @@ -177,14 +177,14 @@ - + - + From uludag-commits at pardus.org.tr Thu Jan 3 00:26:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 00:26:29 +0200 (EET) Subject: [Uludag-commits] r16503 - trunk/dbus-pyqt3-mainloop/src Message-ID: <20080102222629.C70EC7C0098@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 00:26:29 2008 New Revision: 16503 Modified: trunk/dbus-pyqt3-mainloop/src/mainloop.cpp Log: dbus_watch_get_fd is depreceated use dbus_watch_get_unix_fd instead... Modified: trunk/dbus-pyqt3-mainloop/src/mainloop.cpp ================================================================= --- trunk/dbus-pyqt3-mainloop/src/mainloop.cpp (original) +++ trunk/dbus-pyqt3-mainloop/src/mainloop.cpp Thu Jan 3 00:26:29 2008 @@ -213,7 +213,7 @@ QDBusConnectionPrivate *d = static_cast(data); int flags = dbus_watch_get_flags(watch); - int fd = dbus_watch_get_fd(watch); + int fd = dbus_watch_get_unix_fd(watch); QDBusConnectionPrivate::Watcher watcher; if (flags & DBUS_WATCH_READABLE) { @@ -256,7 +256,7 @@ //qDebug("remove watch"); QDBusConnectionPrivate *d = static_cast(data); - int fd = dbus_watch_get_fd(watch); + int fd = dbus_watch_get_unix_fd(watch); QDBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) @@ -299,7 +299,7 @@ //qDebug("toggle watch"); QDBusConnectionPrivate *d = static_cast(data); - int fd = dbus_watch_get_fd(watch); + int fd = dbus_watch_get_unix_fd(watch); QDBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { @@ -312,7 +312,7 @@ int flags = dbus_watch_get_flags(watch); // qDebug("toggle watch %d to %d (write: %d, read: %d)", -// dbus_watch_get_fd(watch), enabled, +// dbus_watch_get_unix_fd(watch), enabled, // flags & DBUS_WATCH_WRITABLE, flags & DBUS_WATCH_READABLE); if (flags & DBUS_WATCH_READABLE && (*wit).read) From uludag-commits at pardus.org.tr Thu Jan 3 00:32:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 00:32:29 +0200 (EET) Subject: [Uludag-commits] r16504 - branches/yali4/yali4/gui Message-ID: <20080102223229.A93AD7C0098@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Jan 3 00:32:29 2008 New Revision: 16504 Modified: branches/yali4/yali4/gui/DiskWidgets.py Log: Good Night commit.. Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Thu Jan 3 00:32:29 2008 @@ -79,7 +79,7 @@ def addDevice(self, dev): def sizePix(mb,total): - return (self.toolBox.width() * total) / mb + return (self.toolBox.width() * mb) / total def sizeStr(mb): if mb > 1024: @@ -124,18 +124,9 @@ #name = _("Free") continue name = _("Partition %d") % part.getMinor() - parent_item.addPartition(name,part) - - # use the first found "linux-swap" partition as swap (# 1049) - if part.getFSName() == "linux-swap(new)" and not self.autoSwapSelected: - ctx.partrequests.append( - request.MountRequest(part, parttype.swap)) - ctx.partrequests.append( - request.FormatRequest(part, parttype.swap)) - ctx.partrequests.append( - request.LabelRequest(part, parttype.swap)) - self.autoSwapSelected = True + parent_item.addPartition(name,part,sizePix(part.getMB(),dev.getTotalMB())) + d.updateSizes() class DiskItem(QtGui.QWidget): # storage.Device or partition.Partition @@ -158,18 +149,15 @@ self.partitions = [] self.name = name - def addPartition(self,name=None,data=None): + def addPartition(self,name=None,data=None,_size=None): partition = QtGui.QRadioButton("%s\n%s" % (name,data.getSizeStr()),self.diskGroup) partition.setStyleSheet("background-color:lightblue") - partition.setMinimumSize(QSize(100,0)) partition.setFocusPolicy(Qt.NoFocus) - + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Fixed) + partition.setSizePolicy(sizePolicy) self.splinter.addWidget(partition) - - policy = partition.sizePolicy(); - policy.setHorizontalStretch(100); - partition.setSizePolicy(policy); - self.partitions.append({"name":name,"data":data}) + self.partitions.append({"name":name,"data":data,"size":_size}) + ctx.debugger.log("Current Size : %s" % partition.width()) #{"size":part.getSizeStr(), # "installType":"", # "filesystem":part.getFSName()} @@ -180,6 +168,13 @@ def getData(self): return self._data + def updateSizes(self): + i=0 + for part in self.partitions: + self.splinter.widget(i).resize(part['size'],0) + self.splinter.widget(i).setMaximumSize(QSize(part['size'],70)) + i+=1 + if __name__ == "__main__": import sys app = QtGui.QApplication(sys.argv) From uludag-commits at pardus.org.tr Thu Jan 3 04:15:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 04:15:13 +0200 (EET) Subject: [Uludag-commits] r16505 - trunk/pardusman/po Message-ID: <20080103021513.716FB86417F@liste.uludag.org.tr> Author: mustafaoe Date: Thu Jan 3 04:15:13 2008 New Revision: 16505 Modified: trunk/pardusman/po/de.po Log: German translations updated. Modified: trunk/pardusman/po/de.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu Jan 3 09:06:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 09:06:39 +0200 (EET) Subject: [Uludag-commits] r16508 - branches/comar-dbus/comar/src Message-ID: <20080103070639.32D828642B8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 09:06:38 2008 New Revision: 16508 Modified: branches/comar-dbus/comar/src/dbus.c branches/comar-dbus/comar/src/log.c branches/comar-dbus/comar/src/main.c Log: Show bus address in error/debug messages Modified: branches/comar-dbus/comar/src/dbus.c ================================================================= --- branches/comar-dbus/comar/src/dbus.c (original) +++ branches/comar-dbus/comar/src/dbus.c Thu Jan 3 09:06:38 2008 @@ -489,7 +489,7 @@ PolKitResult polkit_result; if (policy_check(sender, interface, method, &polkit_result)) { - log_debug(LOG_PLCY, "PolicyKit: %s [%s.%s] = %s\n", sender, interface, method, polkit_result_to_string_representation(polkit_result)); + log_debug(LOG_PLCY, "PolicyKit: %s.%s = %s\n", interface, method, polkit_result_to_string_representation(polkit_result)); switch (polkit_result) { case POLKIT_RESULT_YES: return 1; @@ -646,7 +646,7 @@ switch (dbus_message_get_type(msg)) { case DBUS_MESSAGE_TYPE_METHOD_CALL: log_debug(LOG_DBUS, "DBus method call [%s.%s] from [%s]\n", interface, method, sender); - proc_fork(dbus_method_call, "ComarDBusJob", conn, msg); + proc_fork(dbus_method_call, "ComarJob", conn, msg); break; case DBUS_MESSAGE_TYPE_SIGNAL: log_debug(LOG_DBUS, "DBus signal [%s.%s] from [%s]\n", interface, method, sender); Modified: branches/comar-dbus/comar/src/log.c ================================================================= --- branches/comar-dbus/comar/src/log.c (original) +++ branches/comar-dbus/comar/src/log.c Thu Jan 3 09:06:38 2008 @@ -37,10 +37,18 @@ static void pidstamp(FILE *f) { - if (strlen(my_proc.desc) <= 5) + if (strlen(my_proc.desc) <= 5) { fprintf(f, "(%s-%d) ", my_proc.desc, getpid()); - else - fprintf(f, "(%s-%d) ", my_proc.desc + 5, getpid()); + } + else { + if (my_proc.bus_msg) { + const char *sender = dbus_message_get_sender(my_proc.bus_msg); + fprintf(f, "(%s-%d) [bus%s] ", my_proc.desc + 5, getpid(), sender); + } + else { + fprintf(f, "(%s-%d) ", my_proc.desc + 5, getpid()); + } + } } //! Print log Modified: branches/comar-dbus/comar/src/main.c ================================================================= --- branches/comar-dbus/comar/src/main.c (original) +++ branches/comar-dbus/comar/src/main.c Thu Jan 3 09:06:38 2008 @@ -65,7 +65,7 @@ init_children: // Listen for DBus calls - proc_fork(dbus_listen, "ComarDBus", NULL, NULL); + proc_fork(dbus_listen, "ComarBus", NULL, NULL); while (1) { if (my_proc.nr_children == 0) { From uludag-commits at pardus.org.tr Thu Jan 3 09:22:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 09:22:35 +0200 (EET) Subject: [Uludag-commits] r16509 - trunk/dbus-pyqt3-mainloop/examples Message-ID: <20080103072235.D049D7C03C5@liste.uludag.org.tr> Author: gokcen.eraslan Date: Thu Jan 3 09:22:35 2008 New Revision: 16509 Modified: trunk/dbus-pyqt3-mainloop/examples/signal-emitter.py Log: update service script to use qt mainloop Modified: trunk/dbus-pyqt3-mainloop/examples/signal-emitter.py ================================================================= --- trunk/dbus-pyqt3-mainloop/examples/signal-emitter.py (original) +++ trunk/dbus-pyqt3-mainloop/examples/signal-emitter.py Thu Jan 3 09:22:35 2008 @@ -1,10 +1,12 @@ #!/usr/bin/env python -import gobject - import dbus import dbus.service -import dbus.mainloop.glib +import dbus.mainloop.qt3 + +from qt import * + +import sys class TestObject(dbus.service.Object): def __init__(self, conn, object_path='/com/example/TestService/object'): @@ -22,19 +24,17 @@ self.HelloSignal('Hello') return 'Signal emitted' - @dbus.service.method("com.example.TestService", - in_signature='', out_signature='') + @dbus.service.method("com.example.TestService", in_signature='', out_signature='') def Exit(self): loop.quit() if __name__ == '__main__': - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) session_bus = dbus.SessionBus() name = dbus.service.BusName('com.example.TestService', session_bus) object = TestObject(session_bus) - loop = gobject.MainLoop() + loop = QApplication(sys.argv) print "Running example signal emitter service." - #print usage - loop.run() + sys.exit(loop.exec_loop()) From uludag-commits at pardus.org.tr Thu Jan 3 09:34:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 09:34:23 +0200 (EET) Subject: [Uludag-commits] r16510 - branches/comar-dbus/tests/scripts Message-ID: <20080103073423.9AA2A8642B8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 09:34:23 2008 New Revision: 16510 Modified: branches/comar-dbus/tests/scripts/User_Manager.py Log: fix argument order Modified: branches/comar-dbus/tests/scripts/User_Manager.py ================================================================= --- branches/comar-dbus/tests/scripts/User_Manager.py (original) +++ branches/comar-dbus/tests/scripts/User_Manager.py Thu Jan 3 09:34:23 2008 @@ -303,7 +303,7 @@ ret = () return ret -def addUser(name, password, uid, realname, homedir, shell, groups): +def addUser(uid, name, realname, homedir, shell, password, groups): if not realname: realname = "" if not homedir: From uludag-commits at pardus.org.tr Thu Jan 3 09:41:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 09:41:32 +0200 (EET) Subject: [Uludag-commits] r16511 - in branches/tasma-dbus: . user-manager user-manager/help user-manager/help/de user-manager/help/en user-manager/help/es user-manager/help/fr user-manager/help/nl user-manager/help/pt_BR user-manager/help/tr user-manager/po Message-ID: <20080103074132.2DB058642B8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 09:41:31 2008 New Revision: 16511 Added: branches/tasma-dbus/ branches/tasma-dbus/user-manager/ branches/tasma-dbus/user-manager/AUTHORS branches/tasma-dbus/user-manager/README branches/tasma-dbus/user-manager/browser.py branches/tasma-dbus/user-manager/groupedit.py branches/tasma-dbus/user-manager/help/ branches/tasma-dbus/user-manager/help/de/ branches/tasma-dbus/user-manager/help/de/main_help.html branches/tasma-dbus/user-manager/help/en/ branches/tasma-dbus/user-manager/help/en/main_help.html branches/tasma-dbus/user-manager/help/es/ branches/tasma-dbus/user-manager/help/es/main_help.html branches/tasma-dbus/user-manager/help/fr/ branches/tasma-dbus/user-manager/help/fr/main_help.html branches/tasma-dbus/user-manager/help/help.css branches/tasma-dbus/user-manager/help/nl/ branches/tasma-dbus/user-manager/help/nl/help.css branches/tasma-dbus/user-manager/help/nl/main_help.html branches/tasma-dbus/user-manager/help/pt_BR/ branches/tasma-dbus/user-manager/help/pt_BR/main_help.html branches/tasma-dbus/user-manager/help/tr/ branches/tasma-dbus/user-manager/help/tr/main_help.html branches/tasma-dbus/user-manager/mainview.py branches/tasma-dbus/user-manager/po/ branches/tasma-dbus/user-manager/po/ca.po branches/tasma-dbus/user-manager/po/de.po branches/tasma-dbus/user-manager/po/es.po branches/tasma-dbus/user-manager/po/fr.po branches/tasma-dbus/user-manager/po/it.po branches/tasma-dbus/user-manager/po/nl.po branches/tasma-dbus/user-manager/po/pl.po branches/tasma-dbus/user-manager/po/pt_BR.po (contents, props changed) branches/tasma-dbus/user-manager/po/tr.po branches/tasma-dbus/user-manager/po/user-manager.pot branches/tasma-dbus/user-manager/setup.py (contents, props changed) branches/tasma-dbus/user-manager/user-manager.desktop branches/tasma-dbus/user-manager/user-manager.py (contents, props changed) branches/tasma-dbus/user-manager/useredit.py branches/tasma-dbus/user-manager/utility.py Log: Porting *-Managers to COMAR 2.0 - User-Manager From uludag-commits at pardus.org.tr Thu Jan 3 10:14:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 10:14:14 +0200 (EET) Subject: [Uludag-commits] r16512 - branches/comar-dbus/tests/scripts Message-ID: <20080103081414.59D6A7C009E@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 10:14:14 2008 New Revision: 16512 Modified: branches/comar-dbus/tests/scripts/Boot_Modules.py branches/comar-dbus/tests/scripts/User_Manager.py Log: fix module names Modified: branches/comar-dbus/tests/scripts/Boot_Modules.py ================================================================= --- branches/comar-dbus/tests/scripts/Boot_Modules.py (original) +++ branches/comar-dbus/tests/scripts/Boot_Modules.py Thu Jan 3 10:14:14 2008 @@ -1,7 +1,7 @@ import os import subprocess -from pardus.filelock import FileLock +from pardus.fileutils import FileLock # Config Modified: branches/comar-dbus/tests/scripts/User_Manager.py ================================================================= --- branches/comar-dbus/tests/scripts/User_Manager.py (original) +++ branches/comar-dbus/tests/scripts/User_Manager.py Thu Jan 3 10:14:14 2008 @@ -17,7 +17,7 @@ import md5 import random -from pardus.filelock import FileLock +from pardus.fileutils import FileLock _ = lambda x: x["en"] From uludag-commits at pardus.org.tr Thu Jan 3 10:16:37 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 10:16:37 +0200 (EET) Subject: [Uludag-commits] r16513 - branches/tasma-dbus Message-ID: <20080103081637.967557C009E@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 10:16:37 2008 New Revision: 16513 Added: branches/tasma-dbus/README Log: Readme From uludag-commits at pardus.org.tr Thu Jan 3 12:28:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 12:28:42 +0200 (EET) Subject: [Uludag-commits] r16514 - branches/comar-dbus/comar Message-ID: <20080103102842.B4FBE8641B0@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 12:28:42 2008 New Revision: 16514 Modified: branches/comar-dbus/comar/CMakeLists.txt Log: PK is not optional Modified: branches/comar-dbus/comar/CMakeLists.txt ================================================================= --- branches/comar-dbus/comar/CMakeLists.txt (original) +++ branches/comar-dbus/comar/CMakeLists.txt Thu Jan 3 12:28:42 2008 @@ -59,11 +59,7 @@ # Check if system has PolicyKit # PK is not a required dependency in SVN builds. -IF (VERSION_SUFFIX STREQUAL "svn") - FIND_PACKAGE (PolicyKit) -ELSE (VERSION_SUFFIX STREQUAL "svn") - FIND_PACKAGE (PolicyKit REQUIRED) -ENDIF (VERSION_SUFFIX STREQUAL "svn") +FIND_PACKAGE (PolicyKit REQUIRED) # If PK is installed, enable PK support IF (HAVE_POLICYKIT) From uludag-commits at pardus.org.tr Thu Jan 3 13:31:18 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 13:31:18 +0200 (EET) Subject: [Uludag-commits] r16516 - branches/comar-dbus/comar/etc Message-ID: <20080103113118.B03C87C0088@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 13:31:18 2008 New Revision: 16516 Added: branches/comar-dbus/comar/etc/tr.org.pardus.comar.service Log: service conf From uludag-commits at pardus.org.tr Thu Jan 3 13:38:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 13:38:19 +0200 (EET) Subject: [Uludag-commits] r16517 - branches/comar-dbus/comar Message-ID: <20080103113819.2553A7C0095@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 13:38:18 2008 New Revision: 16517 Modified: branches/comar-dbus/comar/CMakeLists.txt Log: install Modified: branches/comar-dbus/comar/CMakeLists.txt ================================================================= --- branches/comar-dbus/comar/CMakeLists.txt (original) +++ branches/comar-dbus/comar/CMakeLists.txt Thu Jan 3 13:38:18 2008 @@ -90,6 +90,11 @@ DESTINATION /etc/dbus-1/system.d RENAME ${APP_NAME}.conf) +# Install comar service activation under /usr/share/dbus-1/system-services/ +INSTALL (FILES + etc/tr.org.pardus.comar.service + DESTINATION /usr/share/dbus-1/system-services/) + # Install PK policies IF (HAVE_POLICYKIT) INSTALL (DIRECTORY From uludag-commits at pardus.org.tr Thu Jan 3 13:41:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 13:41:57 +0200 (EET) Subject: [Uludag-commits] r16518 - in branches/comar-dbus/comar: . src Message-ID: <20080103114157.AE9067C008E@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 13:41:57 2008 New Revision: 16518 Modified: branches/comar-dbus/comar/CMakeLists.txt branches/comar-dbus/comar/src/dbus.c Log: remove HAVE_POLICYKIT its now hard-dependency Modified: branches/comar-dbus/comar/CMakeLists.txt ================================================================= --- branches/comar-dbus/comar/CMakeLists.txt (original) +++ branches/comar-dbus/comar/CMakeLists.txt Thu Jan 3 13:41:57 2008 @@ -40,19 +40,22 @@ src/log.c src/process.c src/pydbus.c + src/policy.c src/model.c src/utility.c) # Set standard libraries SET (LIBS python2.4 dbus-1 + polkit-dbus db) # Include standard headers INCLUDE_DIRECTORIES (include/ /usr/include/python2.4 /usr/include/dbus-1.0 - /usr/lib/dbus-1.0/include) + /usr/lib/dbus-1.0/include + /usr/include/PolicyKit) # Load CMAKE modules SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") @@ -61,14 +64,6 @@ # PK is not a required dependency in SVN builds. FIND_PACKAGE (PolicyKit REQUIRED) -# If PK is installed, enable PK support -IF (HAVE_POLICYKIT) - SET (SOURCES ${SOURCES} src/policy.c) - SET (LIBS ${LIBS} polkit-dbus) - INCLUDE_DIRECTORIES (/usr/include/PolicyKit) - ADD_DEFINITIONS (-D'HAVE_POLICYKIT') -ENDIF (HAVE_POLICYKIT) - # Compile comar from specified sources ADD_EXECUTABLE (comar ${SOURCES}) @@ -96,9 +91,7 @@ DESTINATION /usr/share/dbus-1/system-services/) # Install PK policies -IF (HAVE_POLICYKIT) - INSTALL (DIRECTORY - etc/policy - DESTINATION /usr/share/PolicyKit - PATTERN ".svn" EXCLUDE) -ENDIF (HAVE_POLICYKIT) +INSTALL (DIRECTORY + etc/policy + DESTINATION /usr/share/PolicyKit + PATTERN ".svn" EXCLUDE) Modified: branches/comar-dbus/comar/src/dbus.c ================================================================= --- branches/comar-dbus/comar/src/dbus.c (original) +++ branches/comar-dbus/comar/src/dbus.c Thu Jan 3 13:41:57 2008 @@ -23,9 +23,7 @@ #include "pydbus.h" #include "utility.h" -#ifdef HAVE_POLICYKIT #include "policy.h" -#endif //! Sends message to client void @@ -473,7 +471,6 @@ free(model); } -#ifdef HAVE_POLICYKIT //! Checks if sender is allowed to call specified method static int dbus_policy_check(const char *sender, const char *interface, const char *method) @@ -515,7 +512,6 @@ return 0; } } -#endif //! Forked function that handles method calls static void @@ -550,9 +546,7 @@ dbus_introspection_methods(path); } else if (strncmp(interface, cfg_bus_name, strlen(cfg_bus_name)) == 0) { - #ifdef HAVE_POLICYKIT if (dbus_policy_check(sender, interface, method)) { - #endif if (strcmp(path, "/") == 0 && strcmp(interface, cfg_bus_name) == 0) { dbus_comar_methods(method); } @@ -563,9 +557,7 @@ log_error("Unknown object path '%s'\n", path); dbus_reply_error("dbus", "unknownpath", "Unknown object path"); } - #ifdef HAVE_POLICYKIT } - #endif } else { dbus_reply_error("dbus", "unknownmodel", "Unknown interface"); From uludag-commits at pardus.org.tr Thu Jan 3 13:57:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 13:57:01 +0200 (EET) Subject: [Uludag-commits] r16519 - branches/comar-dbus/comar/etc/policy Message-ID: <20080103115701.A6AC786406E@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 13:57:01 2008 New Revision: 16519 Modified: branches/comar-dbus/comar/etc/policy/comar.bootloader.policy branches/comar-dbus/comar/etc/policy/comar.modules.policy branches/comar-dbus/comar/etc/policy/comar.netlink.policy branches/comar-dbus/comar/etc/policy/comar.netstack.policy branches/comar-dbus/comar/etc/policy/comar.policy branches/comar-dbus/comar/etc/policy/comar.system.package.policy branches/comar-dbus/comar/etc/policy/comar.time.policy branches/comar-dbus/comar/etc/policy/comar.user.policy Log: pretty xml Modified: branches/comar-dbus/comar/etc/policy/comar.bootloader.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.bootloader.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.bootloader.policy Thu Jan 3 13:57:01 2008 @@ -1,80 +1,86 @@ - + - - List systems supported by boot loader - System policy prevents listing systems. - - yes - yes - yes - - - - List boot loader options. - System policy prevents listing options. - - yes - yes - yes - - - - List boot loader entries. - System policy prevents listing entries. - - yes - yes - yes - - - - List unused kernels. - System policy prevents listing unused kernels. - - yes - yes - yes - - - - Update kernel release on specified partition. - System policy prevents updating kernel. - - no - no - no - - - - Remove entry from boot loader. - System policy prevents removing entry. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Remove unused kernel from system. - System policy prevents removing unused kernels. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - - Edit boot loader options and add new entries. - System policy prevents changing bootloader settings. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - + + + List systems supported by boot loader + System policy prevents listing systems. + + yes + yes + yes + + + + + List boot loader options. + System policy prevents listing options. + + yes + yes + yes + + + + + List boot loader entries. + System policy prevents listing entries. + + yes + yes + yes + + + + + List unused kernels. + System policy prevents listing unused kernels. + + yes + yes + yes + + + + + Update kernel release on specified partition. + System policy prevents updating kernel. + + no + no + no + + + + + Remove entry from boot loader. + System policy prevents removing entry. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Remove unused kernel from system. + System policy prevents removing unused kernels. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + + Edit boot loader options and add new entries. + System policy prevents changing bootloader settings. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + Modified: branches/comar-dbus/comar/etc/policy/comar.modules.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.modules.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.modules.policy Thu Jan 3 13:57:01 2008 @@ -1,80 +1,86 @@ - + - - Set module options - System policy prevents setting module options. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Load kernel module - System policy prevents loading kernel module. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Unload kernel module - System policy prevents unloading kernel module. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Unload kernel module - System policy prevents unloading kernel module. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Update module configuration - System policy prevents updating module configuration. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - - Get module information - System policy prevents getting module information. - - yes - yes - yes - - - - Edit autoload list. - System policy prevents editing autoload list. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Edit module blacklist. - System policy prevents editing module blacklist. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - + + + Set module options + System policy prevents setting module options. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Load kernel module + System policy prevents loading kernel module. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Unload kernel module + System policy prevents unloading kernel module. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Unload kernel module + System policy prevents unloading kernel module. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Update module configuration + System policy prevents updating module configuration. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + + Get module information + System policy prevents getting module information. + + yes + yes + yes + + + + + Edit autoload list. + System policy prevents editing autoload list. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Edit module blacklist. + System policy prevents editing module blacklist. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + Modified: branches/comar-dbus/comar/etc/policy/comar.netlink.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.netlink.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.netlink.policy Thu Jan 3 13:57:01 2008 @@ -1,44 +1,46 @@ - + - - Scan remote access points. - System policy prevents scanning remote access points. - - yes - yes - yes - - - - Delete connection. - System policy prevents removing connections. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - - Set connection details. - System policy prevents adding/editing connections. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Get connection/device details - System policy prevents getting connection/device details. - - yes - yes - yes - - + + + Scan remote access points. + System policy prevents scanning remote access points. + + yes + yes + yes + + + + + Delete connection. + System policy prevents removing connections. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + + Set connection details. + System policy prevents adding/editing connections. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Get connection/device details + System policy prevents getting connection/device details. + + yes + yes + yes + + Modified: branches/comar-dbus/comar/etc/policy/comar.netstack.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.netstack.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.netstack.policy Thu Jan 3 13:57:01 2008 @@ -1,26 +1,26 @@ - + - - - Set hostname/nameserver info - System policy prevents changing host/nameserver information. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Get hostname/nameserver info - System policy prevents getting host/nameserver info. - - yes - yes - yes - - + + + + Set hostname/nameserver info + System policy prevents changing host/nameserver information. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Get hostname/nameserver info + System policy prevents getting host/nameserver info. + + yes + yes + yes + + Modified: branches/comar-dbus/comar/etc/policy/comar.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.policy Thu Jan 3 13:57:01 2008 @@ -1,61 +1,65 @@ - + - - Register new scripts - System policy prevents registering scripts. - - yes - yes - yes - - - - Remove application - System policy prevents removing applications. - - yes - yes - yes - - - - List applications - ... - - yes - yes - yes - - - - List models - ... - - yes - yes - yes - - - - List application models - ... - - yes - yes - yes - - - - List model applications - ... - - yes - yes - yes - - + + + Register new scripts + System policy prevents registering scripts. + + yes + yes + yes + + + + + Remove application + System policy prevents removing applications. + + yes + yes + yes + + + + + List applications + ... + + yes + yes + yes + + + + + List models + ... + + yes + yes + yes + + + + + List application models + ... + + yes + yes + yes + + + + + List model applications + ... + + yes + yes + yes + + Modified: branches/comar-dbus/comar/etc/policy/comar.system.package.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.system.package.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.system.package.policy Thu Jan 3 13:57:01 2008 @@ -1,25 +1,25 @@ - + - - Execute post install script of a package - System policy prevents executing post install script. - - no - no - no - - - - Execute pre remove script of a package - System policy prevents executing pre remove script. - - no - no - no - - + + + Execute post install script of a package + System policy prevents executing post install script. + + no + no + no + + + + + Execute pre remove script of a package + System policy prevents executing pre remove script. + + no + no + no + + Modified: branches/comar-dbus/comar/etc/policy/comar.time.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.time.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.time.policy Thu Jan 3 13:57:01 2008 @@ -1,26 +1,26 @@ - + - - - Set date/time - System policy prevents changing date/time. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Get date/time - System policy prevents getting date/time info. - - yes - yes - yes - - + + + + Set date/time + System policy prevents changing date/time. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Get date/time + System policy prevents getting date/time info. + + yes + yes + yes + + Modified: branches/comar-dbus/comar/etc/policy/comar.user.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.user.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.user.policy Thu Jan 3 13:57:01 2008 @@ -1,62 +1,66 @@ - + - - Add user - System policy prevents adding new user. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Change user details - System policy prevents editing user details. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Delete user - System policy prevents removing user. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Add group - System policy prevents adding new group. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - Delete group - System policy prevents removing group. - - auth_admin_keep_session - auth_admin_keep_session - auth_admin_keep_session - - - - - Get user/groups - System policy prevents getting user/group details. - - yes - yes - yes - - + + + Add user + System policy prevents adding new user. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Change user details + System policy prevents editing user details. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Delete user + System policy prevents removing user. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Add group + System policy prevents adding new group. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + Delete group + System policy prevents removing group. + + auth_admin_keep_session + auth_admin_keep_session + auth_admin_keep_session + + + + + + Get user/groups + System policy prevents getting user/group details. + + yes + yes + yes + + From uludag-commits at pardus.org.tr Thu Jan 3 14:18:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 14:18:38 +0200 (EET) Subject: [Uludag-commits] r16520 - in branches/comar-dbus/comar: include src Message-ID: <20080103121839.04D087C00B8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 14:18:38 2008 New Revision: 16520 Modified: branches/comar-dbus/comar/include/cfg.h branches/comar-dbus/comar/src/cfg.c branches/comar-dbus/comar/src/dbus.c branches/comar-dbus/comar/src/main.c branches/comar-dbus/comar/src/process.c Log: - DBus activation support. - COMAR won't fork bus_listen(), ComarDBus subprocess is unnecessary - Only SYTSTEM_BUS is supported, since COMAR is a system-wide service. Modified: branches/comar-dbus/comar/include/cfg.h ================================================================= --- branches/comar-dbus/comar/include/cfg.h (original) +++ branches/comar-dbus/comar/include/cfg.h Thu Jan 3 14:18:38 2008 @@ -10,7 +10,6 @@ extern char *cfg_bus_name; extern char *cfg_config_dir; extern char *cfg_data_dir; -extern int cfg_bus_type; extern int cfg_idle_shutdown; extern int cfg_log_console; extern int cfg_log_file; Modified: branches/comar-dbus/comar/src/cfg.c ================================================================= --- branches/comar-dbus/comar/src/cfg.c (original) +++ branches/comar-dbus/comar/src/cfg.c Thu Jan 3 14:18:38 2008 @@ -27,9 +27,6 @@ //! Data directory char *cfg_data_dir = DATA_DIR; -//! Bus type (system or session) -int cfg_bus_type = DBUS_BUS_SYSTEM; - //! Max idle time to shutdown session service int cfg_idle_shutdown = 30; @@ -69,14 +66,13 @@ { "debug", required_argument, NULL, 'g' }, { "idle", required_argument, NULL, 'i' }, { "print", 0, NULL, 'p' }, - { "type", required_argument, NULL, 't' }, { "help", 0, NULL, 'h' }, { "version", 0, NULL, 'v' }, { NULL, 0, NULL, 0 } }; //! Short options -static char *shortopts = "c:d:g:i:pt:hv"; +static char *shortopts = "c:d:g:i:phv"; //! Help message static void @@ -91,10 +87,8 @@ " (default is %s)\n" " -g, --debug [FLAG] Set debug flag.\n" " (Flags: dbus, proc, perf, full)\n" - " -t, --type [TYPE] DBus service type (system or session).\n" - " (default is system)\n" " -i, --idle [SECS] Shutdown after [SECS] seconds with no action.\n" - " (Only works with session type, default is %d)\n" + " (Default is %d)\n" " -p, --print Print debug messages to console.\n" " -h, --help Print this text and exit.\n" " -v, --version Print version and exit.\n" @@ -158,14 +152,6 @@ cfg_log_console = 1; cfg_log_file = 0; break; - case 't': - if (strcmp(optarg, "session") == 0) { - cfg_bus_type = DBUS_BUS_SESSION; - } - else { - cfg_bus_type = DBUS_BUS_SYSTEM; - } - break; case 'h': print_usage(argv[0]); exit(0); Modified: branches/comar-dbus/comar/src/dbus.c ================================================================= --- branches/comar-dbus/comar/src/dbus.c (original) +++ branches/comar-dbus/comar/src/dbus.c Thu Jan 3 14:18:38 2008 @@ -594,18 +594,19 @@ const char *unique_name; dbus_error_init(&err); - conn = dbus_bus_get(cfg_bus_type, &err); + conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); if (dbus_error_is_set(&err)) { log_error("Connection Error (%s)\n", err.message); dbus_error_free(&err); - proc_finish(); + return; } ret = dbus_bus_request_name(conn, cfg_bus_name, DBUS_NAME_FLAG_REPLACE_EXISTING, &err); if (dbus_error_is_set(&err)) { log_error("Name Error (%s)\n", err.message); dbus_error_free(&err); - proc_finish(); + dbus_connection_unref(conn); + return; } unique_name = dbus_bus_get_unique_name(conn); @@ -617,12 +618,13 @@ if (proc_check_idle() == 1) { log_info("Service was idle for %d second(s), closing daemon...\n", cfg_idle_shutdown); - return; + shutdown_activated = 1; + break; } if (shutdown_activated) { log_info("Shutdown requested.\n"); - return; + break; } if (NULL == msg) { @@ -645,4 +647,5 @@ break; } } + dbus_connection_unref(conn); } Modified: branches/comar-dbus/comar/src/main.c ================================================================= --- branches/comar-dbus/comar/src/main.c (original) +++ branches/comar-dbus/comar/src/main.c Thu Jan 3 14:18:38 2008 @@ -36,8 +36,8 @@ // Parse commandline options cfg_init(argc, argv); - // Only root can register system bus - if (cfg_bus_type == DBUS_BUS_SYSTEM && getuid() != 0) { + // Only root can register bus + if (getuid() != 0) { puts(_("System service should be started as root.")); exit(1); } @@ -65,20 +65,15 @@ init_children: // Listen for DBus calls - proc_fork(dbus_listen, "ComarBus", NULL, NULL); + dbus_listen(); - while (1) { - if (my_proc.nr_children == 0) { - if (shutdown_activated) { - model_free(); - proc_finish(); - } - else { - log_info("DBus connection is lost. Waiting 3 seconds and trying again...\n"); - sleep(3); - goto init_children; - } - } - proc_listen(&p, &size, -1, 0); + if (shutdown_activated) { + model_free(); + proc_finish(); + } + else { + log_info("DBus connection is lost. Waiting 3 seconds and trying again...\n"); + sleep(3); + goto init_children; } } Modified: branches/comar-dbus/comar/src/process.c ================================================================= --- branches/comar-dbus/comar/src/process.c (original) +++ branches/comar-dbus/comar/src/process.c Thu Jan 3 14:18:38 2008 @@ -84,15 +84,11 @@ proc_check_idle() { /*! - * Tests whether process id idle. This function will return - * 0 if cfg_bus_type is "system" + * Tests whether process id idle. * * @return 1 if true, 0 if false */ - if (cfg_bus_type == DBUS_BUS_SYSTEM) { - return 0; - } if (my_proc.nr_children == 0 && time_lastaction != 0 && difftime(time(0), time_lastaction) > cfg_idle_shutdown) { return 1; } @@ -131,16 +127,14 @@ set_my_name(my_proc.desc); time_lastaction = time(0); - if (cfg_bus_type == DBUS_BUS_SYSTEM) { - FILE *f = fopen(cfg_pid_name, "w"); - if (f) { - fprintf(f, "%d", getpid()); - fclose(f); - } - else { - printf("Can't create pid file '%s'\n", cfg_pid_name); - return 1; - } + FILE *f = fopen(cfg_pid_name, "w"); + if (f) { + fprintf(f, "%d", getpid()); + fclose(f); + } + else { + printf("Can't create pid file '%s'\n", cfg_pid_name); + return 1; } return 0; From uludag-commits at pardus.org.tr Thu Jan 3 14:29:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 14:29:41 +0200 (EET) Subject: [Uludag-commits] r16521 - branches/yali4/yali4/gui Message-ID: <20080103122941.34EE07C00B9@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Jan 3 14:29:40 2008 New Revision: 16521 Modified: branches/yali4/yali4/gui/DiskWidgets.py Log: Gimme more information.. Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Thu Jan 3 14:29:40 2008 @@ -30,7 +30,7 @@ class DiskList(QtGui.QWidget): def __init__(self, *args): QtGui.QWidget.__init__(self,None) - self.resize(QSize(QRect(0,0,600,80).size()).expandedTo(self.minimumSizeHint())) + self.resize(QSize(QRect(0,0,620,80).size()).expandedTo(self.minimumSizeHint())) self.setStyleSheet(""" QToolBox::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, @@ -79,7 +79,10 @@ def addDevice(self, dev): def sizePix(mb,total): - return (self.toolBox.width() * mb) / total + _p = (self.toolBox.width() * mb) / total + if _p<=1: + return 5 + return _p - 5 def sizeStr(mb): if mb > 1024: @@ -137,8 +140,8 @@ self.layout = QtGui.QGridLayout(self) self.layout.setContentsMargins(1,0,1,0) self.diskGroup = QtGui.QGroupBox(self) - self.diskGroup.setMinimumSize(QSize(570,70)) - self.diskGroup.setMaximumSize(QSize(570,70)) + self.diskGroup.setMinimumSize(QSize(590,70)) + self.diskGroup.setMaximumSize(QSize(590,70)) self.gridlayout = QtGui.QGridLayout(self.diskGroup) self.gridlayout.setMargin(0) self.gridlayout.setSpacing(0) @@ -153,8 +156,9 @@ partition = QtGui.QRadioButton("%s\n%s" % (name,data.getSizeStr()),self.diskGroup) partition.setStyleSheet("background-color:lightblue") partition.setFocusPolicy(Qt.NoFocus) + partition.setToolTip(_("Device: %s \nSize: %s \nFileSystem: %s") % (data.getPath(),data.getSizeStr(),data.getFSName())) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Fixed) - partition.setSizePolicy(sizePolicy) + #partition.setSizePolicy(sizePolicy) self.splinter.addWidget(partition) self.partitions.append({"name":name,"data":data,"size":_size}) ctx.debugger.log("Current Size : %s" % partition.width()) @@ -171,6 +175,9 @@ def updateSizes(self): i=0 for part in self.partitions: + _h = self.splinter.handle(i) + _h.setEnabled(False) + self.splinter.setCollapsible(i,False) self.splinter.widget(i).resize(part['size'],0) self.splinter.widget(i).setMaximumSize(QSize(part['size'],70)) i+=1 From uludag-commits at pardus.org.tr Thu Jan 3 14:31:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 14:31:44 +0200 (EET) Subject: [Uludag-commits] r16522 - branches/comar-dbus/tests Message-ID: <20080103123144.A1C027C00BC@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 14:31:44 2008 New Revision: 16522 Removed: branches/comar-dbus/tests/service.py Modified: branches/comar-dbus/tests/README Log: dbus activates comar when necessary, bye bye service.py Modified: branches/comar-dbus/tests/README ================================================================= --- branches/comar-dbus/tests/README (original) +++ branches/comar-dbus/tests/README Thu Jan 3 14:31:44 2008 @@ -14,12 +14,6 @@ cd test/ -Run ---- - - sudo ./service.py start - - Register Scripts ---------------- @@ -30,8 +24,3 @@ -------------- sudo tail -f /var/log/comar-dbus.log - - -Stop ----- - sudo ./service.py stop From uludag-commits at pardus.org.tr Thu Jan 3 14:37:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 14:37:55 +0200 (EET) Subject: [Uludag-commits] r16523 - in branches/tasma-dbus/network-manager: . help images po Message-ID: <20080103123755.D234E7C00B9@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 14:37:55 2008 New Revision: 16523 Added: branches/tasma-dbus/network-manager/ - copied from r16510, trunk/tasma/network-manager/ branches/tasma-dbus/network-manager/AUTHORS - copied unchanged from r16522, trunk/tasma/network-manager/AUTHORS branches/tasma-dbus/network-manager/README - copied unchanged from r16522, trunk/tasma/network-manager/README branches/tasma-dbus/network-manager/autoswitch.py - copied unchanged from r16522, trunk/tasma/network-manager/autoswitch.py branches/tasma-dbus/network-manager/browser.py - copied unchanged from r16522, trunk/tasma/network-manager/browser.py branches/tasma-dbus/network-manager/comariface.py - copied unchanged from r16522, trunk/tasma/network-manager/comariface.py branches/tasma-dbus/network-manager/connection.py - copied unchanged from r16522, trunk/tasma/network-manager/connection.py branches/tasma-dbus/network-manager/help/ - copied from r16522, trunk/tasma/network-manager/help/ branches/tasma-dbus/network-manager/icons.py - copied unchanged from r16522, trunk/tasma/network-manager/icons.py branches/tasma-dbus/network-manager/images/ - copied from r16522, trunk/tasma/network-manager/images/ branches/tasma-dbus/network-manager/nameconf.py - copied unchanged from r16522, trunk/tasma/network-manager/nameconf.py branches/tasma-dbus/network-manager/network-applet.desktop - copied unchanged from r16522, trunk/tasma/network-manager/network-applet.desktop branches/tasma-dbus/network-manager/network-applet.py - copied unchanged from r16522, trunk/tasma/network-manager/network-applet.py branches/tasma-dbus/network-manager/network-manager.desktop - copied unchanged from r16522, trunk/tasma/network-manager/network-manager.desktop branches/tasma-dbus/network-manager/network-manager.py - copied unchanged from r16522, trunk/tasma/network-manager/network-manager.py branches/tasma-dbus/network-manager/newconn.py - copied unchanged from r16522, trunk/tasma/network-manager/newconn.py branches/tasma-dbus/network-manager/po/ - copied from r16522, trunk/tasma/network-manager/po/ branches/tasma-dbus/network-manager/setup.py - copied unchanged from r16522, trunk/tasma/network-manager/setup.py branches/tasma-dbus/network-manager/widgets.py - copied unchanged from r16522, trunk/tasma/network-manager/widgets.py Log: starting dbus integration... From uludag-commits at pardus.org.tr Thu Jan 3 14:47:30 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 14:47:30 +0200 (EET) Subject: [Uludag-commits] r16524 - branches/comar-dbus/comar/etc/policy Message-ID: <20080103124730.9F4E67C00BC@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 14:47:30 2008 New Revision: 16524 Modified: branches/comar-dbus/comar/etc/policy/comar.policy Log: Only root may register&remove scripts Modified: branches/comar-dbus/comar/etc/policy/comar.policy ================================================================= --- branches/comar-dbus/comar/etc/policy/comar.policy (original) +++ branches/comar-dbus/comar/etc/policy/comar.policy Thu Jan 3 14:47:30 2008 @@ -7,9 +7,9 @@ Register new scripts System policy prevents registering scripts. - yes - yes - yes + no + no + no @@ -17,9 +17,9 @@ Remove application System policy prevents removing applications. - yes - yes - yes + no + no + no From uludag-commits at pardus.org.tr Thu Jan 3 16:12:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 16:12:51 +0200 (EET) Subject: [Uludag-commits] r16526 - branches/comar-dbus/comar/etc Message-ID: <20080103141251.BCC198641B0@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 16:12:51 2008 New Revision: 16526 Modified: branches/comar-dbus/comar/etc/model.xml Log: getState Modified: branches/comar-dbus/comar/etc/model.xml ================================================================= --- branches/comar-dbus/comar/etc/model.xml (original) +++ branches/comar-dbus/comar/etc/model.xml Thu Jan 3 16:12:51 2008 @@ -150,6 +150,10 @@ + + + + From uludag-commits at pardus.org.tr Thu Jan 3 16:41:43 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 16:41:43 +0200 (EET) Subject: [Uludag-commits] r16527 - in branches/yali4/yali4: . gui Message-ID: <20080103144143.BAD0F86406E@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Jan 3 16:41:43 2008 New Revision: 16527 Modified: branches/yali4/yali4/gui/DiskWidgets.py branches/yali4/yali4/storage.py Log: cosmetic Modified: branches/yali4/yali4/gui/DiskWidgets.py ================================================================= --- branches/yali4/yali4/gui/DiskWidgets.py (original) +++ branches/yali4/yali4/gui/DiskWidgets.py Thu Jan 3 16:41:43 2008 @@ -86,7 +86,7 @@ def sizeStr(mb): if mb > 1024: - return _("%0.1f GB free") % long(mb/1024.0) + return _("%0.1f GB free") % long(round(mb/1024.0)) else: return _("%d MB free") % mb @@ -157,14 +157,9 @@ partition.setStyleSheet("background-color:lightblue") partition.setFocusPolicy(Qt.NoFocus) partition.setToolTip(_("Device: %s \nSize: %s \nFileSystem: %s") % (data.getPath(),data.getSizeStr(),data.getFSName())) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Fixed) - #partition.setSizePolicy(sizePolicy) self.splinter.addWidget(partition) self.partitions.append({"name":name,"data":data,"size":_size}) ctx.debugger.log("Current Size : %s" % partition.width()) - #{"size":part.getSizeStr(), - # "installType":"", - # "filesystem":part.getFSName()} def setData(self, d): self._data = d @@ -182,22 +177,3 @@ self.splinter.widget(i).setMaximumSize(QSize(part['size'],70)) i+=1 -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - diskList = DiskList() - - disk1 = DiskItem("/dev/sda") - disk1.addPartition("/dev/sda1",{"size":"50GB"}) - disk1.addPartition("/dev/sda2",{"size":"50GB"}) - diskList.addDisk(disk1) - - disk2 = DiskItem("/dev/sdb") - disk2.addPartition("/dev/sdb1",{"size":"10GB"}) - disk2.addPartition("/dev/sdb2",{"size":"50GB"}) - disk2.addPartition("/dev/sdb3",{"size":"10GB"}) - diskList.addDisk(disk2) - - diskList.show() - sys.exit(app.exec_()) - Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Thu Jan 3 16:41:43 2008 @@ -138,10 +138,10 @@ # get device capacity in MBs # @returns: long def getTotalMB(self): - return long(self.getTotalBytes() / MEGABYTE) + return long(round(self.getTotalBytes() / MEGABYTE)) def getTotalGB(self): - return long(self.getTotalBytes() / GIGABYTE) + return long(round(self.getTotalBytes() / GIGABYTE)) ## # get device capacity string From uludag-commits at pardus.org.tr Thu Jan 3 19:38:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 19:38:38 +0200 (EET) Subject: [Uludag-commits] r16528 - branches/comar-dbus/d_light Message-ID: <20080103173838.AF1B37C03CA@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 19:38:38 2008 New Revision: 16528 Removed: branches/comar-dbus/d_light/ Log: Baby bye bye bye From uludag-commits at pardus.org.tr Thu Jan 3 19:39:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 19:39:05 +0200 (EET) Subject: [Uludag-commits] r16529 - branches/comar-dbus/docs Message-ID: <20080103173905.E859D7C03CB@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 19:39:05 2008 New Revision: 16529 Added: branches/comar-dbus/docs/ Log: docs coming From uludag-commits at pardus.org.tr Thu Jan 3 21:30:16 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 21:30:16 +0200 (EET) Subject: [Uludag-commits] r16530 - branches/tasma-dbus/user-manager Message-ID: <20080103193016.1B78F7C00E8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Thu Jan 3 21:30:15 2008 New Revision: 16530 Modified: branches/tasma-dbus/user-manager/useredit.py Log: fix arguments Modified: branches/tasma-dbus/user-manager/useredit.py ================================================================= --- branches/tasma-dbus/user-manager/useredit.py (original) +++ branches/tasma-dbus/user-manager/useredit.py Thu Jan 3 21:30:15 2008 @@ -546,7 +546,7 @@ self.guide.op_start(i18n("Adding user...")) uid = 0; def addUser(): - return self.link.addUser(self.u_id.text(), self.u_name.text(), self.u_realname.text(), self.u_password.text(), self.u_home.text(), self.u_shell.text(), self.u_groups.text().split(",")) + return self.link.addUser(self.u_id.text(), self.u_name.text(), self.u_realname.text(), self.u_home.text(), self.u_shell.text(), self.u_password.text(), self.u_groups.text().split(",")) try: uid = addUser() except DBusException, e: From uludag-commits at pardus.org.tr Thu Jan 3 23:52:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 3 Jan 2008 23:52:10 +0200 (EET) Subject: [Uludag-commits] r16531 - trunk/repository-scripts/xorg Message-ID: <20080103215210.71C408640C9@liste.uludag.org.tr> Author: caglar Date: Thu Jan 3 23:52:10 2008 New Revision: 16531 Modified: trunk/repository-scripts/xorg/pack.sh Log: artęk 7.3 ol Modified: trunk/repository-scripts/xorg/pack.sh ================================================================= --- trunk/repository-scripts/xorg/pack.sh (original) +++ trunk/repository-scripts/xorg/pack.sh Thu Jan 3 23:52:10 2008 @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="7.2" +VERSION="7.3" for option in $*; do case $option in From uludag-commits at pardus.org.tr Fri Jan 4 08:51:48 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 4 Jan 2008 08:51:48 +0200 (EET) Subject: [Uludag-commits] r16532 - in branches/comar-dbus/comar: include src Message-ID: <20080104065148.D74597C00E8@liste.uludag.org.tr> Author: bahadir.kandemir Date: Fri Jan 4 08:51:48 2008 New Revision: 16532 Modified: branches/comar-dbus/comar/include/cfg.h branches/comar-dbus/comar/src/cfg.c branches/comar-dbus/comar/src/dbus.c branches/comar-dbus/comar/src/process.c Log: * --idle argument renamed to --timeout --timeout=0 disables timeout * Main process won't be renamed to Comar. Modified: branches/comar-dbus/comar/include/cfg.h ================================================================= --- branches/comar-dbus/comar/include/cfg.h (original) +++ branches/comar-dbus/comar/include/cfg.h Fri Jan 4 08:51:48 2008 @@ -10,7 +10,7 @@ extern char *cfg_bus_name; extern char *cfg_config_dir; extern char *cfg_data_dir; -extern int cfg_idle_shutdown; +extern int cfg_timeout; extern int cfg_log_console; extern int cfg_log_file; extern char *cfg_log_file_name; Modified: branches/comar-dbus/comar/src/cfg.c ================================================================= --- branches/comar-dbus/comar/src/cfg.c (original) +++ branches/comar-dbus/comar/src/cfg.c Fri Jan 4 08:51:48 2008 @@ -28,7 +28,7 @@ char *cfg_data_dir = DATA_DIR; //! Max idle time to shutdown session service -int cfg_idle_shutdown = 30; +int cfg_timeout = 60; //! Print log messages to console? int cfg_log_console = 0; @@ -64,7 +64,7 @@ { "configdir", required_argument, NULL, 'c' }, { "datadir", required_argument, NULL, 'd' }, { "debug", required_argument, NULL, 'g' }, - { "idle", required_argument, NULL, 'i' }, + { "timeout", required_argument, NULL, 't' }, { "print", 0, NULL, 'p' }, { "help", 0, NULL, 'h' }, { "version", 0, NULL, 'v' }, @@ -72,7 +72,7 @@ }; //! Short options -static char *shortopts = "c:d:g:i:phv"; +static char *shortopts = "c:d:g:t:phv"; //! Help message static void @@ -87,8 +87,8 @@ " (default is %s)\n" " -g, --debug [FLAG] Set debug flag.\n" " (Flags: dbus, proc, perf, full)\n" - " -i, --idle [SECS] Shutdown after [SECS] seconds with no action.\n" - " (Default is %d)\n" + " -t, --timeout [SECS] Shutdown after [SECS] seconds with no action.\n" + " (Default is %d, 0 disables timeout)\n" " -p, --print Print debug messages to console.\n" " -h, --help Print this text and exit.\n" " -v, --version Print version and exit.\n" @@ -96,7 +96,7 @@ name, cfg_config_dir, cfg_data_dir, - cfg_idle_shutdown + cfg_timeout ); } @@ -142,11 +142,8 @@ cfg_log_flags |= logflags[j].value; } break; - case 'i': - cfg_idle_shutdown = strtol(optarg, NULL, 0); - if (cfg_idle_shutdown == 0) { - cfg_idle_shutdown = 30; - } + case 't': + cfg_timeout = strtol(optarg, NULL, 0); break; case 'p': cfg_log_console = 1; Modified: branches/comar-dbus/comar/src/dbus.c ================================================================= --- branches/comar-dbus/comar/src/dbus.c (original) +++ branches/comar-dbus/comar/src/dbus.c Fri Jan 4 08:51:48 2008 @@ -617,7 +617,7 @@ msg = dbus_connection_pop_message(conn); if (proc_check_idle() == 1) { - log_info("Service was idle for %d second(s), closing daemon...\n", cfg_idle_shutdown); + log_info("Service was idle for %d second(s), closing daemon...\n", cfg_timeout); shutdown_activated = 1; break; } Modified: branches/comar-dbus/comar/src/process.c ================================================================= --- branches/comar-dbus/comar/src/process.c (original) +++ branches/comar-dbus/comar/src/process.c Fri Jan 4 08:51:48 2008 @@ -73,6 +73,10 @@ * @name Process name */ + if (my_proc.parent.from == -1) { + return; + } + if (strlen(name) + 1 < name_size) { memset(name_addr, 0, name_size); strcpy(name_addr, name); @@ -89,7 +93,11 @@ * @return 1 if true, 0 if false */ - if (my_proc.nr_children == 0 && time_lastaction != 0 && difftime(time(0), time_lastaction) > cfg_idle_shutdown) { + if (cfg_timeout == 0) { +