From uludag-commits at pardus.org.tr Wed Oct 1 23:48:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 1 Oct 2008 23:48:19 +0300 (EEST) Subject: [Uludag-commits] r20400 - in trunk/staj-projeleri/paket-arama: . src Message-ID: <20081001204819.657861384070@liste.pardus.org.tr> Author: emre.aladag Date: Wed Oct 1 23:48:18 2008 New Revision: 20400 Modified: trunk/staj-projeleri/paket-arama/README-tr trunk/staj-projeleri/paket-arama/src/sqlgen.py Log: * Some more explanation for installation * Support for quotes in the path. * Fixed a great bug: last {pkgnum mod 50} packages hadn't been recorded... Modified: trunk/staj-projeleri/paket-arama/README-tr ================================================================= --- trunk/staj-projeleri/paket-arama/README-tr (original) +++ trunk/staj-projeleri/paket-arama/README-tr Wed Oct 1 23:48:18 2008 @@ -41,4 +41,6 @@ =============== 1) Django kurulmalı veya projeyle aynı dizine konularak PythonPath'e eklenmeli. 2) settings.py dosyası ihtiyaca göre düzenlenmeli. - 3) Düzenli olarak çiftliklerden bz2 dosyalarını toplayan/sync eden bir betik yazılmalı(sha1sum kontrolü yapılabilir, henüz desteği yok). Bu dosyalar aynı zamanda uygun bir zamanda MySQL'e yüklenmeli. Bu yükleme sürecinde bir bakım modu koyulabilir. En kötü ihtimalle sonuç bulunamadı çıktısı alınır. DROP TABLE IF EXISTS ve CREATE TABLE ard arda yapıldığı için tablo bulunamadı hatası alma olasılığı oldukça düşüktür. \ No newline at end of file + 3) python manage.py syncdb ile veritabanında gerekli tablolar oluşturulmalı. + 4) Düzenli olarak çiftliklerden bz2 dosyalarını toplayan/sync eden bir betik yazılmalı(sha1sum kontrolü +yapılabilir, henüz desteği yok) ve bu betik düzenli olarak çalıştırılmalı. Bu dosyalar aynı zamanda uygun bir zamanda MySQL'e yüklenmeli. Bu yükleme sürecinde bir bakım modu koyulabilir. En kötü ihtimalle sonuç bulunamadı çıktısı alınır. DROP TABLE IF EXISTS ve CREATE TABLE ard arda yapıldığı için tablo bulunamadı hatası alma olasılığı oldukça düşüktür. Modified: trunk/staj-projeleri/paket-arama/src/sqlgen.py ================================================================= --- trunk/staj-projeleri/paket-arama/src/sqlgen.py (original) +++ trunk/staj-projeleri/paket-arama/src/sqlgen.py Wed Oct 1 23:48:18 2008 @@ -11,6 +11,10 @@ import sys import os +def append_to_file(file_name, content): + f = open(file_name, "a") + f.write(content) + f.close() # Determine version try: @@ -90,20 +94,23 @@ #else: # for pisi api changes... # files = [file.path for file in pi.get_files(package).list] - # For each file, generate an INSERT INTO statement and append it + for file in files: - statements += "INSERT INTO files%s VALUES('%d', '%s', '/%s');\n" % (version, index, package, -file.replace("'", "''")) + to_be_added = '''INSERT INTO files%s VALUES(%d, "%s", "/%s"); +''' % (version, index, package, file) + + statements += to_be_added index += 1 counter+=1 if counter == 50: - f = open(file_name, "a") - f.write(statements) - f.close() + append_to_file(file_name, statements) statements = "" counter = 0 if debug: print "Appended to the file..." + +if counter != 0: + append_to_file(file_name, statements) if version == '2007': pisi.installdb.finalize() From uludag-commits at pardus.org.tr Thu Oct 2 00:08:49 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 2 Oct 2008 00:08:49 +0300 (EEST) Subject: [Uludag-commits] r20401 - in trunk/staj-projeleri/paket-arama/search: pathsearch templates/pathsearch Message-ID: <20081001210849.1FA571384123@liste.pardus.org.tr> Author: emre.aladag Date: Thu Oct 2 00:08:48 2008 New Revision: 20401 Modified: trunk/staj-projeleri/paket-arama/search/pathsearch/views.py trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html Log: * Some minor bugs in template * Forgot to add p: support to django version... fixed now but has some performance problems for now. Modified: trunk/staj-projeleri/paket-arama/search/pathsearch/views.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/pathsearch/views.py (original) +++ trunk/staj-projeleri/paket-arama/search/pathsearch/views.py Thu Oct 2 00:08:48 2008 @@ -19,6 +19,10 @@ elif entry.strip().startswith('in:'): pkg = entry[3:].strip() return list_package_contents(request, version, pkg) + + elif entry.strip().startswith('p:'): + pkg = entry[2:].strip() + return search_for_package(request, version, pkg) # If search form is submitted, redirect... return search_in_all_packages(request, version) @@ -44,10 +48,13 @@ 'current_version' : version, 'versions' :versions, }) - + def search_for_package(request, version, package_name): """Searches for a package related to given name in the URL.""" - package_list = ENTRY(version).objects.filter(package__contains=package_name) + if not package_name.strip(): + package_list = ENTRY(version).objects.all().distinct() + else: + package_list = ENTRY(version).objects.filter(package__contains=package_name).distinct() package_list = [p.package for p in package_list] package_list = list(set(package_list)) package_list.sort() Modified: trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html ================================================================= --- trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html (original) +++ trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html Thu Oct 2 00:08:48 2008 @@ -1,11 +1,12 @@ {% extends "base.html" %} -{% block title %}{% blocktrans %}Results for {{ package }}{% endblocktrans %}{% endblock %} +{% load i18n %} +{% block title %}{% blocktrans %}Results for {{ package_name }}{% endblocktrans %}{% endblock %} {% block content %} {% if package_list %} {% for pkg in package_list %} - + {% endfor %}
{{ pkg }}}{{ pkg }}
From uludag-commits at pardus.org.tr Thu Oct 2 01:32:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 2 Oct 2008 01:32:20 +0300 (EEST) Subject: [Uludag-commits] r20402 - trunk/bugzilla/3.0/tr/default/reports Message-ID: <20081001223220.AA14E1384129@liste.pardus.org.tr> Author: taner Date: Thu Oct 2 01:32:20 2008 New Revision: 20402 Modified: trunk/bugzilla/3.0/tr/default/reports/report-bar.png.tmpl trunk/bugzilla/3.0/tr/default/reports/report-line.png.tmpl trunk/bugzilla/3.0/tr/default/reports/report-pie.png.tmpl Log: Bugfix #276 Modified: trunk/bugzilla/3.0/tr/default/reports/report-bar.png.tmpl ================================================================= --- trunk/bugzilla/3.0/tr/default/reports/report-bar.png.tmpl (original) +++ trunk/bugzilla/3.0/tr/default/reports/report-bar.png.tmpl Thu Oct 2 01:32:20 2008 @@ -76,6 +76,13 @@ row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); - graph.plot(data.0).png | stdout(1); + graph.set_y_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_y_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_x_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_x_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_title_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_legend_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 7); + + graph.plot(data.0).png | stdout(1); END; -%] Modified: trunk/bugzilla/3.0/tr/default/reports/report-line.png.tmpl ================================================================= --- trunk/bugzilla/3.0/tr/default/reports/report-line.png.tmpl (original) +++ trunk/bugzilla/3.0/tr/default/reports/report-line.png.tmpl Thu Oct 2 01:32:20 2008 @@ -78,6 +78,13 @@ row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); + graph.set_y_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_y_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_x_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_x_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_title_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_legend_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 7); + graph.plot(data.0).png | stdout(1); END; -%] Modified: trunk/bugzilla/3.0/tr/default/reports/report-pie.png.tmpl ================================================================= --- trunk/bugzilla/3.0/tr/default/reports/report-pie.png.tmpl (original) +++ trunk/bugzilla/3.0/tr/default/reports/report-pie.png.tmpl Thu Oct 2 01:32:20 2008 @@ -43,6 +43,13 @@ suppress_angle => 2, start_angle => 180); + graph.set_y_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_y_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_x_label_font("/usr/share/fonts/dejavu/DejaVuSansMono.ttf", 8); + graph.set_x_axis_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_title_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 6); + graph.set_legend_font("/usr/share/fonts/dejavu/DejaVuSans.ttf", 7); + graph.plot(data.0).png | stdout(1); END; -%] From uludag-commits at pardus.org.tr Fri Oct 3 00:02:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 3 Oct 2008 00:02:15 +0300 (EEST) Subject: [Uludag-commits] r20403 - in trunk/staj-projeleri/paket-arama/search: . pathsearch templates/pathsearch Message-ID: <20081002210215.8BE5513840F3@liste.pardus.org.tr> Author: emre.aladag Date: Fri Oct 3 00:02:15 2008 New Revision: 20403 Modified: trunk/staj-projeleri/paket-arama/search/pathsearch/views.py trunk/staj-projeleri/paket-arama/search/settings.py trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html Log: * Performance improvements: SELECT DISTINCT queries fetch only one column (package) now. * Infrastructure for pagination. Modified: trunk/staj-projeleri/paket-arama/search/pathsearch/views.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/pathsearch/views.py (original) +++ trunk/staj-projeleri/paket-arama/search/pathsearch/views.py Fri Oct 3 00:02:15 2008 @@ -2,12 +2,14 @@ from search.pathsearch.models import Entry2007, Entry2008 from django.db import models from search.settings import versions +from django.template import RequestContext + def index(request, version='2008'): """ Index page for pathsearch. """ - if request.POST.get('q'): - entry = request.POST.get('q') + if request.POST.get('q') or request.GET.get('q'): + entry = request.POST.get('q') or request.GET.get('q') # A workaround here: should be improved: if ' in:'in entry: in_start = entry.find('in:') @@ -52,21 +54,25 @@ def search_for_package(request, version, package_name): """Searches for a package related to given name in the URL.""" if not package_name.strip(): - package_list = ENTRY(version).objects.all().distinct() + package_list = ENTRY(version).objects.values_list('package').order_by('package').distinct() + else: - package_list = ENTRY(version).objects.filter(package__contains=package_name).distinct() - package_list = [p.package for p in package_list] - package_list = list(set(package_list)) - package_list.sort() + package_list = ENTRY(version).objects.values_list('package').order_by('package').distinct().filter(package__contains=package_name) + + #package_list = [p.package for p in package_list] + package_list = [p[0] for p in package_list] + # We have a sorting problem here! # package_list is the related package names. return render_to_response('pathsearch/packages.html', - { 'package_list' : set(package_list), + { 'package_list' : package_list, 'package_name' : package_name, 'current_version' : version, 'versions' :versions, - } + 'q' : request.GET.get('q'), + }, + context_instance = RequestContext(request) ) def search_in_package(request, version, package_name, term): """Searches for term in the given package.""" Modified: trunk/staj-projeleri/paket-arama/search/settings.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/settings.py (original) +++ trunk/staj-projeleri/paket-arama/search/settings.py Fri Oct 3 00:02:15 2008 @@ -1,11 +1,14 @@ # Django settings for search project. -DEBUG = False -TEMPLATE_DEBUG = False #DEBUG +DEBUG = True +TEMPLATE_DEBUG = True #DEBUG WEB_URL = 'http://localhost:8000' DOCUMENT_ROOT = '/home/emre/svn/uludag/trunk/staj-projeleri/paket-arama/search' + + + versions = ['2007', '2008'] ADMINS = ( ('Ahmet Emre Aladag', 'aladagemre at users.sourceforge.net'), @@ -75,6 +78,15 @@ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'search.pagination.middleware.PaginationMiddleware', +) + +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.request", ) ROOT_URLCONF = 'search.urls' @@ -93,4 +105,5 @@ 'django.contrib.sessions', 'django.contrib.sites', 'search.pathsearch', + 'search.pagination', ) Modified: trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html ================================================================= --- trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html (original) +++ trunk/staj-projeleri/paket-arama/search/templates/pathsearch/packages.html Fri Oct 3 00:02:15 2008 @@ -1,14 +1,18 @@ {% extends "base.html" %} {% load i18n %} +{# {% load pagination_tags %} #} + {% block title %}{% blocktrans %}Results for {{ package_name }}{% endblocktrans %}{% endblock %} {% block content %} {% if package_list %} + {#{% autopaginate package_list 200 %}#} {% for pkg in package_list %} {% endfor %} + {#{% paginate %}#}
{{ pkg }}
{% endif %} {% endblock %} \ No newline at end of file From uludag-commits at pardus.org.tr Sat Oct 4 17:00:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 4 Oct 2008 17:00:08 +0300 (EEST) Subject: [Uludag-commits] r20404 - trunk/comar/zorg/zorg Message-ID: <20081004140008.C913113841D7@liste.pardus.org.tr> Author: fatih Date: Sat Oct 4 17:00:08 2008 New Revision: 20404 Modified: trunk/comar/zorg/zorg/config.py Log: Add sections for wacom devices Modified: trunk/comar/zorg/zorg/config.py ================================================================= --- trunk/comar/zorg/zorg/config.py (original) +++ trunk/comar/zorg/zorg/config.py Sat Oct 4 17:00:08 2008 @@ -88,6 +88,21 @@ "CorePointer" : "true", } + if os.path.exists("/dev/input/wacom"): + def addWacom(wtype): + wacomSec = XorgSection("InputDevice") + wacomSec.set("Identifier", "Wacom[%s]" % wtype) + wacomSec.set("Driver", "wacom") + wacomSec.options = { + "Device" : "/dev/input/wacom", + "Type": wtype, + "USB": "on" + } + parser.sections.append(wacomSec) + + for wtype in "stylus", "eraser", "cursor", "pad": + addWacom(wtype) + info = card.getDict() secDevice.set("Identifier", "VideoCard") @@ -163,6 +178,10 @@ secLay.set("Identifier", "Layout") secLay.set("Screen", "Screen") + if os.path.exists("/dev/input/wacom"): + for wtype in "stylus", "eraser", "cursor", "pad": + secLay.set("InputDevice", "Wacom[%s]" % wtype) + backup(xorgConf) f = open(xorgConf, "w") From uludag-commits at pardus.org.tr Sat Oct 4 17:00:10 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 4 Oct 2008 17:00:10 +0300 (EEST) Subject: [Uludag-commits] r20405 - trunk/comar/zorg/zorg Message-ID: <20081004140010.962AC13841D7@liste.pardus.org.tr> Author: fatih Date: Sat Oct 4 17:00:10 2008 New Revision: 20405 Modified: trunk/comar/zorg/zorg/config.py Log: Fix to add multiple InputDevice lines Modified: trunk/comar/zorg/zorg/config.py ================================================================= --- trunk/comar/zorg/zorg/config.py (original) +++ trunk/comar/zorg/zorg/config.py Sat Oct 4 17:00:10 2008 @@ -180,7 +180,7 @@ if os.path.exists("/dev/input/wacom"): for wtype in "stylus", "eraser", "cursor", "pad": - secLay.set("InputDevice", "Wacom[%s]" % wtype) + secLay.add("InputDevice", "Wacom[%s]" % wtype) backup(xorgConf) From uludag-commits at pardus.org.tr Sat Oct 4 17:00:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 4 Oct 2008 17:00:12 +0300 (EEST) Subject: [Uludag-commits] r20406 - trunk/comar/zorg/zorg Message-ID: <20081004140012.2051D13841D7@liste.pardus.org.tr> Author: fatih Date: Sat Oct 4 17:00:11 2008 New Revision: 20406 Modified: trunk/comar/zorg/zorg/__init__.py Log: Bump Modified: trunk/comar/zorg/zorg/__init__.py ================================================================= --- trunk/comar/zorg/zorg/__init__.py (original) +++ trunk/comar/zorg/zorg/__init__.py Sat Oct 4 17:00:11 2008 @@ -10,7 +10,7 @@ # Please read the COPYING file. # -__version__ = "1.0" +__version__ = "1.1" __all__ = ["config", "consts", @@ -23,4 +23,3 @@ def versionString(): return __version__ - From uludag-commits at pardus.org.tr Sat Oct 4 17:00:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 4 Oct 2008 17:00:13 +0300 (EEST) Subject: [Uludag-commits] r20407 - trunk/comar/zorg Message-ID: <20081004140013.C325F13841D7@liste.pardus.org.tr> Author: fatih Date: Sat Oct 4 17:00:13 2008 New Revision: 20407 Modified: trunk/comar/zorg/ChangeLog Log: Update ChangeLog Modified: trunk/comar/zorg/ChangeLog ================================================================= --- trunk/comar/zorg/ChangeLog (original) +++ trunk/comar/zorg/ChangeLog Sat Oct 4 17:00:13 2008 @@ -1,3 +1,8 @@ +2008-10-04 Fatih Aşıcı + * zorg/__init__.py: Bumped version to 1.1. + * zorg/config.py: Added support to create InputDevice + sections for wacom devices. + 2008-09-24 Fatih Aşıcı * zorg/probe.py: Added a high timeout value for dbus calls since enabling a driver package might take a long time on slow From uludag-commits at pardus.org.tr Sun Oct 5 15:31:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 5 Oct 2008 15:31:52 +0300 (EEST) Subject: [Uludag-commits] r20408 - in trunk/comar/api: . comar Message-ID: <20081005123152.57DE213841A5@liste.pardus.org.tr> Author: bahadir.kandemir Date: Sun Oct 5 15:31:51 2008 New Revision: 20408 Added: trunk/comar/api/ChangeLog Modified: trunk/comar/api/comar/service.py Log: Check service status before starting service Modified: trunk/comar/api/comar/service.py ================================================================= --- trunk/comar/api/comar/service.py (original) +++ trunk/comar/api/comar/service.py Sun Oct 5 15:31:51 2008 @@ -235,6 +235,14 @@ args = args.split() cmd.extend(args) + try: + from csl import status + if status(): + # Already running, no need to send notification, just return OK + return None + except: + pass + if pidfile: pid = _getPid(pidfile) if _checkPid(pid, command=command): From uludag-commits at pardus.org.tr Sun Oct 5 15:33:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 5 Oct 2008 15:33:55 +0300 (EEST) Subject: [Uludag-commits] r20409 - trunk/comar/api Message-ID: <20081005123355.1F4FF13841A5@liste.pardus.org.tr> Author: bahadir.kandemir Date: Sun Oct 5 15:33:54 2008 New Revision: 20409 Modified: trunk/comar/api/ChangeLog trunk/comar/api/setup.py Log: new release Modified: trunk/comar/api/ChangeLog ================================================================= --- trunk/comar/api/ChangeLog (original) +++ trunk/comar/api/ChangeLog Sun Oct 5 15:33:54 2008 @@ -1,4 +1,8 @@ 2008-10-05 Bahadır Kandemir + * setup.py: New release + +2008-10-05 Bahadır Kandemir + * comar/service.py (startService): Check service status before starting service Modified: trunk/comar/api/setup.py ================================================================= --- trunk/comar/api/setup.py (original) +++ trunk/comar/api/setup.py Sun Oct 5 15:33:54 2008 @@ -16,7 +16,7 @@ from distutils.core import setup from distutils.command.install import install -version = "2.0_beta1" +version = "2.0" distfiles = """ setup.py From uludag-commits at pardus.org.tr Sun Oct 5 15:39:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 5 Oct 2008 15:39:19 +0300 (EEST) Subject: [Uludag-commits] r20410 - in trunk/staj-projeleri/paket-arama/search: . templates Message-ID: <20081005123919.8D2A9138420D@liste.pardus.org.tr> Author: emre.aladag Date: Sun Oct 5 15:39:19 2008 New Revision: 20410 Modified: trunk/staj-projeleri/paket-arama/search/settings.py trunk/staj-projeleri/paket-arama/search/templates/base.html trunk/staj-projeleri/paket-arama/search/urls.py Log: Some URL fixes... It needs to learn it is not in the root of the world (I mean apache...) but in search sub-dir. Modified: trunk/staj-projeleri/paket-arama/search/settings.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/settings.py (original) +++ trunk/staj-projeleri/paket-arama/search/settings.py Sun Oct 5 15:39:19 2008 @@ -4,7 +4,7 @@ TEMPLATE_DEBUG = True #DEBUG -WEB_URL = 'http://localhost:8000' +WEB_URL = 'http://localhost/search' DOCUMENT_ROOT = '/home/emre/svn/uludag/trunk/staj-projeleri/paket-arama/search' Modified: trunk/staj-projeleri/paket-arama/search/templates/base.html ================================================================= --- trunk/staj-projeleri/paket-arama/search/templates/base.html (original) +++ trunk/staj-projeleri/paket-arama/search/templates/base.html Sun Oct 5 15:39:19 2008 @@ -4,7 +4,7 @@ - + {% trans 'Package Search' %} - {% block title %}{% endblock %} {% block extrahead %}{% endblock %} Modified: trunk/staj-projeleri/paket-arama/search/urls.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/urls.py (original) +++ trunk/staj-projeleri/paket-arama/search/urls.py Sun Oct 5 15:39:19 2008 @@ -3,8 +3,10 @@ urlpatterns = patterns('', - (r'^$', 'search.pathsearch.views.index'), - (r'^search/', include('search.pathsearch.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), + #(r'^search/', include('search.pathsearch.urls')), + (r'^', include('search.pathsearch.urls')), ) + + From uludag-commits at pardus.org.tr Sun Oct 5 21:57:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 5 Oct 2008 21:57:47 +0300 (EEST) Subject: [Uludag-commits] r20411 - in trunk/staj-projeleri/paket-arama: . search search/locale/tr/LC_MESSAGES Message-ID: <20081005185747.36C8113841F1@liste.pardus.org.tr> Author: emre.aladag Date: Sun Oct 5 21:57:46 2008 New Revision: 20411 Added: trunk/staj-projeleri/paket-arama/local_settings.py Modified: trunk/staj-projeleri/paket-arama/README-tr trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.mo trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po trunk/staj-projeleri/paket-arama/search/settings.py Log: * Fixed translation: Genel Bilgi->Genel Bilgiler * Added local_settings file. No need to re-edit credentials/URLsafter each svn up anymore. * Updated README-tr Modified: trunk/staj-projeleri/paket-arama/README-tr ================================================================= --- trunk/staj-projeleri/paket-arama/README-tr (original) +++ trunk/staj-projeleri/paket-arama/README-tr Sun Oct 5 21:57:46 2008 @@ -22,7 +22,8 @@ ============================= Django 1.0 ile yazılmıştır. Çiftliklerde üretilen ve mysql'e yüklenen verileri kullanır. Sürüm sayısı sınırlı olduğundan her bir sürüm için (farklı tabloları kullanmak amacıyla) farklı model yazılmıştır: Entry2007 ve Entry2008. Bunlar files2007 ve files2008 tablolarını kullanırlar. Düzenli olarak çiftlikten gelen veriler bu tabloları DROP edip tekrar oluşturur. - Sunucuya kurulurken settings.py dosyasında gerekli DB ve absolute path ayarlarının yapılması gerekir. + Sunucuya kurulurken local_settings.py dosyası search dizini içerisine taşınmalı, gerekli DB ve absolute path +ayarları yapılmalıdır. Bu sayede svn güncellemelerinde gelen kullanıcı adı ve parolalardan etkilenilmeyecektir. http://paketler.pardus.org.tr altına search dizini koyulur ve packages.pardus.org.tr altına da sembolik bir bağ atılabilir. Kullanılan dili tarayıcıya bakarak belirler. @@ -40,7 +41,7 @@ Sunucuya Kurarken =============== 1) Django kurulmalı veya projeyle aynı dizine konularak PythonPath'e eklenmeli. - 2) settings.py dosyası ihtiyaca göre düzenlenmeli. + 2) local_settings.py dosyası ihtiyaca göre düzenlenmeli. 3) python manage.py syncdb ile veritabanında gerekli tablolar oluşturulmalı. 4) Düzenli olarak çiftliklerden bz2 dosyalarını toplayan/sync eden bir betik yazılmalı(sha1sum kontrolü yapılabilir, henüz desteği yok) ve bu betik düzenli olarak çalıştırılmalı. Bu dosyalar aynı zamanda uygun bir zamanda MySQL'e yüklenmeli. Bu yükleme sürecinde bir bakım modu koyulabilir. En kötü ihtimalle sonuç bulunamadı çıktısı alınır. DROP TABLE IF EXISTS ve CREATE TABLE ard arda yapıldığı için tablo bulunamadı hatası alma olasılığı oldukça düşüktür. Modified: trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.mo ================================================================= Binary files. No diff available. Modified: trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po ================================================================= --- trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po (original) +++ trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po Sun Oct 5 21:57:46 2008 @@ -35,7 +35,7 @@ #: templates/base.html:27 msgid "Information" -msgstr "Genel Bilgi" +msgstr "Genel Bilgiler" #: templates/base.html:28 msgid "Source Packages" Modified: trunk/staj-projeleri/paket-arama/search/settings.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/settings.py (original) +++ trunk/staj-projeleri/paket-arama/search/settings.py Sun Oct 5 21:57:46 2008 @@ -107,3 +107,12 @@ 'search.pathsearch', 'search.pagination', ) + + + + +# ------------- OVERRIDE OPERATION HERE ---------------- +try: + from local_settings import * +except ImportError, exp: + pass From uludag-commits at pardus.org.tr Mon Oct 6 22:57:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 6 Oct 2008 22:57:45 +0300 (EEST) Subject: [Uludag-commits] r20412 - trunk/comar/mudur/bin Message-ID: <20081006195745.73A88138426C@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon Oct 6 22:57:44 2008 New Revision: 20412 Modified: trunk/comar/mudur/bin/mudur.py Log: fix typo: waitNet -> waitNet() Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Mon Oct 6 22:57:44 2008 @@ -678,7 +678,7 @@ except dbus.DBusException: ui.error(_("Unable to bring up interface %s") % device) if need_remount: - if waitNet: + if waitNet(): remoteMount(old_handler) else: ui.error(_("No network connection, skipping remote mount.")) From uludag-commits at pardus.org.tr Mon Oct 6 23:14:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 6 Oct 2008 23:14:40 +0300 (EEST) Subject: [Uludag-commits] r20413 - trunk/comar/mudur/bin Message-ID: <20081006201440.94327138427B@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon Oct 6 23:14:40 2008 New Revision: 20413 Modified: trunk/comar/mudur/bin/mudur.py Log: use pardus.netutils.waitNet() Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Mon Oct 6 23:14:40 2008 @@ -23,6 +23,7 @@ import socket import pardus.iniutils +from pardus.netutils import waitNet # # i18n @@ -637,24 +638,6 @@ conditional = set(os.listdir("/etc/mudur/services/conditional")) return enabled.union(conditional) -def waitNet(timeout=20): - while timeout > 0: - upInterfaces = [] - for iface in interfaces(): - if iface.name == 'lo': - continue - if iface.isUp(): - try: - address, mask = iface.getAddress() - except TypeError: - continue - upInterfaces.append(iface) - if len(upInterfaces): - return True - time.sleep(0.2) - timeout -= 0.2 - return False - def startNetwork(bus): import dbus # Remote mount required? From uludag-commits at pardus.org.tr Tue Oct 7 09:41:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 7 Oct 2008 09:41:42 +0300 (EEST) Subject: [Uludag-commits] r20414 - trunk/pisi/pisi Message-ID: <20081007064142.19EEE1384135@liste.pardus.org.tr> Author: faik Date: Tue Oct 7 09:41:41 2008 New Revision: 20414 Modified: trunk/pisi/pisi/api.py Log: whitespace cleanup Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Tue Oct 7 09:41:41 2008 @@ -48,14 +48,14 @@ import pisi.comariface def set_userinterface(ui): - """ + """ Set the user interface where the status information will be send @param ui: User interface """ ctx.ui = ui def set_io_streams(stdout=None, stderr=None): - """ + """ Set standart i/o streams Used by Buildfarm @param stdout: Standart output @@ -67,22 +67,22 @@ ctx.stderr = stderr def set_comar(enable): - """ - Set comar usage + """ + Set comar usage False means no preremove and postinstall scripts will be run @param enable: Flag indicating comar usage """ ctx.comar = enable def set_comar_destination(destination): - """ + """ Set comar bus destination @param destination: Path to bus destination of COMAR """ ctx.comar_destination = destination def set_dbus_sockname(sockname): - """ + """ Set dbus socket file Used by YALI @param sockname: Path to dbus socket file @@ -90,7 +90,7 @@ ctx.dbus_sockname = sockname def set_dbus_timeout(timeout): - """ + """ Set dbus timeout Used by YALI @param timeout: Timeout in seconds @@ -98,8 +98,8 @@ ctx.dbus_timeout = timeout def set_signal_handling(enable): - """ - Enable signal handling. Signal handling in pisi mostly used for disabling keyboard interrupts + """ + Enable signal handling. Signal handling in pisi mostly used for disabling keyboard interrupts in critical paths. Used by YALI @param enable: Flag indicating signal handling usage @@ -110,12 +110,12 @@ ctx.sig = None def set_options(options): - """ + """ Set various options of pisi @param options: option set - + >>> options = pisi.config.Options() - + options.destdir # pisi destination directory where operations will take effect options.username # username that for reaching remote repository options.password # password that for reaching remote repository @@ -142,9 +142,9 @@ Return a dictionary of the replaced packages in the given repository @param repo: Repository of the replaced packages. If repo is None than returns a dictionary of all the replaced packages in all the repositories - + {'gaim':'pidgin, 'actioncube':'assaultcube'} - + gaim replaced by pidgin and actioncube replaced by assaultcube """ return pisi.db.packagedb.PackageDB().get_replaces(repo) @@ -163,7 +163,7 @@ """ installdb = pisi.db.installdb.InstallDB() is_upgradable = lambda pkg: pisi.operations.upgrade.is_upgradable(pkg, ctx.get_option('ignore_build_no')) - + upgradable = filter(is_upgradable, installdb.list_installed()) # replaced packages can not pass is_upgradable test, so we add them manually upgradable.extend(list_replaces()) @@ -181,7 +181,7 @@ def get_install_order(packages): """ - Return a list of packages in the installation order with extra needed + Return a list of packages in the installation order with extra needed dependencies -> list_of_strings @param packages: list of package names -> list_of_strings """ @@ -210,7 +210,7 @@ def get_base_upgrade_order(packages): """ - Return a list of packages of the system.base component that needs to be upgraded + Return a list of packages of the system.base component that needs to be upgraded or installed in install order -> list_of_strings All the packages of the system.base component must be installed on the system @param packages: list of package names -> list_of_strings @@ -226,7 +226,7 @@ >>> (pkgs, within, pairs) = pisi.api.get_conflicts(packages) >>> - >>> pkgs # list of packages that are installed and conflicts with the + >>> pkgs # list of packages that are installed and conflicts with the # given packages list -> list_of_strings >>> [...] >>> within # list of packages that already conflict with each other @@ -234,8 +234,8 @@ >>> [...] >>> pairs # dictionary of conflict information that contains which package in the # given packages list conflicts with which of the installed packages - - >>> {'imlib2': , 'valgrind': , + + >>> {'imlib2': , 'valgrind': , 'libmp4v2':'} >>> print map(lambda c:str(pairs[c]), pairs) @@ -249,7 +249,7 @@ description -> list_of_strings @param terms: a list of terms used to search package -> list_of_strings @param lang: language of the summary and description - @param repo: Repository of the packages. If repo is None than returns a list of all the packages + @param repo: Repository of the packages. If repo is None than returns a list of all the packages in all the repositories that meets the search """ packagedb = pisi.db.packagedb.PackageDB() @@ -271,7 +271,7 @@ description -> list_of_strings @param terms: a list of terms used to search source package -> list_of_strings @param lang: language of the summary and description - @param repo: Repository of the source packages. If repo is None than returns a list of all the source + @param repo: Repository of the source packages. If repo is None than returns a list of all the source packages in all the repositories that meets the search """ sourcedb = pisi.db.sourcedb.SourceDB() @@ -293,7 +293,7 @@ description -> list_of_strings @param terms: a list of terms used to search components -> list_of_strings @param lang: language of the summary and description - @param repo: Repository of the components. If repo is None than returns a list of all the components + @param repo: Repository of the components. If repo is None than returns a list of all the components in all the repositories that meets the search """ componentdb = pisi.db.componentdb.ComponentDB() @@ -306,7 +306,7 @@ @param term: used to search file -> list_of_strings >>> files = pisi.api.search_file("kvm-") - + >>> print files >>> [("kvm", (["lib/modules/2.6.18.8-86/extra/kvm-amd.ko","lib/modules/2.6.18.8-86/extra/kvm-intel.ko"])),] @@ -343,7 +343,7 @@ def takeback(operation): """ - Takes back the system to a previous state. Uses pisi history to find out which packages were + Takes back the system to a previous state. Uses pisi history to find out which packages were installed at the time _after_ the given operation that the system is requested to be taken back. @param operation: number of the operation that the system will be taken back -> integer """ @@ -366,7 +366,7 @@ def snapshot(): """ Takes snapshot of the system packages. The snapshot is only a record of which packages are currently - installed. The record is kept by pisi history mechanism as it works automatically on install, remove + installed. The record is kept by pisi history mechanism as it works automatically on install, remove and upgrade operations. """ @@ -397,10 +397,10 @@ def package_graph(A, packagedb, 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)) @@ -410,7 +410,7 @@ G_f = pgraph.PGraph(packagedb) # 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) From uludag-commits at pardus.org.tr Tue Oct 7 12:04:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 7 Oct 2008 12:04:42 +0300 (EEST) Subject: [Uludag-commits] r20415 - trunk/pisi/pisi Message-ID: <20081007090442.606401384208@liste.pardus.org.tr> Author: faik Date: Tue Oct 7 12:04:42 2008 New Revision: 20415 Modified: trunk/pisi/pisi/api.py trunk/pisi/pisi/config.py trunk/pisi/pisi/configfile.py Log: Use lock to prevent running another instance of pisi. BUG:FIXED:8145 Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Tue Oct 7 12:04:42 2008 @@ -10,6 +10,7 @@ # Please read the COPYING file. import os +import fcntl import re import logging import logging.handlers @@ -46,6 +47,24 @@ import pisi.operations.emerge import pisi.operations.build import pisi.comariface +import pisi.errors + +def locked(func): + """ + Decorator for synchronizing privileged functions + """ + def wrapper(self,*__args,**__kw): + lock = file(pisi.util.join_path(pisi.context.config.lock_dir(), 'pisi'), 'w') + try: + fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB) + try: + return func(self,*__args,**__kw) + except Exception, e: + lock.close() + raise e + except IOError: + raise pisi.errors.AnotherInstanceError(_("Another instance of PiSi is running. Only one instance is allowed.")) + return wrapper def set_userinterface(ui): """ @@ -316,6 +335,7 @@ term = term[1:] return filesdb.search_file(term) + at locked def install(packages, reinstall=False, ignore_file_conflicts=False, ignore_package_conflicts=False): """ Returns True if no errors occured during the operation @@ -341,6 +361,7 @@ else: return pisi.operations.install.install_pkg_names(packages, reinstall) + at locked def takeback(operation): """ Takes back the system to a previous state. Uses pisi history to find out which packages were @@ -363,6 +384,7 @@ beinstalled, beremoved, configs = pisi.operations.history.plan_takeback(operation) return beinstalled, beremoved + at locked def snapshot(): """ Takes snapshot of the system packages. The snapshot is only a record of which packages are currently @@ -459,6 +481,7 @@ return order + at locked def configure_pending(packages=None): # start with pending packages # configure them in reverse topological order of dependency @@ -580,6 +603,7 @@ index.write(output, sha1sum=True, compress=pisi.file.File.bz2, sign=pisi.file.File.detached) ctx.ui.info(_('* Index file written')) + at locked def add_repo(name, indexuri, at = None): if not re.match("^[a-zA-Z0-9\\-\\_\\.]*$", name): raise pisi.Error(_('Not a valid repo name.')) @@ -594,6 +618,7 @@ repodb.add_repo(name, repo, at = at) ctx.ui.info(_('Repo %s added to system.') % name) + at locked def remove_repo(name): repodb = pisi.db.repodb.RepoDB() if repodb.has_repo(name): @@ -603,6 +628,7 @@ raise pisi.Error(_('Repository %s does not exist. Cannot remove.') % name) + at locked def update_repo(repo, force=False): ctx.ui.info(_('* Updating repository: %s') % repo) ctx.ui.notify(pisi.ui.updatingrepo, name = repo) @@ -629,6 +655,7 @@ else: raise pisi.Error(_('No repository named %s found.') % repo) + at locked def delete_cache(): pisi.util.clean_dir(ctx.config.cached_packages_dir()) pisi.util.clean_dir(ctx.config.archives_dir()) @@ -655,6 +682,7 @@ raise pisi.Error(_('No repository named %s found.') % repo) # FIXME: rebuild_db is only here for filesdb and it really is ugly. we should not need any rebuild. + at locked def rebuild_db(files=False): filesdb = pisi.db.filesdb.FilesDB() @@ -696,14 +724,17 @@ # from pisi.build import build_until # from pisi.atomicoperations import resurrect_package, build + at locked def remove(*args, **kw): pisi.db.historydb.HistoryDB().create_history("remove") return pisi.operations.remove.remove(*args, **kw) + at locked def upgrade(*args, **kw): pisi.db.historydb.HistoryDB().create_history("upgrade") return pisi.operations.upgrade.upgrade(*args, **kw) + at locked def emerge(*args, **kw): pisi.db.historydb.HistoryDB().create_history("emerge") return pisi.operations.emerge.emerge(*args, **kw) @@ -714,9 +745,11 @@ def reorder_base_packages(*args, **kw): return pisi.operations.helper.reorder_base_packages(*args, **kw) + at locked def build_until(*args, **kw): return pisi.operations.build.build_until(*args, **kw) + at locked def build(*args, **kw): return pisi.atomicoperations.build(*args, **kw) @@ -724,6 +757,7 @@ ## Deletes the cached pisi packages to keep the package cache dir within cache limits # @param all When set all the cached packages will be deleted + at locked def clearCache(all=False): import glob Modified: trunk/pisi/pisi/config.py ================================================================= --- trunk/pisi/pisi/config.py (original) +++ trunk/pisi/pisi/config.py Tue Oct 7 12:04:42 2008 @@ -98,6 +98,9 @@ def history_dir(self): return self.subdir(self.values.dirs.history_dir) + def lock_dir(self): + return self.subdir(self.values.dirs.lock_dir) + def packages_dir(self): return self.subdir(self.values.dirs.packages_dir) Modified: trunk/pisi/pisi/configfile.py ================================================================= --- trunk/pisi/pisi/configfile.py (original) +++ trunk/pisi/pisi/configfile.py Tue Oct 7 12:04:42 2008 @@ -100,6 +100,7 @@ cached_packages_dir = "/var/cache/pisi/packages" compiled_packages_dir = "/var/cache/pisi/packages" packages_dir = "/var/lib/pisi/package" + lock_dir = "/var/lock/subsys" index_dir = "/var/lib/pisi/index" tmp_dir = "/var/pisi" kde_dir = "/usr/kde/3.5" From uludag-commits at pardus.org.tr Tue Oct 7 12:09:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 7 Oct 2008 12:09:12 +0300 (EEST) Subject: [Uludag-commits] r20416 - trunk/pisi/pisi Message-ID: <20081007090912.661121384234@liste.pardus.org.tr> Author: faik Date: Tue Oct 7 12:09:11 2008 New Revision: 20416 Added: trunk/pisi/pisi/errors.py Log: Add forgotten file From uludag-commits at pardus.org.tr Tue Oct 7 12:38:45 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 7 Oct 2008 12:38:45 +0300 (EEST) Subject: [Uludag-commits] r20417 - trunk/pisi Message-ID: <20081007093845.51765138413F@liste.pardus.org.tr> Author: faik Date: Tue Oct 7 12:38:44 2008 New Revision: 20417 Modified: trunk/pisi/ChangeLog Log: Update changelog Modified: trunk/pisi/ChangeLog ================================================================= --- trunk/pisi/ChangeLog (original) +++ trunk/pisi/ChangeLog Tue Oct 7 12:38:44 2008 @@ -1,3 +1,6 @@ +2008-10-06 Faik Uygur + * Raise exception when tried to run another instance of pisi. (#8145) + 2008-09-25 Faik Uygur * Fix leaving symlinks while removing a package problem. From uludag-commits at pardus.org.tr Thu Oct 9 00:56:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 00:56:12 +0300 (EEST) Subject: [Uludag-commits] r20418 - in trunk/staj-projeleri/python-pulse: . doc src Message-ID: <20081008215612.827B213840F1@liste.pardus.org.tr> Author: burak.alkan Date: Thu Oct 9 00:56:12 2008 New Revision: 20418 Added: trunk/staj-projeleri/python-pulse/src/pypulse.c Removed: trunk/staj-projeleri/python-pulse/src/test.c Modified: trunk/staj-projeleri/python-pulse/doc/arg.c trunk/staj-projeleri/python-pulse/events.txt trunk/staj-projeleri/python-pulse/main.py trunk/staj-projeleri/python-pulse/setup.py trunk/staj-projeleri/python-pulse/src/func.c trunk/staj-projeleri/python-pulse/src/pypulse.h trunk/staj-projeleri/python-pulse/tabbed.py trunk/staj-projeleri/python-pulse/tabbed.ui Log: general cleanup Modified: trunk/staj-projeleri/python-pulse/doc/arg.c ================================================================= --- trunk/staj-projeleri/python-pulse/doc/arg.c (original) +++ trunk/staj-projeleri/python-pulse/doc/arg.c Thu Oct 9 00:56:12 2008 @@ -6,7 +6,7 @@ PyObject *self; PyObject *args; PyObject *keywds; -{ +{ /* Argument passing, * values before | are mandatory, after | are not */ @@ -17,11 +17,11 @@ static char *kwlist[] = {"voltage", "state", "action", "type", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, keywds, "|isss", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, keywds, "|isss", kwlist, &voltage, &state, &action, &type)) - return NULL; - - printf("-- This parrot wouldn't %s if you put %i Volts through it.\n", + return NULL; + + printf("-- This parrot wouldn't %s if you put %i Volts through it.\n", action, voltage); printf("-- Lovely plumage, the %s -- It's %s!\n", type, state); Modified: trunk/staj-projeleri/python-pulse/events.txt ================================================================= --- trunk/staj-projeleri/python-pulse/events.txt (original) +++ trunk/staj-projeleri/python-pulse/events.txt Thu Oct 9 00:56:12 2008 @@ -17,12 +17,12 @@ reflect: removeSinkInput(index), updateSinkInput(*i), dec_outstand pavucontrol: nothing -4-) +4-) event: stop playing reflect : removeSinkInput(index) pavucontrol: remove application from list -5-) +5-) event: close application reflect: removeClient(index) pavucontrol: nothing Modified: trunk/staj-projeleri/python-pulse/main.py ================================================================= --- trunk/staj-projeleri/python-pulse/main.py (original) +++ trunk/staj-projeleri/python-pulse/main.py Thu Oct 9 00:56:12 2008 @@ -13,15 +13,20 @@ self.connect(self.ui.pushButton, QtCore.SIGNAL("clicked()"), self.quit_all) self.connect(self.ui.pushButton_2, QtCore.SIGNAL("clicked()"), self.addTab) self.connect(self.ui.pushButton_3, QtCore.SIGNAL("clicked()"), self.removeTab) - + self.connect(self.ui.pushButton_4, QtCore.SIGNAL("clicked()"), self.getFeedback) + + + def getFeedback(self): + feedback() + def addTab(self): self.newTab = QtGui.QWidget() self.newTab.setObjectName("hede") self.ui.tabWidget.addTab(self.newTab, "hede") - + def removeTab(self): self.ui.tabWidget.removeTab(self.ui.tabWidget.currentIndex()) - + def action(self): print "hammering" @@ -32,29 +37,35 @@ def __init__(self): QtGui.QApplication.__init__(self, sys.argv) - def go(self): - """ - default subscribe flags - PA_SUBSCRIPTION_MASK_SINK - PA_SUBSCRIPTION_MASK_SOURCE - PA_SUBSCRIPTION_MASK_SINK_INPUT - PA_SUBSCRIPTION_MASK_CLIENT - PA_SUBSCRIPTION_MASK_SERVER - """ - pypulse.initialize() - pypulse.context_set_state_callback() - if pypulse.is_connection_valid: - print "main.py: connection valid" - #pypulse.context_set_subscribe_callback() - pypulse.context_connect() - # enter mainloop - pypulse.loop() + +def go(): + """ + default subscribe flags + PA_SUBSCRIPTION_MASK_SINK + PA_SUBSCRIPTION_MASK_SOURCE + PA_SUBSCRIPTION_MASK_SINK_INPUT + PA_SUBSCRIPTION_MASK_CLIENT + PA_SUBSCRIPTION_MASK_SERVER + """ + pypulse.initialize() + pypulse.context_set_state_callback() + if pypulse.is_connection_valid: + print "main.py: connection valid" + #pypulse.context_set_subscribe_callback() + pypulse.context_connect() + # enter mainloop + pypulse.loop() + +def feedback(): + pypulse.check_values() + def main(): main_app = mein() guiPart = app() guiPart.show() - main_app.go() + go() + #main_app.go() Modified: trunk/staj-projeleri/python-pulse/setup.py ================================================================= --- trunk/staj-projeleri/python-pulse/setup.py (original) +++ trunk/staj-projeleri/python-pulse/setup.py Thu Oct 9 00:56:12 2008 @@ -28,7 +28,7 @@ include_dirs = pkgconfig_inc("gtk+-2.0"), libraries = pkgconfig_libs("gtk+-2.0"), library_dirs = ['/usr/lib/pulse-0.9/modules'], - sources = ['src/test.c','src/func.c']) + sources = ['src/pypulse.c','src/func.c']) setup (name = 'python-pulse', version = '0.1', Modified: trunk/staj-projeleri/python-pulse/src/func.c ================================================================= --- trunk/staj-projeleri/python-pulse/src/func.c (original) +++ trunk/staj-projeleri/python-pulse/src/func.c Thu Oct 9 00:56:12 2008 @@ -12,22 +12,23 @@ }notify; notify **root; -static int allocated = 0; /* allocated -> 1 not allocated-> 0 */ +static int allocated = 0; /* allocated -> 1 not allocated-> 0 */ static int notify_index = 0; // check value from python side -PyObject* check_callback_value() +static PyObject* check_callback() { int i = 0; - + printf("INF: checking values\n"); for(;i< CNT;i++){ + printf("getting item : %d",i); notify *item = root[i]; if(item->next != NULL){ - printf("tryout->name %s :", item->name); + printf("tryout->name %s :", item->name); printf("tryout->client %d :", item->client); - } + }else printf(""); } printf("INF: checking values done\n"); } @@ -35,7 +36,6 @@ void alloc_first() { printf("INF: allocating root\n"); - int i = 0; root = (notify**)calloc(CNT, sizeof(notify*)); printf("INF: root allocated done\n"); allocated = 1; @@ -44,30 +44,30 @@ // add, update application list void py_updateSinkInput(pa_sink_input_info* info) { - + printf("update time = %d\n", notify_index); printf("*****index = %i\n", info->index); printf("*****name = %c\n", *info->name); printf("*****client = %i\n", info->client);// unique one printf("*****sink = %i\n", info->sink); printf("*****driver = %c\n", *info->driver); - + // if **root is not allocated allocate it first if(!allocated) alloc_first(); else printf("root will not allocated this time\n"); - + root[notify_index] = (notify*)calloc(1,sizeof(notify)); root[notify_index]->client = info->client; printf("INF: entering sprintf\n"); sprintf(root[notify_index]->name, "member %d", notify_index); - - + + if (notify_index > 0){ printf("INF: adding chain\n"); root[notify_index - 1]->next = root[notify_index]; } - notify_index++; - + notify_index++; + } void py_updateSink(pa_sink_info* info) @@ -77,7 +77,7 @@ printf(""); printf(""); printf(""); - + } @@ -88,7 +88,7 @@ printf(""); printf(""); printf(""); - + } @@ -106,7 +106,7 @@ printf("sink callback failure \n"); return; } - + //w->updateSink(*i); printf("INF: suppose to updateSink(*i)\n"); } @@ -273,11 +273,3 @@ break; } } - - - -static PyMethodDef Methods[] = { - {"check_values", check_callback_value, METH_VARARGS}, - {NULL , NULL, 0, NULL} -}; - Modified: trunk/staj-projeleri/python-pulse/src/pypulse.h ================================================================= --- trunk/staj-projeleri/python-pulse/src/pypulse.h (original) +++ trunk/staj-projeleri/python-pulse/src/pypulse.h Thu Oct 9 00:56:12 2008 @@ -23,9 +23,9 @@ // new void py_updateSinkInput(pa_sink_input_info* info); void alloc_first(void); -PyObject* check_value(void); +static PyObject* check_callback(void); // -static pa_context* context = NULL; +static pa_context* context = NULL; static pa_channel_map channel_map; static int channel_map_set = 0; Modified: trunk/staj-projeleri/python-pulse/tabbed.py ================================================================= --- trunk/staj-projeleri/python-pulse/tabbed.py (original) +++ trunk/staj-projeleri/python-pulse/tabbed.py Thu Oct 9 00:56:12 2008 @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'tabbed.ui' # -# Created: Mon Sep 8 14:34:53 2008 +# Created: Thu Oct 9 00:02:59 2008 # by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! @@ -26,7 +26,7 @@ self.extend = QtGui.QWidget() self.extend.setObjectName("extend") self.tabWidget.addTab(self.extend, "") - self.gridLayout.addWidget(self.tabWidget, 0, 0, 4, 1) + self.gridLayout.addWidget(self.tabWidget, 0, 0, 5, 1) self.pushButton_2 = QtGui.QPushButton(self.centralwidget) self.pushButton_2.setObjectName("pushButton_2") self.gridLayout.addWidget(self.pushButton_2, 0, 1, 1, 1) @@ -34,13 +34,16 @@ self.pushButton_3.setObjectName("pushButton_3") self.gridLayout.addWidget(self.pushButton_3, 1, 1, 1, 1) spacerItem = QtGui.QSpacerItem(20, 341, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem, 2, 1, 1, 1) + self.gridLayout.addItem(spacerItem, 3, 1, 1, 1) self.pushButton = QtGui.QPushButton(self.centralwidget) self.pushButton.setObjectName("pushButton") - self.gridLayout.addWidget(self.pushButton, 3, 1, 1, 1) + self.gridLayout.addWidget(self.pushButton, 4, 1, 1, 1) + self.pushButton_4 = QtGui.QPushButton(self.centralwidget) + self.pushButton_4.setObjectName("pushButton_4") + self.gridLayout.addWidget(self.pushButton_4, 2, 1, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 626, 27)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 626, 31)) self.menubar.setObjectName("menubar") MainWindow.setMenuBar(self.menubar) self.statusbar = QtGui.QStatusBar(MainWindow) @@ -58,4 +61,5 @@ self.pushButton_2.setText(QtGui.QApplication.translate("MainWindow", "addTab", None, QtGui.QApplication.UnicodeUTF8)) self.pushButton_3.setText(QtGui.QApplication.translate("MainWindow", "removeTab", None, QtGui.QApplication.UnicodeUTF8)) self.pushButton.setText(QtGui.QApplication.translate("MainWindow", "quit", None, QtGui.QApplication.UnicodeUTF8)) + self.pushButton_4.setText(QtGui.QApplication.translate("MainWindow", "checkValues", None, QtGui.QApplication.UnicodeUTF8)) Modified: trunk/staj-projeleri/python-pulse/tabbed.ui ================================================================= --- trunk/staj-projeleri/python-pulse/tabbed.ui (original) +++ trunk/staj-projeleri/python-pulse/tabbed.ui Thu Oct 9 00:56:12 2008 @@ -14,7 +14,7 @@ - + Qt::TabFocus @@ -48,7 +48,7 @@ - + Qt::Vertical @@ -61,13 +61,20 @@ - + quit + + + + checkValues + + + @@ -76,7 +83,7 @@ 0 0 626 - 27 + 31 From uludag-commits at pardus.org.tr Thu Oct 9 10:05:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 10:05:32 +0300 (EEST) Subject: [Uludag-commits] r20419 - trunk/pisi/scripts Message-ID: <20081009070535.DD62B13840D8@liste.pardus.org.tr> Author: faik Date: Thu Oct 9 10:05:20 2008 New Revision: 20419 Modified: trunk/pisi/scripts/check-newconfigs.py Log: Update to new pisi Modified: trunk/pisi/scripts/check-newconfigs.py ================================================================= --- trunk/pisi/scripts/check-newconfigs.py (original) +++ trunk/pisi/scripts/check-newconfigs.py Thu Oct 9 10:05:20 2008 @@ -16,11 +16,7 @@ import pisi -def handle_exception(exception, value, tb): - if exception == exceptions.KeyboardInterrupt: - pisi.api.finalize() - print("\n") - sys.exit() +installdb = pisi.db.installdb.InstallDB() def ask_action(msg, actions, default): while True: @@ -34,10 +30,11 @@ return s def get_installed_packages(): - return pisi.context.installdb.list_installed() + return installdb.list_installed() def check_changed_config_files(package): - all_files = pisi.context.installdb.files(package) + + all_files = installdb.get_files(package) config_files = filter(lambda x: x.type == 'config', all_files.list) config_paths = map(lambda x: "/" + str(x.path), config_files) @@ -77,8 +74,6 @@ check_package(pkg) if __name__ == "__main__": - sys.excepthook = handle_exception - if len(sys.argv) == 1: print "Checking all packages" check_changes() From uludag-commits at pardus.org.tr Thu Oct 9 10:38:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 10:38:29 +0300 (EEST) Subject: [Uludag-commits] r20420 - trunk/comar/mudur/bin Message-ID: <20081009073829.E39AC13840E1@liste.pardus.org.tr> Author: onur Date: Thu Oct 9 10:38:29 2008 New Revision: 20420 Modified: trunk/comar/mudur/bin/mudur.py Log: remove static irqbalance starting, we will start is as a service Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Thu Oct 9 10:38:29 2008 @@ -1226,10 +1226,6 @@ setSystemLanguage() - # better performance for SMP systems, /var/run must be mounted rw before this - if os.path.exists("/usr/sbin/irqbalance"): - run("/usr/sbin/irqbalance") - # when we exit this runlevel, init will write a boot record to utmp write("/var/run/utmp", "") touch("/var/log/wtmp") From uludag-commits at pardus.org.tr Thu Oct 9 11:08:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 11:08:51 +0300 (EEST) Subject: [Uludag-commits] r20421 - trunk/comar/api/comar Message-ID: <20081009080851.48E6913840E1@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu Oct 9 11:08:51 2008 New Revision: 20421 Modified: trunk/comar/api/comar/service.py Log: Servisi koşullu hale getirmek için setState('conditional') kullanılabilsin Modified: trunk/comar/api/comar/service.py ================================================================= --- trunk/comar/api/comar/service.py (original) +++ trunk/comar/api/comar/service.py Thu Oct 9 11:08:51 2008 @@ -413,7 +413,7 @@ start() def setState(state=None): - if state != "on" and state != "off": + if state not in ["on", "off", "conditional"]: fail("Unknown state '%s'" % state) def makeDir(_dir): @@ -436,12 +436,18 @@ remove(os.path.join("/etc/mudur/services/disabled", script())) if os.access(os.path.join("/etc/mudur/services/conditional", script()), os.F_OK): remove(os.path.join("/etc/mudur/services/conditional", script())) - else: + elif state == "off": touch(os.path.join("/etc/mudur/services/disabled", script())) if os.access(os.path.join("/etc/mudur/services/enabled", script()), os.F_OK): remove(os.path.join("/etc/mudur/services/enabled", script())) if os.access(os.path.join("/etc/mudur/services/conditional", script()), os.F_OK): remove(os.path.join("/etc/mudur/services/conditional", script())) + else: + touch(os.path.join("/etc/mudur/services/conditional", script())) + if os.access(os.path.join("/etc/mudur/services/enabled", script()), os.F_OK): + remove(os.path.join("/etc/mudur/services/enabled", script())) + if os.access(os.path.join("/etc/mudur/services/disabled", script()), os.F_OK): + remove(os.path.join("/etc/mudur/services/disabled", script())) notify("System.Service", "Changed", (script(), state)) From uludag-commits at pardus.org.tr Thu Oct 9 11:09:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 11:09:24 +0300 (EEST) Subject: [Uludag-commits] r20422 - trunk/comar/api Message-ID: <20081009080924.2FFD313840E5@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu Oct 9 11:09:23 2008 New Revision: 20422 Modified: trunk/comar/api/setup.py Log: New release Modified: trunk/comar/api/setup.py ================================================================= --- trunk/comar/api/setup.py (original) +++ trunk/comar/api/setup.py Thu Oct 9 11:09:23 2008 @@ -16,7 +16,7 @@ from distutils.core import setup from distutils.command.install import install -version = "2.0" +version = "2.0.1" distfiles = """ setup.py From uludag-commits at pardus.org.tr Thu Oct 9 11:12:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 11:12:51 +0300 (EEST) Subject: [Uludag-commits] r20423 - trunk/comar/mudur/bin Message-ID: <20081009081251.40A5A13840E1@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu Oct 9 11:12:51 2008 New Revision: 20423 Modified: trunk/comar/mudur/bin/service.py Log: Servisi koşullu hale getirmek için 'conditional' parametresi Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Thu Oct 9 11:12:51 2008 @@ -156,8 +156,10 @@ if not quiet: if state == "on": print _("Service '%s' will be auto started.") % service - else: + elif state == "off": print _("Service '%s' won't be auto started.") % service + else: + print _("Service '%s' will be started if required.") % service def reloadService(service, bus, quiet=False): obj = bus.get_object("tr.org.pardus.comar", "/package/%s" % service, introspect=False) @@ -205,6 +207,8 @@ setServiceState(service, "on", bus, quiet) elif op == "off": setServiceState(service, "off", bus, quiet) + elif op == "conditional": + setServiceState(service, "conditional", bus, quiet) elif op in ["info", "status", "list"]: info = getServiceInfo(service, bus) s = Service(service, info) @@ -276,7 +280,7 @@ # Main def main(args): - operations = ("start", "stop", "info", "list", "restart", "reload", "status", "on", "off", "ready") + operations = ("start", "stop", "info", "list", "restart", "reload", "status", "on", "off", "ready", "conditional") use_color = True quiet = False From uludag-commits at pardus.org.tr Thu Oct 9 11:13:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 11:13:23 +0300 (EEST) Subject: [Uludag-commits] r20424 - trunk/comar/mudur/po Message-ID: <20081009081323.28FDA13840E1@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu Oct 9 11:13:22 2008 New Revision: 20424 Modified: trunk/comar/mudur/po/ca.po trunk/comar/mudur/po/de.po trunk/comar/mudur/po/es.po trunk/comar/mudur/po/fr.po trunk/comar/mudur/po/it.po trunk/comar/mudur/po/mudur.pot trunk/comar/mudur/po/nl.po trunk/comar/mudur/po/pl.po trunk/comar/mudur/po/pt_BR.po trunk/comar/mudur/po/tr.po Log: update messages Modified: trunk/comar/mudur/po/ca.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/de.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/es.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/fr.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/it.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/mudur.pot ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/nl.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/pl.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/pt_BR.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/comar/mudur/po/tr.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu Oct 9 11:13:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 11:13:35 +0300 (EEST) Subject: [Uludag-commits] r20425 - trunk/comar/mudur Message-ID: <20081009081335.3307313840E1@liste.pardus.org.tr> Author: bahadir.kandemir Date: Thu Oct 9 11:13:35 2008 New Revision: 20425 Modified: trunk/comar/mudur/setup.py Log: new release Modified: trunk/comar/mudur/setup.py ================================================================= --- trunk/comar/mudur/setup.py (original) +++ trunk/comar/mudur/setup.py Thu Oct 9 11:13:35 2008 @@ -15,7 +15,7 @@ import shutil import parser -version = "2.0" +version = "2.0.1" distfiles = """ setup.py From uludag-commits at pardus.org.tr Thu Oct 9 16:06:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 9 Oct 2008 16:06:39 +0300 (EEST) Subject: [Uludag-commits] r20426 - trunk/pisi Message-ID: <20081009130640.02D3913840D8@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 9 16:06:39 2008 New Revision: 20426 Modified: trunk/pisi/pisi-spec.rng Log: Add new locales, remove redundant ones Modified: trunk/pisi/pisi-spec.rng ================================================================= --- trunk/pisi/pisi-spec.rng (original) +++ trunk/pisi/pisi-spec.rng Thu Oct 9 16:06:39 2008 @@ -1075,7 +1075,7 @@ locale:af locale:ar locale:az - locale:az + locale:am locale:be locale:bg locale:bn @@ -1116,11 +1116,11 @@ locale:kk locale:km locale:ko - locale:ko locale:lt locale:lv locale:mk locale:mn + locale:ml locale:ms locale:nb locale:nds @@ -1134,7 +1134,6 @@ locale:pt locale:pt_BR locale:ro - locale:ro locale:ru locale:rw locale:se @@ -1154,11 +1153,11 @@ locale:uz at cyrillic locale:ven locale:vi - locale:vi locale:xh locale:yi locale:zh_CN locale:zh_TW + locale:zh_HK locale:zu From uludag-commits at pardus.org.tr Fri Oct 10 03:45:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 03:45:20 +0300 (EEST) Subject: [Uludag-commits] r20427 - trunk/comar/mudur/po Message-ID: <20081010004520.7A9B613840BF@liste.pardus.org.tr> Author: klemens Date: Fri Oct 10 03:45:19 2008 New Revision: 20427 Modified: trunk/comar/mudur/po/es.po Log: some spanish language update (kh) Modified: trunk/comar/mudur/po/es.po ================================================================= --- trunk/comar/mudur/po/es.po (original) +++ trunk/comar/mudur/po/es.po Fri Oct 10 03:45:19 2008 @@ -1,3 +1,4 @@ +# translation of es.po to Spanish # translation of es.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -5,14 +6,15 @@ # Klemens Häckel , 2007, 2008. # klemens , 2007. # Klemens Haeckel , 2008. +# Klemens Häckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-09 11:04+0300\n" -"PO-Revision-Date: 2008-06-14 19:48-0400\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: \n" +"PO-Revision-Date: 2008-10-09 20:44-0400\n" +"Last-Translator: Klemens Häckel \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +49,7 @@ #: bin/mudur.py:667 msgid "No network connection, skipping remote mount." -msgstr "" +msgstr "No hay conexión de red, se omite montar las unidades remotas." #: bin/mudur.py:675 msgid "Cannot connect to DBus, services won't be started" @@ -321,9 +323,9 @@ msgstr "Servicio '%s' no se iniciará automaticamente." #: bin/service.py:162 -#, fuzzy, python-format +#, python-format msgid "Service '%s' will be started if required." -msgstr "Servicio '%s' se iniciará automaticamente." +msgstr "Servicio '%s' se iniciará en caso que sea requerido." # recargando o reiniciando, favor opinar #: bin/service.py:167 @@ -578,3 +580,4 @@ #: bin/network.py:538 msgid "Cancelled" msgstr "Cancelado" + From uludag-commits at pardus.org.tr Fri Oct 10 08:16:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 08:16:36 +0300 (EEST) Subject: [Uludag-commits] r20428 - trunk/comar/belgeler Message-ID: <20081010051636.3572C13840C5@liste.pardus.org.tr> Author: bahadir.kandemir Date: Fri Oct 10 08:16:35 2008 New Revision: 20428 Modified: trunk/comar/belgeler/Net.Link.txt Log: Net.Link ile ilgili birkaç tanım daha... Modified: trunk/comar/belgeler/Net.Link.txt ================================================================= --- trunk/comar/belgeler/Net.Link.txt (original) +++ trunk/comar/belgeler/Net.Link.txt Fri Oct 10 08:16:35 2008 @@ -98,7 +98,7 @@ scanRemote(device): - Bağlanılabilir uzak noktaları taramak için kullanılır. + 'remote' modu destekleniyorsa bağlanılabilir uzak noktaları taramak için kullanılır. setConnection(profile, device): @@ -110,11 +110,13 @@ setAddress(profile, mode, address, mask, gateway): - ... + 'net' modu destekleniyorsa adres girmek girme için kullanılır. + 'auto' modu destekleniyorsa mode olarak 'auto' verilerek DHCP ayarlanabilir setRemote(profile, remote, apmac): - ... + 'remote' modu destekleniyorsa essid ve apmac tanımlamak için kullanılır. + Wireless tarama ile bulunan ESSID ve MAC girilmelidir. setNameService(profile, namemode, nameserver): @@ -122,16 +124,18 @@ setAuthentication(profile, authmode, user, password): - ... + 'auth' modu destekleniyorsa, kimlik doğrulama bilgilerini ayarlamak için kullanılır. + Detaylı bilgi yukarıda, 'auth_modes' tanımında bulunabilir + + getAuthentication(profile): + Profilin kimlik doğrulama bilgilerini verir. Bu bilgiler güvenlik amacıyla + connectionInfo()'da bulunmaz. setState(profile, state): - ... + 'up' ile ilgili profil bağlantısını kurar, 'down' ile kapatır. getState(profile): - ... - + Profilin bağlantı durumunu verir. - getAuthentication(profile): - ... From uludag-commits at pardus.org.tr Fri Oct 10 15:16:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 15:16:54 +0300 (EEST) Subject: [Uludag-commits] r20429 - trunk/tasma/package-manager/po Message-ID: <20081010121654.3642B13840D1@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 10 15:16:53 2008 New Revision: 20429 Modified: trunk/tasma/package-manager/po/pt_BR.po Log: Fix copyright, remove executable bit Modified: trunk/tasma/package-manager/po/pt_BR.po ================================================================= --- trunk/tasma/package-manager/po/pt_BR.po (original) +++ trunk/tasma/package-manager/po/pt_BR.po Fri Oct 10 15:16:53 2008 @@ -1,7 +1,7 @@ # translation of pt_BR.po to # Translation of pt_BR.po to Brazilian Portuguese -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2007 +# This file is distributed under the same license as the package-manager package. # # Pedro Leite , 2007. # Faik Uygur , 2007. From uludag-commits at pardus.org.tr Fri Oct 10 15:38:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 15:38:15 +0300 (EEST) Subject: [Uludag-commits] r20430 - trunk/tasma/tasma/po Message-ID: <20081010123815.B698413840D9@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 10 15:38:15 2008 New Revision: 20430 Modified: trunk/tasma/tasma/po/CMakeLists.txt Log: Don't forget to add new locales here Modified: trunk/tasma/tasma/po/CMakeLists.txt ================================================================= --- trunk/tasma/tasma/po/CMakeLists.txt (original) +++ trunk/tasma/tasma/po/CMakeLists.txt Fri Oct 10 15:38:15 2008 @@ -10,6 +10,8 @@ nl.po pt_BR.po tr.po + pl.po + sv.po ) SET(_gmofiles) From uludag-commits at pardus.org.tr Fri Oct 10 15:39:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 15:39:08 +0300 (EEST) Subject: [Uludag-commits] r20431 - trunk/tasma/tasma Message-ID: <20081010123908.8ACDC13840D8@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 10 15:39:08 2008 New Revision: 20431 Modified: trunk/tasma/tasma/ChangeLog Log: Update changelog Modified: trunk/tasma/tasma/ChangeLog ================================================================= --- trunk/tasma/tasma/ChangeLog (original) +++ trunk/tasma/tasma/ChangeLog Fri Oct 10 15:39:08 2008 @@ -1,3 +1,6 @@ +2008-10-10 Ozan Çağlayan + * po/CMakefiles.txt: Add pl.po and sv.po to CMakefiles.txt + 2008-09-12 Pınar Yanardağ * src/main.cpp: Update version to 1.5.1 * applnk: Minor translation fixes From uludag-commits at pardus.org.tr Fri Oct 10 15:54:41 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 10 Oct 2008 15:54:41 +0300 (EEST) Subject: [Uludag-commits] r20432 - in trunk/tasma/tasma: . src Message-ID: <20081010125441.CF12313840E1@liste.pardus.org.tr> Author: pinar Date: Fri Oct 10 15:54:41 2008 New Revision: 20432 Modified: trunk/tasma/tasma/ChangeLog trunk/tasma/tasma/src/main.cpp Log: update version to 1.5.2 Modified: trunk/tasma/tasma/ChangeLog ================================================================= --- trunk/tasma/tasma/ChangeLog (original) +++ trunk/tasma/tasma/ChangeLog Fri Oct 10 15:54:41 2008 @@ -1,3 +1,6 @@ +2008-10-10 Pınar Yanardağ + * src/main.cpp:·Update version to 1.5.2 + 2008-10-10 Ozan Çağlayan * po/CMakefiles.txt: Add pl.po and sv.po to CMakefiles.txt Modified: trunk/tasma/tasma/src/main.cpp ================================================================= --- trunk/tasma/tasma/src/main.cpp (original) +++ trunk/tasma/tasma/src/main.cpp Fri Oct 10 15:54:41 2008 @@ -59,7 +59,7 @@ int main( int argc, char *argv[] ) { KLocale::setMainCatalogue( "tasma" ); - KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.5.1", + KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.5.2", I18N_NOOP( "Pardus Configuration Center" ), KAboutData::License_GPL, I18N_NOOP( "(c) TUBITAK - UEKAE" ) ); aboutData.addAuthor( "Pınar Yanardağ", I18N_NOOP( "Current Maintainer" ), "pinar at pardus.org.tr" ); From uludag-commits at pardus.org.tr Sat Oct 11 00:54:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 11 Oct 2008 00:54:21 +0300 (EEST) Subject: [Uludag-commits] r20433 - in trunk/staj-projeleri/paket-arama/search: locale/tr/LC_MESSAGES pagination pagination/locale pagination/locale/tr pagination/locale/tr/LC_MESSAGES pagination/templates pagination/templates/pagination pagination/templatetags Message-ID: <20081010215421.9428113840E1@liste.pardus.org.tr> Author: emre.aladag Date: Sat Oct 11 00:54:20 2008 New Revision: 20433 Added: trunk/staj-projeleri/paket-arama/search/pagination/ trunk/staj-projeleri/paket-arama/search/pagination/__init__.py trunk/staj-projeleri/paket-arama/search/pagination/locale/ trunk/staj-projeleri/paket-arama/search/pagination/locale/tr/ trunk/staj-projeleri/paket-arama/search/pagination/locale/tr/LC_MESSAGES/ trunk/staj-projeleri/paket-arama/search/pagination/locale/tr/LC_MESSAGES/django.po trunk/staj-projeleri/paket-arama/search/pagination/middleware.py trunk/staj-projeleri/paket-arama/search/pagination/models.py trunk/staj-projeleri/paket-arama/search/pagination/templates/ trunk/staj-projeleri/paket-arama/search/pagination/templates/pagination/ trunk/staj-projeleri/paket-arama/search/pagination/templates/pagination/pagination.html trunk/staj-projeleri/paket-arama/search/pagination/templatetags/ trunk/staj-projeleri/paket-arama/search/pagination/templatetags/__init__.py trunk/staj-projeleri/paket-arama/search/pagination/templatetags/pagination_tags.py trunk/staj-projeleri/paket-arama/search/pagination/tests.py Modified: trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po Log: Just forgot to upload the pagination module Modified: trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po ================================================================= --- trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po (original) +++ trunk/staj-projeleri/paket-arama/search/locale/tr/LC_MESSAGES/django.po Sat Oct 11 00:54:20 2008 @@ -8,9 +8,9 @@ "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-19 14:35+0300\n" -"PO-Revision-Date: 2008-09-19 11:43+0300\n" -"Last-Translator: Ahmet Emre Aladağ \n" -"Language-Team: \n" +"PO-Revision-Date: 2008-10-11 00:47+0300\n" +"Last-Translator: Ahmet Emre Aladağ\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -120,7 +120,7 @@ msgstr "%(term)s için sonuçlar" #: templates/pathsearch/results.html:7 -#, fuzzy, python-format +#, python-format msgid "Results for %(package_name)s" msgstr "%(package)s için sonuçlar" @@ -156,10 +156,11 @@ msgstr "Dosya yolu" #: templates/pathsearch/results.html:53 -#, fuzzy, python-format +#, python-format msgid "Packages and paths of files related to %(term)s:" msgstr "%(term)s ile alakalı dosyaların paket ve yolları:" #: templates/pathsearch/results.html:71 msgid "No results..." msgstr "Sonuç bulunamadı..." + From uludag-commits at pardus.org.tr Sun Oct 12 23:27:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 12 Oct 2008 23:27:58 +0300 (EEST) Subject: [Uludag-commits] r20434 - in trunk/comar/mudur: . bin Message-ID: <20081012202759.06B3013840C7@liste.pardus.org.tr> Author: bahadir.kandemir Date: Sun Oct 12 23:27:58 2008 New Revision: 20434 Modified: trunk/comar/mudur/ChangeLog trunk/comar/mudur/bin/service.py Log: bin/service.py: Replace "-" with "_" before passing package name to D-Bus Modified: trunk/comar/mudur/ChangeLog ================================================================= --- trunk/comar/mudur/ChangeLog (original) +++ trunk/comar/mudur/ChangeLog Sun Oct 12 23:27:58 2008 @@ -1,3 +1,8 @@ +2008-10-12 Bahadır Kandemir + + * bin/service.py: Replace "-" with "_" before passing package + name to D-Bus + 2008-09-17 Fatih Aşıcı * bin/update-fstab.py: Do not create a directory when mount Modified: trunk/comar/mudur/bin/service.py ================================================================= --- trunk/comar/mudur/bin/service.py (original) +++ trunk/comar/mudur/bin/service.py Sun Oct 12 23:27:58 2008 @@ -315,7 +315,7 @@ manage_dbus(args[1], use_color, quiet) elif args[1] in operations: try: - manage_service(args[0], args[1], use_color, quiet) + manage_service(args[0].replace("-", "_"), args[1], use_color, quiet) except dbus.DBusException, e: print e.args[0] return -1 From uludag-commits at pardus.org.tr Mon Oct 13 12:18:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 13 Oct 2008 12:18:03 +0300 (EEST) Subject: [Uludag-commits] r20435 - trunk/pardusman/projects Message-ID: <20081013091803.DEDF8138406D@liste.pardus.org.tr> Author: eki Date: Mon Oct 13 12:18:03 2008 New Revision: 20435 Modified: trunk/pardusman/projects/Kurulan-int.xml trunk/pardusman/projects/Kurulan.xml trunk/pardusman/projects/Çalışan-KDE3.xml trunk/pardusman/projects/Çalışan-KDE4.xml Log: refresh Modified: trunk/pardusman/projects/Kurulan-int.xml ================================================================= --- trunk/pardusman/projects/Kurulan-int.xml (original) +++ trunk/pardusman/projects/Kurulan-int.xml Mon Oct 13 12:18:03 2008 @@ -1,5 +1,5 @@ - Pardus 2008.1-Int [r4] + Pardus 2008.1 Hyaena hyaena [Int] /home/ekin/temp/cdtemprelease/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ yali4=debug @@ -148,11 +148,9 @@ kdepim kdetv kipi-plugins - kmplayer knazar konversation kpowersave - ktorrent lame lib-compat libassuan @@ -185,6 +183,7 @@ ntfsprogs openoffice ov511 + ov51x-jpeg package-manager paprefs pavucontrol @@ -204,7 +203,6 @@ service-manager setserial slmodem - smb4k sn9c1xx speedtouch-firmware splix @@ -530,11 +528,9 @@ kio-to-local kipi-plugins klibc - kmplayer knazar konversation kpowersave - ktorrent ladspa-sdk lame lcms @@ -745,6 +741,7 @@ openssl orbit2 ov511 + ov51x-jpeg package-manager pam pango @@ -820,7 +817,6 @@ sip slang slmodem - smb4k sn9c1xx sox speedtouch-firmware Modified: trunk/pardusman/projects/Kurulan.xml ================================================================= --- trunk/pardusman/projects/Kurulan.xml (original) +++ trunk/pardusman/projects/Kurulan.xml Mon Oct 13 12:18:03 2008 @@ -1,5 +1,5 @@ - Pardus 2008.1 [r4] + Pardus 2008.1 Hyaena hyaena /home/ekin/temp/cdtemprelease/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ yali4=debug @@ -108,7 +108,6 @@ knazar konversation kpowersave - ktorrent lame lib-compat libassuan @@ -141,6 +140,7 @@ ntfsprogs openoffice ov511 + ov51x-jpeg package-manager paprefs pavucontrol @@ -163,14 +163,12 @@ sn9c1xx speedtouch-firmware splix - squashfs-tools sshfs strace sudo sysinfo syslinux tasma - tcpdump telnet-bsd traceroute tulliana2 @@ -446,7 +444,6 @@ knazar konversation kpowersave - ktorrent ladspa-sdk lame lcms @@ -658,6 +655,7 @@ openssl orbit2 ov511 + ov51x-jpeg package-manager pam pango @@ -751,7 +749,6 @@ spidermonkey splix sqlite - squashfs-tools sshfs startup-notification strace @@ -772,7 +769,6 @@ tcl tcltk tcp-wrappers - tcpdump telnet-bsd texinfo tiff Modified: trunk/pardusman/projects/Çalışan-KDE3.xml ================================================================= --- trunk/pardusman/projects/Çalışan-KDE3.xml (original) +++ trunk/pardusman/projects/Çalışan-KDE3.xml Mon Oct 13 12:18:03 2008 @@ -1,5 +1,5 @@ - Pardus Calisan 2008.1-KDE3 [r4] + Pardus Calisan 2008.1-KDE3 Hyaena hyaena /home/ekin/temp/cdtemplive/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ @@ -845,4 +845,4 @@ zpspell zvbi - \ No newline at end of file + Modified: trunk/pardusman/projects/Çalışan-KDE4.xml ================================================================= --- trunk/pardusman/projects/Çalışan-KDE4.xml (original) +++ trunk/pardusman/projects/Çalışan-KDE4.xml Mon Oct 13 12:18:03 2008 @@ -1,5 +1,5 @@ - Pardus Calisan 2008.1-KDE4 [r5] + Pardus Calisan 2008.1-KDE4 Hyaena hyaena /home/ekin/temp/cdtemplive/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ @@ -117,6 +117,7 @@ kdepim4 kdeplasma-addons kdm-pardus-theme + kdm-pardus-theme-kde4 kernel kftpgrabber konversation @@ -464,6 +465,7 @@ kdepimlibs kdeplasma-addons kdm-pardus-theme + kdm-pardus-theme-kde4 kernel kernel-headers kftpgrabber @@ -833,4 +835,4 @@ zorg zpspell - \ No newline at end of file + From uludag-commits at pardus.org.tr Mon Oct 13 12:19:19 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 13 Oct 2008 12:19:19 +0300 (EEST) Subject: [Uludag-commits] r20436 - trunk/pardusman/projects/release/2008.1 Message-ID: <20081013091919.6FEDF138406D@liste.pardus.org.tr> Author: eki Date: Mon Oct 13 12:19:19 2008 New Revision: 20436 Added: trunk/pardusman/projects/release/2008.1/ trunk/pardusman/projects/release/2008.1/Kurulan-int.xml (props changed) - copied unchanged from r20435, trunk/pardusman/projects/Kurulan-int.xml trunk/pardusman/projects/release/2008.1/Kurulan.xml (props changed) - copied unchanged from r20435, trunk/pardusman/projects/Kurulan.xml trunk/pardusman/projects/release/2008.1/Çalışan-KDE3.xml - copied unchanged from r20435, trunk/pardusman/projects/Çalışan-KDE3.xml trunk/pardusman/projects/release/2008.1/Çalışan-KDE4.xml (props changed) - copied unchanged from r20435, trunk/pardusman/projects/Çalışan-KDE4.xml Log: do not foprget the release xmls.. From uludag-commits at pardus.org.tr Mon Oct 13 12:29:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 13 Oct 2008 12:29:36 +0300 (EEST) Subject: [Uludag-commits] r20437 - trunk/pardusman/projects Message-ID: <20081013092936.4160313840D6@liste.pardus.org.tr> Author: eki Date: Mon Oct 13 12:29:36 2008 New Revision: 20437 Modified: trunk/pardusman/projects/Kurulan-int.xml trunk/pardusman/projects/Kurulan.xml trunk/pardusman/projects/Çalışan-KDE3.xml trunk/pardusman/projects/Çalışan-KDE4.xml Log: refresh, BUG:FIXED:7591 Modified: trunk/pardusman/projects/Kurulan-int.xml ================================================================= --- trunk/pardusman/projects/Kurulan-int.xml (original) +++ trunk/pardusman/projects/Kurulan-int.xml Mon Oct 13 12:29:36 2008 @@ -1,5 +1,5 @@ - Pardus 2008.1 Hyaena hyaena [Int] + Pardus 2008.1 [Int] /home/ekin/temp/cdtemprelease/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ yali4=debug @@ -49,6 +49,7 @@ dstat dvgrab eagle-firmware + eciadsl ed essential et131x @@ -199,6 +200,7 @@ ralink-firmware rdate reiserfsprogs + rp-pppoe sdparm service-manager setserial @@ -344,6 +346,7 @@ dvgrab e2fsprogs eagle-firmware + eciadsl ed eject elfutils @@ -802,6 +805,7 @@ readline reiserfsprogs reportlab + rp-pppoe ruby samba sane-backends Modified: trunk/pardusman/projects/Kurulan.xml ================================================================= --- trunk/pardusman/projects/Kurulan.xml (original) +++ trunk/pardusman/projects/Kurulan.xml Mon Oct 13 12:29:36 2008 @@ -1,5 +1,5 @@ - Pardus 2008.1 Hyaena hyaena + Pardus 2008.1 /home/ekin/temp/cdtemprelease/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ yali4=debug @@ -48,6 +48,7 @@ dstat dvgrab eagle-firmware + eciadsl ed essential et131x @@ -156,6 +157,7 @@ ralink-firmware rdate reiserfsprogs + rp-pppoe sdparm service-manager setserial @@ -299,6 +301,7 @@ dvgrab e2fsprogs eagle-firmware + eciadsl ed eject elfutils @@ -720,6 +723,7 @@ readline reiserfsprogs reportlab + rp-pppoe ruby samba sane-backends Modified: trunk/pardusman/projects/Çalışan-KDE3.xml ================================================================= --- trunk/pardusman/projects/Çalışan-KDE3.xml (original) +++ trunk/pardusman/projects/Çalışan-KDE3.xml Mon Oct 13 12:29:36 2008 @@ -1,5 +1,5 @@ - Pardus Calisan 2008.1-KDE3 Hyaena hyaena + Pardus Calisan 2008.1-KDE3 /home/ekin/temp/cdtemplive/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ @@ -845,4 +845,4 @@ zpspell zvbi - + \ No newline at end of file Modified: trunk/pardusman/projects/Çalışan-KDE4.xml ================================================================= --- trunk/pardusman/projects/Çalışan-KDE4.xml (original) +++ trunk/pardusman/projects/Çalışan-KDE4.xml Mon Oct 13 12:29:36 2008 @@ -1,5 +1,5 @@ - Pardus Calisan 2008.1-KDE4 Hyaena hyaena + Pardus Calisan 2008.1-KDE4 /home/ekin/temp/cdtemplive/ /home/ekin/svn/uludag/trunk/CD-image/CD-image-version-2008.1/ @@ -274,6 +274,7 @@ cabextract cairo cairomm + capseo cdparanoia chmlib clucene @@ -524,6 +525,7 @@ libavc1394 libcaca libcap + libcaptury libconfig libcroco libdaemon @@ -835,4 +837,4 @@ zorg zpspell - + \ No newline at end of file From uludag-commits at pardus.org.tr Mon Oct 13 16:30:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 13 Oct 2008 16:30:29 +0300 (EEST) Subject: [Uludag-commits] r20438 - trunk/staj-projeleri/python-pulse/src Message-ID: <20081013133029.CB1851384101@liste.pardus.org.tr> Author: burak.alkan Date: Mon Oct 13 16:30:29 2008 New Revision: 20438 Modified: trunk/staj-projeleri/python-pulse/src/func.c trunk/staj-projeleri/python-pulse/src/pypulse.c trunk/staj-projeleri/python-pulse/src/pypulse.h Log: minor fix Modified: trunk/staj-projeleri/python-pulse/src/func.c ================================================================= --- trunk/staj-projeleri/python-pulse/src/func.c (original) +++ trunk/staj-projeleri/python-pulse/src/func.c Mon Oct 13 16:30:29 2008 @@ -12,7 +12,7 @@ }notify; notify **root; -static int allocated = 0; /* allocated -> 1 not allocated-> 0 */ +static int allocated = 0; static int notify_index = 0; @@ -45,31 +45,30 @@ void py_updateSinkInput(pa_sink_input_info* info) { - printf("update time = %d\n", notify_index); - printf("*****index = %i\n", info->index); - printf("*****name = %c\n", *info->name); - printf("*****client = %i\n", info->client);// unique one - printf("*****sink = %i\n", info->sink); - printf("*****driver = %c\n", *info->driver); + printf("func.c: update time = %d\n", notify_index); + printf("func.c: index = %i\n", info->index); + printf("func.c: name = %c\n", *info->name); + printf("func.c: client = %i\n", info->client);// unique one + printf("func.c: sink = %i\n", info->sink); + printf("func.c: driver = %c\n", *info->driver); // if **root is not allocated allocate it first if(!allocated) alloc_first(); - else printf("root will not allocated this time\n"); + else printf("func.c: root will not allocated this time\n"); root[notify_index] = (notify*)calloc(1,sizeof(notify)); root[notify_index]->client = info->client; - printf("INF: entering sprintf\n"); + printf("func.c:INF: entering sprintf\n"); sprintf(root[notify_index]->name, "member %d", notify_index); - if (notify_index > 0){ - printf("INF: adding chain\n"); + printf("func.c:INF: adding chain\n"); root[notify_index - 1]->next = root[notify_index]; } notify_index++; - } +/* void py_updateSink(pa_sink_info* info) { printf(""); @@ -80,7 +79,6 @@ } - void py_updateSource(pa_source_info* info) { printf(""); @@ -90,23 +88,20 @@ printf(""); } - - +*/ void sink_cb(pa_context *c, const pa_sink_info *i, int eol) { if (eol) { //dec_outstanding(w); - printf("INF: dec_outstanding MainWindow\n"); + printf("func.c:INF: dec_outstanding MainWindow\n"); return; } - if (!i) { //show_error("Sink callback failure"); - printf("sink callback failure \n"); + printf("func.c: sink callback failure \n"); return; } - //w->updateSink(*i); printf("INF: suppose to updateSink(*i)\n"); } @@ -202,7 +197,7 @@ if (!(o = pa_context_get_sink_info_by_index(c, index, sink_cb, NULL))) { //show_error("pa_context_get_sink_info_by_index() failed"); - printf("pa_context_get_sink_info_by_index() failed\n"); + printf("func.c: pa_context_get_sink_info_by_index() failed\n"); return; } pa_operation_unref(o); @@ -213,13 +208,13 @@ case PA_SUBSCRIPTION_EVENT_SOURCE: if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) //w->removeSource(index); - printf("INF: suppose to removeSource(index)\n"); + printf("func.c:INF: suppose to removeSource(index)\n"); else { pa_operation *o; if (!(o = pa_context_get_source_info_by_index(c, index, source_cb, NULL))) { //show_error("pa_context_get_source_info_by_index() failed"); - printf("pa_context_get_source_info_by_index() failed\n"); + printf("func.c: pa_context_get_source_info_by_index() failed\n"); return; } pa_operation_unref(o); @@ -230,12 +225,12 @@ case PA_SUBSCRIPTION_EVENT_SINK_INPUT: if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) //w->removeSinkInput(index); - printf("INF: suppose to removeSinkInput(index)\n"); + printf("func.c:INF: suppose to removeSinkInput(index)\n"); else { pa_operation *o; if (!(o = pa_context_get_sink_input_info(c, index, sink_input_cb, NULL))) { //show_error("pa_context_get_sink_input_info() failed"); - printf("pa_context_get_sink_input_info() failed"); + printf("func.c: pa_context_get_sink_input_info() failed"); return; } pa_operation_unref(o); @@ -245,13 +240,13 @@ case PA_SUBSCRIPTION_EVENT_CLIENT: if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) //w->removeClient(index); - printf("INF: suppose to removeClient(index)\n"); + printf("func.c:INF: suppose to removeClient(index)\n"); else { pa_operation *o; if (!(o = pa_context_get_client_info(c, index, client_cb, NULL))) { //show_error("pa_context_get_client_info() failed"); - printf("pa_context_get_client_info() failed\n"); + printf("func.c: pa_context_get_client_info() failed\n"); return; } pa_operation_unref(o); @@ -259,12 +254,12 @@ break; case PA_SUBSCRIPTION_EVENT_SERVER: - printf("pa_subscription_event_server triggered\n"); + printf("func.c: pa_subscription_event_server triggered\n"); { pa_operation *o; if (!(o = pa_context_get_server_info(c, server_info_cb, NULL))) { //show_error("pa_context_get_server_info() failed"); - printf("pa_context_get_server_info() failed\n"); + printf("func.c: pa_context_get_server_info() failed\n"); return; } pa_operation_unref(o); Modified: trunk/staj-projeleri/python-pulse/src/pypulse.c ================================================================= --- trunk/staj-projeleri/python-pulse/src/pypulse.c (original) +++ trunk/staj-projeleri/python-pulse/src/pypulse.c Mon Oct 13 16:30:29 2008 @@ -6,49 +6,49 @@ int context_state_callback(pa_context* c, void* userdata) { - printf("context_state_callback pa_context* c assertion\n"); - g_assert(c); + printf("context_state_callback pa_context* c assertion\n"); + g_assert(c); + + switch (pa_context_get_state(c)){ + case PA_CONTEXT_CONNECTING: + printf("INF: connecting..\n"); + break; + + case PA_CONTEXT_AUTHORIZING: + printf("INF: authorizing..\n"); + break; + + case PA_CONTEXT_SETTING_NAME: + printf("INF: settings name..\n"); + break; - switch (pa_context_get_state(c)){ - case PA_CONTEXT_CONNECTING: - printf("INF: connecting..\n"); - break; - - case PA_CONTEXT_AUTHORIZING: - printf("INF: authorizing..\n"); - break; - - case PA_CONTEXT_SETTING_NAME: - printf("INF: settings name..\n"); - break; - - case PA_CONTEXT_READY: { - g_assert(c); - printf("INF: connection seems OK\n"); - connection_state = 1; // for is_valid - // TODO: add pa_context_set_subscribe_callback ! - pa_operation* o; - pa_context_set_subscribe_callback(c, subscribe_cb, NULL); - if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t) - (PA_SUBSCRIPTION_MASK_SINK| - PA_SUBSCRIPTION_MASK_SOURCE| - PA_SUBSCRIPTION_MASK_SINK_INPUT| - PA_SUBSCRIPTION_MASK_CLIENT| - PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))) { - printf("pa_context_subscribe() failed"); - return; - } - break; - } - case PA_CONTEXT_TERMINATED: - printf("WAR: context terminated\n"); - return 1; - break; - case PA_CONTEXT_FAILED: - default: - printf("Connection failure: %s\n", pa_strerror(pa_context_errno(c))); - return 1; - } + case PA_CONTEXT_READY: { + g_assert(c); + printf("INF: connection seems OK\n"); + connection_state = 1; // for is_valid + // TODO: add pa_context_set_subscribe_callback ! + pa_operation* o; + pa_context_set_subscribe_callback(c, subscribe_cb, NULL); + if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t) + (PA_SUBSCRIPTION_MASK_SINK| + PA_SUBSCRIPTION_MASK_SOURCE| + PA_SUBSCRIPTION_MASK_SINK_INPUT| + PA_SUBSCRIPTION_MASK_CLIENT| + PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))) { + printf("pa_context_subscribe() failed"); + return; + } + break; + } + case PA_CONTEXT_TERMINATED: + printf("WAR: context terminated\n"); + return 1; + break; + case PA_CONTEXT_FAILED: + default: + printf("Connection failure: %s\n", pa_strerror(pa_context_errno(c))); + return 1; + } } /* @@ -57,11 +57,11 @@ pa_operation* o; // c->context if(!(o = pa_context_subscribe(context, (pa_subscription_mask_t) - (PA_SUBSCRIPTION_MASK_SINK| - PA_SUBSCRIPTION_MASK_SOURCE| - PA_SUBSCRIPTION_MASK_SINK_INPUT| - PA_SUBSCRIPTION_MASK_CLIENT| - PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))){ + (PA_SUBSCRIPTION_MASK_SINK| + PA_SUBSCRIPTION_MASK_SOURCE| + PA_SUBSCRIPTION_MASK_SINK_INPUT| + PA_SUBSCRIPTION_MASK_CLIENT| + PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))){ printf("py_context_set_subscribe_callback: pa_context_subscribe failed\n"); Py_INCREF(Py_False); return Py_False; @@ -74,17 +74,17 @@ static PyObject* main_event_loop() { - gtk_main(); - return Py_BuildValue("i", 0); + gtk_main(); + return Py_BuildValue("i", 0); } void safe_quit() { - printf("WAR: quitting\n"); - /* prepare and quit */ - if(context) pa_context_unref(context); - printf("WAR: returning ret\n"); + printf("WAR: quitting\n"); + /* prepare and quit */ + if(context) pa_context_unref(context); + printf("WAR: returning ret\n"); } @@ -100,10 +100,10 @@ } /* run this after py_context_connect() - * if you want to get notified when - * an event occurs. - * Notification starts here - */ +* if you want to get notified when +* an event occurs. +* Notification starts here +*/ static PyObject* py_context_set_state_callback() { pa_context_set_state_callback(context, context_state_callback, NULL); @@ -113,8 +113,8 @@ /* connect to default running pulse server - * returns -1 on fail, 0 on success - */ +* returns -1 on fail, 0 on success +*/ static PyObject* py_context_connect() { // TODO: change return values ? @@ -126,43 +126,43 @@ /* main initialize function for pulseaudio - * first step - */ +* first step +*/ static PyObject* py_initialize() { - pa_glib_mainloop* m = pa_glib_mainloop_new(g_main_context_default()); // instead of pa_mainloop_new() - printf("ASSERT: m assertion.. \n"); - g_assert(m); - pa_mainloop_api *api = pa_glib_mainloop_get_api(m); - printf("ASSERT: api assertion... \n"); - g_assert(api); - context = pa_context_new(api, "dummy"); - printf("ASSERT: context assertion...\n"); - g_assert(context); - - //pa_context_set_state_callback(context, context_state_callback, NULL); - //pa_context_connect(context, NULL, 0, NULL); - return Py_BuildValue("i",0); + pa_glib_mainloop* m = pa_glib_mainloop_new(g_main_context_default()); // instead of pa_mainloop_new() + printf("ASSERT: m assertion.. \n"); + g_assert(m); + pa_mainloop_api *api = pa_glib_mainloop_get_api(m); + printf("ASSERT: api assertion... \n"); + g_assert(api); + context = pa_context_new(api, "dummy"); + printf("ASSERT: context assertion...\n"); + g_assert(context); + //pa_context_set_state_callback(context, context_state_callback, NULL); + //pa_context_connect(context, NULL, 0, NULL); + return Py_BuildValue("i",0); } -static PyMethodDef Methods[] = { - {"initialize", py_initialize, METH_VARARGS}, - {"context_set_state_callback", py_context_set_state_callback, METH_VARARGS}, - {"context_connect", py_context_connect, METH_VARARGS}, - //{"check_values", check_callback, METH_VARARGS}, - {"is_connection_valid",check_connection_flag , METH_VARARGS}, - //{"context_set_subscribe_callback",py_context_set_subscribe_callback , METH_VARARGS}, - {"loop", main_event_loop, METH_VARARGS}, - {NULL , NULL, 0, NULL} +static PyMethodDef Methods[] = +{ + {"initialize", py_initialize, METH_VARARGS}, + {"context_set_state_callback", py_context_set_state_callback, METH_VARARGS}, + {"context_connect", py_context_connect, METH_VARARGS}, + //{"check_values", check_callback, METH_VARARGS}, + {"is_connection_valid",check_connection_flag , METH_VARARGS}, + //{"context_set_subscribe_callback",py_context_set_subscribe_callback , METH_VARARGS}, + {"loop", main_event_loop, METH_VARARGS}, + {NULL , NULL, 0, NULL} }; PyMODINIT_FUNC initpypulse(void) { - PyObject* m; - m = Py_InitModule("pypulse", Methods); - if(m == NULL) return; + PyObject* m; + m = Py_InitModule("pypulse", Methods); + if(m == NULL) return; } Modified: trunk/staj-projeleri/python-pulse/src/pypulse.h ================================================================= --- trunk/staj-projeleri/python-pulse/src/pypulse.h (original) +++ trunk/staj-projeleri/python-pulse/src/pypulse.h Mon Oct 13 16:30:29 2008 @@ -8,7 +8,7 @@ typedef struct update_sink{ PyObject_HEAD PyObject *index; - // maybe add an int + // maybe add an int }update_sink; static update_sink sink_watcher[100]; From uludag-commits at pardus.org.tr Mon Oct 13 16:35:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 13 Oct 2008 16:35:26 +0300 (EEST) Subject: [Uludag-commits] r20439 - in trunk/comar/mudur: . bin Message-ID: <20081013133526.96E6C1384101@liste.pardus.org.tr> Author: ozan.caglayan Date: Mon Oct 13 16:35:26 2008 New Revision: 20439 Modified: trunk/comar/mudur/ChangeLog trunk/comar/mudur/bin/mudur.py Log: i18n fix Modified: trunk/comar/mudur/ChangeLog ================================================================= --- trunk/comar/mudur/ChangeLog (original) +++ trunk/comar/mudur/ChangeLog Mon Oct 13 16:35:26 2008 @@ -1,3 +1,7 @@ +2008-10-13 Ozan Çağlayan + * bin/mudur.py (modules): i18n fix for 'Calculating module + dependencies...' string. + 2008-10-12 Bahadır Kandemir * bin/service.py: Replace "-" with "_" before passing package Modified: trunk/comar/mudur/bin/mudur.py ================================================================= --- trunk/comar/mudur/bin/mudur.py (original) +++ trunk/comar/mudur/bin/mudur.py Mon Oct 13 16:35:26 2008 @@ -873,7 +873,7 @@ return curkernel = os.uname()[2] - ui.info(_("Calculating module dependencies for %s" % curkernel)) + ui.info(_("Calculating module dependencies for %s") % curkernel) if os.path.exists("/etc/modprobe.mudur"): depkernel = loadFile("/etc/modprobe.mudur").rstrip("\n") From uludag-commits at pardus.org.tr Tue Oct 14 11:30:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 14 Oct 2008 11:30:50 +0300 (EEST) Subject: [Uludag-commits] r20440 - in trunk/staj-projeleri/boot-modules-arayuzu: . src src/gui Message-ID: <20081014083050.D7C1C1384137@liste.pardus.org.tr> Author: ozirus Date: Tue Oct 14 11:30:50 2008 New Revision: 20440 Modified: trunk/staj-projeleri/boot-modules-arayuzu/README trunk/staj-projeleri/boot-modules-arayuzu/TODO trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_availablemodules.py trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_mainwindow.py trunk/staj-projeleri/boot-modules-arayuzu/src/modulemanager.py Log: bazı görsel düzenlemeler Modified: trunk/staj-projeleri/boot-modules-arayuzu/README ================================================================= --- trunk/staj-projeleri/boot-modules-arayuzu/README (original) +++ trunk/staj-projeleri/boot-modules-arayuzu/README Tue Oct 14 11:30:50 2008 @@ -1 +1 @@ -It's a manager tool that helps for methods in Boot.Modules ÇOMAR model +It's a manager tool that helps for methods in Boot.Modules ÇOMAR model which handle kernel modules management Modified: trunk/staj-projeleri/boot-modules-arayuzu/TODO ================================================================= --- trunk/staj-projeleri/boot-modules-arayuzu/TODO (original) +++ trunk/staj-projeleri/boot-modules-arayuzu/TODO Tue Oct 14 11:30:50 2008 @@ -1,4 +1,5 @@ -- module search will be implemented ++ module search will be implemented - setup.py will be coded - i18n stuff will be researched & implemented - help docs will be written +- test, test, test... Modified: trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_availablemodules.py ================================================================= --- trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_availablemodules.py (original) +++ trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_availablemodules.py Tue Oct 14 11:30:50 2008 @@ -17,7 +17,7 @@ availableModulesDlg.setWindowIcon(QtGui.QIcon("tt:/program-icon.png")) font = QtGui.QFont() - font.setPointSize(7) + font.setPointSize(9) self.cmbListType = QtGui.QComboBox(availableModulesDlg) Modified: trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_mainwindow.py ================================================================= --- trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_mainwindow.py (original) +++ trunk/staj-projeleri/boot-modules-arayuzu/src/gui/ui_mainwindow.py Tue Oct 14 11:30:50 2008 @@ -17,7 +17,7 @@ self.listModules = QtGui.QListWidget(moduleManagerDlg) self.listModules.setGeometry(QtCore.QRect(10,68,311,391)) font = QtGui.QFont() - font.setPointSize(8) + font.setPointSize(9) font.setStrikeOut(False) self.listModules.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) @@ -40,7 +40,7 @@ self.lblSearch = QtGui.QLabel(moduleManagerDlg) self.lblSearch.setGeometry(QtCore.QRect(9,9,28,28)) font = QtGui.QFont() - font.setPointSize(8) + font.setPointSize(9) self.lblSearch.setFont(font) self.lblSearch.setScaledContents(True) self.lblSearch.setWordWrap(True) @@ -51,17 +51,17 @@ self.editSearch.setObjectName("editSearch") self.editSearch.setFocus() font = QtGui.QFont() - font.setPointSize(6) + font.setPointSize(9) self.label = QtGui.QLabel(moduleManagerDlg) self.label.setGeometry(QtCore.QRect(10,44,171,22)) font = QtGui.QFont() - font.setPointSize(8) + font.setPointSize(9) self.label.setFont(font) self.label.setObjectName("label") self.btnNewModule = QtGui.QPushButton(moduleManagerDlg) self.btnNewModule.setGeometry(QtCore.QRect(10,466,111,32)) font = QtGui.QFont() - font.setPointSize(8) + font.setPointSize(9) self.btnNewModule.setFont(font) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/moduleedit.png"),QtGui.QIcon.Normal,QtGui.QIcon.Off) Modified: trunk/staj-projeleri/boot-modules-arayuzu/src/modulemanager.py ================================================================= --- trunk/staj-projeleri/boot-modules-arayuzu/src/modulemanager.py (original) +++ trunk/staj-projeleri/boot-modules-arayuzu/src/modulemanager.py Tue Oct 14 11:30:50 2008 @@ -41,17 +41,17 @@ def comarError(self, exception): if "Access denied" in exception.message: message = "You are not authorized for this operation." - QtGui.QMessageBox.warning(self, "Error", message, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) + QtGui.QMessageBox.warning(None, "Error", message, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) else: - QtGui.QMessageBox.warning(self, "COMAR Error", str(exception), QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) + QtGui.QMessageBox.warning(None, "COMAR Error", str(exception), QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) def cancelError(self): message = "You are not authorized for this operation." - QtGui.QMessageBox.warning(self, "Error", message, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) + QtGui.QMessageBox.warning(None, "Error", message, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) def busError(self, exception): - QtGui.QMessageBox.warning(self, "Comar Error", "Cannot connect to the DBus! If it is not running you should start it with the 'service dbus start' command in a root console.", QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) + QtGui.QMessageBox.warning(None, "Comar Error", "Cannot connect to the DBus! If it is not running you should start it with the 'service dbus start' command in a root console.", QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) sys.exit() def openBus(self): @@ -59,7 +59,7 @@ self.busSys = dbus.SystemBus() self.busSes = dbus.SessionBus() except dbus.DBusException: - QtGui.QMessageBox.warning(self, "Unable to connect to DBus.", "DBus Error", QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) + QtGui.QMessageBox.warning(None, "Unable to connect to DBus.", "DBus Error", QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel) return False return True From uludag-commits at pardus.org.tr Wed Oct 15 12:18:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 15 Oct 2008 12:18:23 +0300 (EEST) Subject: [Uludag-commits] r20441 - trunk/yali4 Message-ID: <20081015091823.341201384145@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed Oct 15 12:18:22 2008 New Revision: 20441 Modified: trunk/yali4/MANIFEST.in Log: update manifest Modified: trunk/yali4/MANIFEST.in ================================================================= --- trunk/yali4/MANIFEST.in (original) +++ trunk/yali4/MANIFEST.in Wed Oct 15 12:18:22 2008 @@ -3,5 +3,5 @@ recursive-include yali4/gui/pics * recursive-include yali4/gui/slideshow * recursive-include yali4/gui *.ui -include . AUTHORS COPYING +include . AUTHORS COPYING README From uludag-commits at pardus.org.tr Wed Oct 15 12:58:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 15 Oct 2008 12:58:50 +0300 (EEST) Subject: [Uludag-commits] r20442 - trunk/yali4/yali4/gui Message-ID: <20081015095850.9F0CD138412F@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed Oct 15 12:58:50 2008 New Revision: 20442 Modified: trunk/yali4/yali4/gui/ScrPartitionAuto.py Log: * Disable widgets while checking what to do .. Modified: trunk/yali4/yali4/gui/ScrPartitionAuto.py ================================================================= --- trunk/yali4/yali4/gui/ScrPartitionAuto.py (original) +++ trunk/yali4/yali4/gui/ScrPartitionAuto.py Wed Oct 15 12:58:50 2008 @@ -101,7 +101,9 @@ def shown(self): # scan partitions for resizing + self.toggleAll() ctx.yali.scanPartitions(self) + self.toggleAll(True) self.fillDeviceList(self.ui.accept_auto_1.isChecked()) self.arp = [] @@ -204,6 +206,11 @@ else: ctx.mainScreen.disableNext() + def toggleAll(self, state=False): + widgets = ["manual", "accept_auto", "accept_auto_1", "accept_auto_2"] + for widget in widgets: + getattr(self.ui, widget).setEnabled(state) + class DeviceItem(QtGui.QListWidgetItem): def __init__(self, parent, dev): text = u"%s - %s (%s)" % (dev.getModel(), From uludag-commits at pardus.org.tr Wed Oct 15 14:16:26 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 15 Oct 2008 14:16:26 +0300 (EEST) Subject: [Uludag-commits] r20443 - trunk/tasma/network-manager Message-ID: <20081015111626.BE92213840C6@liste.pardus.org.tr> Author: ozan.caglayan Date: Wed Oct 15 14:16:26 2008 New Revision: 20443 Modified: trunk/tasma/network-manager/network-applet.py Log: remove trailing whitespaces Modified: trunk/tasma/network-manager/network-applet.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Wed Oct 15 17:25:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 15 Oct 2008 17:25:00 +0300 (EEST) Subject: [Uludag-commits] r20444 - trunk/pisi/pisi/actionsapi Message-ID: <20081015142500.9D50013840CB@liste.pardus.org.tr> Author: faik Date: Wed Oct 15 17:25:00 2008 New Revision: 20444 Modified: trunk/pisi/pisi/actionsapi/pisitools.py Log: If man page is compressed than uncompress it to the man page dir BUG:FIXED:8426 Modified: trunk/pisi/pisi/actionsapi/pisitools.py ================================================================= --- trunk/pisi/pisi/actionsapi/pisitools.py (original) +++ trunk/pisi/pisi/actionsapi/pisitools.py Wed Oct 15 17:25:00 2008 @@ -25,7 +25,7 @@ # Pisi Modules import pisi.context as ctx -from pisi.util import join_path, remove_prefix +from pisi.util import join_path, remove_prefix, uncompress # ActionsAPI Modules import pisi.actionsapi @@ -121,14 +121,21 @@ for sourceFile in sourceFiles: for source in glob.glob(sourceFile): + compressed = source.endswith("gz") and source + if compressed: + source = source[:-3] try: pageName, pageDirectory = source[:source.rindex('.')], \ source[source.rindex('.')+1:] except ValueError: error(_('ActionsAPI [doman]: Wrong man page file: %s') % (source)) - makedirs(join_path(manDIR, '/man%s' % pageDirectory)) - system('install -m0644 %s %s' % (source, join_path(manDIR, '/man%s' % pageDirectory))) + manPDIR = join_path(manDIR, '/man%s' % pageDirectory) + makedirs(manPDIR) + if not compressed: + system('install -m0644 %s %s' % (source, manPDIR)) + else: + uncompress(compressed, targetDir=manPDIR) def domo(sourceFile, locale, destinationFile ): '''inserts the mo files in the list of files into /usr/share/locale/LOCALE/LC_MESSAGES''' From uludag-commits at pardus.org.tr Thu Oct 16 04:27:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 04:27:55 +0300 (EEST) Subject: [Uludag-commits] r20445 - in trunk: staj-projeleri/paket-arama/search/locale/es staj-projeleri/paket-arama/search/locale/es/LC_MESSAGES tasma/package-manager/po Message-ID: <20081016012755.4F05813840DC@liste.pardus.org.tr> Author: klemens Date: Thu Oct 16 04:27:54 2008 New Revision: 20445 Added: trunk/staj-projeleri/paket-arama/search/locale/es/ trunk/staj-projeleri/paket-arama/search/locale/es/LC_MESSAGES/ trunk/staj-projeleri/paket-arama/search/locale/es/LC_MESSAGES/django.po Modified: trunk/tasma/package-manager/po/es.po Log: some spanish language updates, new messages for paket-arama (kh), to be improved Modified: trunk/tasma/package-manager/po/es.po ================================================================= --- trunk/tasma/package-manager/po/es.po (original) +++ trunk/tasma/package-manager/po/es.po Thu Oct 16 04:27:54 2008 @@ -1,3 +1,4 @@ +# translation of es.po to español # translation of es.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -7,14 +8,15 @@ # Christian Faure , 2007. # Faik Uygur , 2007. # Klemens Haeckel , 2008. +# Klemens Häckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-08-31 12:37+0300\n" -"PO-Revision-Date: 2008-06-29 07:45-0400\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: \n" +"PO-Revision-Date: 2008-10-15 20:58-0400\n" +"Last-Translator: Klemens Häckel \n" +"Language-Team: español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -76,8 +78,7 @@ msgid "" "Reverse dependencies of the selected package(s) that are also going to be " "removed:" -msgstr "" -"Dependencias reversas de los paquetes seleccionados que tambien se removerán:" +msgstr "Dependencias reversas de los paquetes seleccionados que tambien se removerán:" #: src/BasketDialog.py:67 msgid "Selected package(s) for install:" @@ -337,17 +338,13 @@ msgstr "Actualmente el carrito está vacío." #: src/MainWidget.py:340 src/MainWidget.py:348 -msgid "" -"Currently there are %1 selected package(s) of total %2 of size " -msgstr "" -"Actualmente están seleccionados %1 paquetes con un tamaño total de " -"%2" +msgid "Currently there are %1 selected package(s) of total %2 of size " +msgstr "Actualmente están seleccionados %1 paquetes con un tamaño total de %2" # ...requeridas... #: src/MainWidget.py:343 msgid "with %3 extra dependencies of total %4 of size " -msgstr "" -" y %3 dependencias requeridas con un tamaño adicional de %4" +msgstr " y %3 dependencias requeridas con un tamaño adicional de %4" #: src/MainWidget.py:345 src/MainWidget.py:353 msgid "in your basket." @@ -384,8 +381,7 @@ msgid "" "Selected packages [%1] are in conflict with each other. These packages can " "not be installed together." -msgstr "" -"Hay [%1] paquetes conflictivos. Estos paquetes no se pueden instalar juntos." +msgstr "Hay [%1] paquetes conflictivos. Estos paquetes no se pueden instalar juntos." #: src/MainWidget.py:383 src/MainWidget.py:393 msgid "Conflict Error" @@ -518,7 +514,7 @@ "Repository address should end with xml or xml.bz2 suffix.

Please try " "again." msgstr "" -"La dirección de repositorio debería terminar en xml o xml.bz2.

Por " +"La dirección de repositorio debe terminar en xml o xml.bz2.

Por " "favor intente de nuevo." #: src/Preferences.py:287 src/Preferences.py:303 @@ -633,8 +629,7 @@ #: src/PreferencesDialog.py:375 msgid "If checked, downloaded packages will be hold at the hard disk cache" -msgstr "" -"Si marcado, se conservarán los archivos descargados en el cache del disco" +msgstr "Si marcado, se conservarán los archivos descargados en el cache del disco" #: src/PreferencesDialog.py:376 msgid "Mb (use 0 for no limit)" @@ -645,10 +640,8 @@ msgstr "C&ache" #: src/PreferencesDialog.py:380 -msgid "" -"You can see current software repositories and corresponding addresses here" -msgstr "" -"Aqui se pueden ver los repositorios actuales de software con sus direcciones" +msgid "You can see current software repositories and corresponding addresses here" +msgstr "Aqui se pueden ver los repositorios actuales de software con sus direcciones" #: src/PreferencesDialog.py:381 msgid "&Add New Repository" @@ -665,8 +658,7 @@ #: src/PreferencesDialog.py:384 msgid "Click here to modify the name or address of a repository" -msgstr "" -"Presione aquí para modificar el nombre o la dirección de un repositorio" +msgstr "Presione aquí para modificar el nombre o la dirección de un repositorio" #: src/PreferencesDialog.py:385 msgid "&Remove Repository" @@ -788,7 +780,7 @@ # in download progres window: status indicator #: src/Progress.py:166 msgid "%1 / %2 package %3" -msgstr "%3 %1 / %2 paquetes" +msgstr "%3 paquete %1 / %2" #: src/ComarIface.py:38 msgid "Unable to connect to DBus." @@ -808,12 +800,9 @@ #: src/ComarIface.py:62 msgid "Network error. Please check your network connections and try again." -msgstr "" -"Error de red. Por favor verifique la conexión de red e intente de nuevo." +msgstr "Error de red. Por favor verifique la conexión de red e intente de nuevo." #: src/ComarIface.py:62 src/ComarIface.py:67 msgid "COMAR Error" msgstr "Error COMAR" -#~ msgid "PiSi Authors" -#~ msgstr "Autores de PiSi" From uludag-commits at pardus.org.tr Thu Oct 16 10:13:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 10:13:04 +0300 (EEST) Subject: [Uludag-commits] r20446 - trunk/initramfs Message-ID: <20081016071304.2043A13840CF@liste.pardus.org.tr> Author: onur Date: Thu Oct 16 10:13:03 2008 New Revision: 20446 Modified: trunk/initramfs/init Log: Make root=shell probe for hardware and add root=shellnoprobe support, fixes bug #8063 Modified: trunk/initramfs/init ================================================================= --- trunk/initramfs/init (original) +++ trunk/initramfs/init Thu Oct 16 10:13:03 2008 @@ -213,8 +213,12 @@ parse_cmdline -if [ "${ROOT_DEVICE}" == "shell" ] +if [ "${ROOT_DEVICE}" == "shellnoprobe" ] then + fall2sh "Starting up a shell without probing, as commanded" +elif [ "${ROOT_DEVICE}" == "shell" ] +then + probe_devices fall2sh "Starting up a shell, as commanded" fi From uludag-commits at pardus.org.tr Thu Oct 16 10:19:16 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 10:19:16 +0300 (EEST) Subject: [Uludag-commits] r20447 - trunk/pisi/pisi Message-ID: <20081016071916.B40AD13840CF@liste.pardus.org.tr> Author: faik Date: Thu Oct 16 10:19:16 2008 New Revision: 20447 Modified: trunk/pisi/pisi/api.py Log: No self here. Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Thu Oct 16 10:19:16 2008 @@ -53,12 +53,12 @@ """ Decorator for synchronizing privileged functions """ - def wrapper(self,*__args,**__kw): + def wrapper(*__args,**__kw): lock = file(pisi.util.join_path(pisi.context.config.lock_dir(), 'pisi'), 'w') try: fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB) try: - return func(self,*__args,**__kw) + return func(*__args,**__kw) except Exception, e: lock.close() raise e From uludag-commits at pardus.org.tr Thu Oct 16 10:27:35 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 10:27:35 +0300 (EEST) Subject: [Uludag-commits] r20448 - trunk/pisi/pisi Message-ID: <20081016072735.BD09713840D0@liste.pardus.org.tr> Author: faik Date: Thu Oct 16 10:27:35 2008 New Revision: 20448 Modified: trunk/pisi/pisi/api.py Log: finally makes it. Also this was preventing to see the full exception backtrace. Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Thu Oct 16 10:27:35 2008 @@ -59,9 +59,8 @@ fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB) try: return func(*__args,**__kw) - except Exception, e: + finally: lock.close() - raise e except IOError: raise pisi.errors.AnotherInstanceError(_("Another instance of PiSi is running. Only one instance is allowed.")) return wrapper From uludag-commits at pardus.org.tr Thu Oct 16 10:50:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 10:50:33 +0300 (EEST) Subject: [Uludag-commits] r20449 - trunk/pisi Message-ID: <20081016075033.8FE8B13840CF@liste.pardus.org.tr> Author: faik Date: Thu Oct 16 10:50:33 2008 New Revision: 20449 Modified: trunk/pisi/ChangeLog Log: Update changelog Modified: trunk/pisi/ChangeLog ================================================================= --- trunk/pisi/ChangeLog (original) +++ trunk/pisi/ChangeLog Thu Oct 16 10:50:33 2008 @@ -1,3 +1,6 @@ +2008-10-15 Faik Uygur + * doman should also work on compressed man files. (#8426) + 2008-10-06 Faik Uygur * Raise exception when tried to run another instance of pisi. (#8145) From uludag-commits at pardus.org.tr Thu Oct 16 15:43:48 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 15:43:48 +0300 (EEST) Subject: [Uludag-commits] r20450 - trunk/repository-scripts Message-ID: <20081016124348.D87C9138416C@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 16 15:43:48 2008 New Revision: 20450 Added: trunk/repository-scripts/unmaintained.py Log: Add new script to notify packagers about their packages' status From uludag-commits at pardus.org.tr Thu Oct 16 15:54:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 15:54:06 +0300 (EEST) Subject: [Uludag-commits] r20451 - trunk/repository-scripts Message-ID: <20081016125406.B4C17138416D@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 16 15:54:06 2008 New Revision: 20451 Modified: trunk/repository-scripts/unmaintained.py Log: refine output Modified: trunk/repository-scripts/unmaintained.py ================================================================= --- trunk/repository-scripts/unmaintained.py (original) +++ trunk/repository-scripts/unmaintained.py Thu Oct 16 15:54:06 2008 @@ -121,7 +121,7 @@ authors[packager_mail] = [packager_name] authors[packager_mail].append([]) - authors[packager_mail][1].append(s) + authors[packager_mail][1].append(s.partition(devel_path)[-1]) result = open("templates", "wb") From uludag-commits at pardus.org.tr Thu Oct 16 16:00:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 16:00:00 +0300 (EEST) Subject: [Uludag-commits] r20452 - trunk/repository-scripts Message-ID: <20081016130000.262D7138416D@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 16 15:59:59 2008 New Revision: 20452 Modified: trunk/repository-scripts/unmaintained.py Log: fix mail_template Modified: trunk/repository-scripts/unmaintained.py ================================================================= --- trunk/repository-scripts/unmaintained.py (original) +++ trunk/repository-scripts/unmaintained.py Thu Oct 16 15:59:59 2008 @@ -14,12 +14,12 @@ smtp_server = "SMTP SERVER" mail_from = "EMAIL ADDRESS" mail_from_name = "YOUR NAME" -devel_path = "ENTER THE FULL PATH TO THE REPOSITORY" +devel_path = "FULL PATH TO REPOSITORY" # Mail template mail_template = """ -From: %(mail_from_name)s <%(mail_from)> +From: %(mail_from_name)s <%(mail_from)s> To: %(mail_to)s Subject: [Pardus] About your packages/Paketleriniz hakkında Content-Type: text/plain; @@ -53,7 +53,7 @@ ---------------------------------------- Packager name: %(packager_name)s -Packager e-mail:%(mail_to)s +Packager e-mail: %(mail_to)s Number of total packages: %(total_packages)d ---------------------------------------- From uludag-commits at pardus.org.tr Thu Oct 16 16:22:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 16:22:42 +0300 (EEST) Subject: [Uludag-commits] r20453 - trunk/repository-scripts Message-ID: <20081016132242.5B1A8138416C@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 16 16:22:41 2008 New Revision: 20453 Modified: trunk/repository-scripts/unmaintained.py Log: It's ready. Modified: trunk/repository-scripts/unmaintained.py ================================================================= --- trunk/repository-scripts/unmaintained.py (original) +++ trunk/repository-scripts/unmaintained.py Thu Oct 16 16:22:41 2008 @@ -4,21 +4,26 @@ import os import socket import smtplib +import getpass +import sys from pisi.specfile import SpecFile # Do the proper adjustments here before using the script. smtp_user = "USERNAME" -smtp_password = "PASSWORD" -smtp_server = "SMTP SERVER" -mail_from = "EMAIL ADDRESS" + +# If set to prompt, the password will be prompted upon execution +smtp_password = "prompt" + +smtp_server = "SMTPSERVER" +mail_from = "MAILFROM" mail_from_name = "YOUR NAME" -devel_path = "FULL PATH TO REPOSITORY" +devel_path = "PATH TO REPOSITORY" # Mail template -mail_template = """ +mail_template = """\ From: %(mail_from_name)s <%(mail_from)s> To: %(mail_to)s Subject: [Pardus] About your packages/Paketleriniz hakkında @@ -31,7 +36,7 @@ As we are trying to determine unmaintained packages, please reply to this automatic email 'only' with a list of your packages that you will not maintain anymore. -Note that, if you don't reply to this email until 01 November 2008, all of your packages +Note that, if you don't reply to this email until 1 November 2008, all of your packages will be automatically marked as 'unmaintained'. Best Regards, @@ -51,11 +56,13 @@ Saygılar, %(mail_from_name)s <%(mail_from)s> ----------------------------------------- + +---------------------------------------------- Packager name: %(packager_name)s Packager e-mail: %(mail_to)s Number of total packages: %(total_packages)d ----------------------------------------- + + %(packages)s """ @@ -85,13 +92,17 @@ for recipient, mail in messages.items(): try: - result = session.sendmail(mail_from, "ozan at pardus.org.tr", mail) + print "Sending e-mail to %s.." % recipient + result = session.sendmail(mail_from, recipient, mail) + except KeyboardInterrupt: + print "Caught CTRL+C, Quiting.." + sys.exit(1) except: print "Problem occured when sending e-mail to %s" % recipient session.quit() - print "Failed sending e-mails to following recipients:\n" + print "\nFailed sending e-mails to following recipients:\n" print "\n".join(result.keys()) def get_specs(path): @@ -107,6 +118,9 @@ if __name__ == "__main__": + if smtp_password == "prompt": + smtp_password = getpass.getpass("Enter your SMTP password: ") + # Get pspec's found in devel_path specs = get_specs(devel_path) @@ -123,8 +137,6 @@ authors[packager_mail][1].append(s.partition(devel_path)[-1]) - result = open("templates", "wb") - for k,v in authors.items(): # Key is email # Value is a list, e.g. ['name', [p1,p2,p3..pn]] @@ -138,7 +150,5 @@ templates[k] = mail_template % template_values - result.write(templates[k]) - result.write("\n\n") - #send_mails(templates) + send_mails(templates) From uludag-commits at pardus.org.tr Thu Oct 16 16:57:22 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 16 Oct 2008 16:57:22 +0300 (EEST) Subject: [Uludag-commits] r20454 - trunk/repository-scripts Message-ID: <20081016135722.CF080138416C@liste.pardus.org.tr> Author: ozan.caglayan Date: Thu Oct 16 16:57:22 2008 New Revision: 20454 Modified: trunk/repository-scripts/unmaintained.py Log: Add marking code Modified: trunk/repository-scripts/unmaintained.py ================================================================= --- trunk/repository-scripts/unmaintained.py (original) +++ trunk/repository-scripts/unmaintained.py Thu Oct 16 16:57:22 2008 @@ -70,7 +70,7 @@ def send_mails(messages): if not smtp_user or not smtp_password: - print "No SMTP authentication information found. Aborting.." + print "*** No SMTP authentication information found. Aborting.." return # Socket timeout @@ -79,30 +79,30 @@ try: session = smtplib.SMTP(smtp_server) except: - print "Failed opening session on SMTP server %s. Aborting.." + print "*** Failed opening session on SMTP server %s. Aborting.." return try: session.login(smtp_user, smtp_password) except smtplib.SMTPAuthenticationError: - print "Authentication failed. Check your credentials." + print "*** Authentication failed. Check your credentials." return result = None for recipient, mail in messages.items(): try: - print "Sending e-mail to %s.." % recipient + print "*** Sending e-mail to %s.." % recipient result = session.sendmail(mail_from, recipient, mail) except KeyboardInterrupt: - print "Caught CTRL+C, Quiting.." + print "*** Caught CTRL+C, Quiting.." sys.exit(1) except: - print "Problem occured when sending e-mail to %s" % recipient + print "*** Problem occured when sending e-mail to %s" % recipient session.quit() - print "\nFailed sending e-mails to following recipients:\n" + print "\n*** Failed sending e-mails to following recipients:\n" print "\n".join(result.keys()) def get_specs(path): @@ -116,8 +116,35 @@ return specs +def mark_packages(path, package_list): + packages = [line for line in open(package_list, "rb").read().split('\n') if line and not line.startswith('#')] + pattern = " \n .*\n .*\n \n" + + for p in packages: + pspec = os.path.join(path, p) + '/pspec.xml' + if os.path.exists(pspec): + pspec_xml = open(pspec, "rb").read() + open(pspec, "wb").write(re.sub(pattern, pattern.replace('.*', 'Pardus', 1).replace('.*', 'admins at pardus.org.tr', 1), pspec_xml)) + + print "*** Packages to be marked:\n" + print "\n".join(packages) + + if __name__ == "__main__": + # Mark the packages as unmaintained in SVN + + if "--mark" in sys.argv[1:]: + # Give the file containing the package list + unmaintained_packages = sys.argv[2] + + mark_packages(devel_path, unmaintained_packages) + print "\n*** Marking process is finished." + sys.exit(1) + + + # Just e-mail the contributors about their packages + if smtp_password == "prompt": smtp_password = getpass.getpass("Enter your SMTP password: ") From uludag-commits at pardus.org.tr Fri Oct 17 13:48:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 17 Oct 2008 13:48:58 +0300 (EEST) Subject: [Uludag-commits] r20455 - trunk/repository-scripts Message-ID: <20081017104858.C6E1D1384091@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 17 13:48:57 2008 New Revision: 20455 Modified: trunk/repository-scripts/unmaintained.py Log: Done. It can now mark pspecs as unmaintained. Modified: trunk/repository-scripts/unmaintained.py ================================================================= --- trunk/repository-scripts/unmaintained.py (original) +++ trunk/repository-scripts/unmaintained.py Fri Oct 17 13:48:57 2008 @@ -4,8 +4,8 @@ import os import socket import smtplib -import getpass import sys +import re from pisi.specfile import SpecFile @@ -118,16 +118,16 @@ def mark_packages(path, package_list): packages = [line for line in open(package_list, "rb").read().split('\n') if line and not line.startswith('#')] - pattern = " \n .*\n .*\n \n" for p in packages: + print "Marking %s" % p pspec = os.path.join(path, p) + '/pspec.xml' if os.path.exists(pspec): - pspec_xml = open(pspec, "rb").read() - open(pspec, "wb").write(re.sub(pattern, pattern.replace('.*', 'Pardus', 1).replace('.*', 'admins at pardus.org.tr', 1), pspec_xml)) - - print "*** Packages to be marked:\n" - print "\n".join(packages) + lines = open(pspec, "rb").readlines() + i = [l.strip() for l in lines].index('') + 1 + lines[i] = re.sub(".*", "Pardus", lines[i]) + lines[i+1] = re.sub(".*", "admins at pardus.org.tr", lines[i+1]) + open(pspec, "wb").writelines(lines) if __name__ == "__main__": @@ -146,7 +146,8 @@ # Just e-mail the contributors about their packages if smtp_password == "prompt": - smtp_password = getpass.getpass("Enter your SMTP password: ") + from getpass import getpass + smtp_password = getpass("Enter your SMTP password: ") # Get pspec's found in devel_path specs = get_specs(devel_path) From uludag-commits at pardus.org.tr Mon Oct 20 03:38:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 20 Oct 2008 03:38:05 +0300 (EEST) Subject: [Uludag-commits] r20456 - in trunk/yali4/yali4: . gui Message-ID: <20081020003805.D13FA13840A4@liste.pardus.org.tr> Author: gokmen.goksel Date: Mon Oct 20 03:38:04 2008 New Revision: 20456 Modified: trunk/yali4/yali4/gui/runner.py trunk/yali4/yali4/installer.py trunk/yali4/yali4/postinstall.py trunk/yali4/yali4/sysutils.py Log: * YALI Plug-in support in basic. Modified: trunk/yali4/yali4/gui/runner.py ================================================================= --- trunk/yali4/yali4/gui/runner.py (original) +++ trunk/yali4/yali4/gui/runner.py Mon Oct 20 03:38:04 2008 @@ -35,7 +35,8 @@ YALI_INSTALL, \ YALI_FIRSTBOOT, \ YALI_OEMINSTALL, \ - YALI_PARTITIONER = range(4) + YALI_PLUGIN, \ + YALI_PARTITIONER = range(5) ## # Runner creates main GUI components for installation... @@ -63,6 +64,10 @@ if yali4.sysutils.checkYaliParams(param=ctx.consts.oemInstallParam): install_type = YALI_OEMINSTALL + install_plugin = yali4.sysutils.checkPlugin() + if install_plugin: + install_type = YALI_PLUGIN + # Creating the installer ctx.yali = yali4.installer.Yali(install_type) Modified: trunk/yali4/yali4/installer.py ================================================================= --- trunk/yali4/yali4/installer.py (original) +++ trunk/yali4/yali4/installer.py Mon Oct 20 03:38:04 2008 @@ -71,10 +71,11 @@ YALI_INSTALL, \ YALI_FIRSTBOOT, \ YALI_OEMINSTALL, \ - YALI_PARTITIONER = range(4) + YALI_PLUGIN, \ + YALI_PARTITIONER = range(5) class Yali: - def __init__(self, install_type=YALI_INSTALL): + def __init__(self, install_type=YALI_INSTALL, install_plugin=None): self._screens = {} @@ -124,6 +125,11 @@ # Let the show begin.. self.screens = self._screens[install_type] + + # TODO + if install_type == YALI_PLUGIN: + self.screens = getScreensFromPlugin(install_plugin) + self.install_type = install_type self.info = InformationWindow(_("YALI Is Working...")) # self.yimirta = Yimirta(self.info) @@ -460,129 +466,17 @@ # ctx.debugger.log(yali.toPrettyString()) def processPendingActions(self, rootWidget): - global bus - bus = None - def connectToDBus(): - global bus - for i in range(20): - try: - ctx.debugger.log("trying to start dbus..") - bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % ctx.consts.dbus_socket_file) - break - except dbus.DBusException: - time.sleep(1) - ctx.debugger.log("wait dbus for 1 second...") - if bus: - return True - return False - - def setHostName(): - global bus - obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - obj.setHostName(str(ctx.installData.hostName), dbus_interface="tr.org.pardus.comar.Net.Stack") - ctx.debugger.log("Hostname set as %s" % ctx.installData.hostName) - return True - - def addUsers(): - global bus - obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - for u in yali4.users.pending_users: - ctx.debugger.log("User %s adding to system" % u.username) - uid = obj.addUser(-1, u.username, u.realname, "", "", unicode(u.passwd), u.groups, [], [], dbus_interface="tr.org.pardus.comar.User.Manager") - ctx.debugger.log("New user's id is %s" % uid) - - # Use random user icon from YALI Archive - iconPath = os.path.join(ctx.consts.target_dir,"home/%s/.face.icon" % u.username) - shutil.copy(u.icon, iconPath) - os.chmod(iconPath, 0644) - os.chown(iconPath, uid, 100) - - # Chown for old users.. - user_home_dir = os.path.join(consts.target_dir, 'home', u.username) - self.info.updateAndShow(_("User %s's home directory is being prepared..") % u.username) - os.system('chown -R %d:%d %s ' % (uid, 100, user_home_dir)) - os.chmod(user_home_dir, 0711) - self.info.hide() - - # Enable auto-login - if u.username == ctx.installData.autoLoginUser: - u.setAutoLogin() - return True - - def setRootPassword(): - if not ctx.installData.useYaliFirstBoot: - global bus - obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") - obj.setUser(0, "", "", "", str(ctx.installData.rootPassword), "", dbus_interface="tr.org.pardus.comar.User.Manager") - return True - - def writeConsoleData(): - yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) - ctx.debugger.log("Keymap stored.") - return True - - def migrateXorgConf(): - if not self.install_type == YALI_FIRSTBOOT: - yali4.postinstall.migrate_xorg() - ctx.debugger.log("xorg.conf and other files merged.") - return True - - def copyPisiIndex(): - target = os.path.join(ctx.consts.target_dir, "var/lib/pisi/index/%s" % ctx.consts.pardus_repo_name) - - if os.path.exists(ctx.consts.pisiIndexFile): - # Copy package index - shutil.copy(ctx.consts.pisiIndexFile, target) - shutil.copy(ctx.consts.pisiIndexFileSum, target) - - # Extract the index - import bz2 - pureIndex = file(os.path.join(target,"pisi-index.xml"),"w") - pureIndex.write(bz2.decompress(open(ctx.consts.pisiIndexFile).read())) - pureIndex.close() - - ctx.debugger.log("pisi index files copied.") - else: - ctx.debugger.log("pisi index file not found!") - return True - - def setPackages(): - global bus - if self.install_type == YALI_OEMINSTALL: - ctx.debugger.log("OemInstall selected.") - try: - obj = bus.get_object("tr.org.pardus.comar", "/package/yali4") - obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") - file("%s/etc/yali-is-firstboot" % ctx.consts.target_dir, "w") - obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") - obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") - except: - ctx.debugger.log("Dbus error: package doesnt exist !") - return False - elif self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: - try: - obj = bus.get_object("tr.org.pardus.comar", "/package/yali4") - obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") - obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") - obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") - os.unlink("%s/etc/yali-is-firstboot" % ctx.consts.target_dir) - os.system("pisi rm yali4") - except: - ctx.debugger.log("Dbus error: package doesnt exist !") - return False - return True - - rootWidget.steps.setOperations([{"text":_("Trying to connect DBUS..."),"operation":connectToDBus}]) + rootWidget.steps.setOperations([{"text":_("Trying to connect DBUS..."),"operation":yali4.postinstall.connectToDBus}]) - steps = [{"text":_("Setting Hostname..."),"operation":setHostName}, + steps = [{"text":_("Setting Hostname..."),"operation":yali4.postinstall.setHostName}, {"text":_("Setting TimeZone..."),"operation":yali4.postinstall.setTimeZone}, - {"text":_("Setting Root Password..."),"operation":setRootPassword}, - {"text":_("Adding Users..."),"operation":addUsers}, - {"text":_("Writing Console Data..."),"operation":writeConsoleData}, - {"text":_("Migrating X.org Configuration..."),"operation":migrateXorgConf}] + {"text":_("Setting Root Password..."),"operation":yali4.postinstall.setRootPassword}, + {"text":_("Adding Users..."),"operation":yali4.postinstall.addUsers}, + {"text":_("Writing Console Data..."),"operation":yali4.postinstall.writeConsoleData}, + {"text":_("Migrating X.org Configuration..."),"operation":yali4.postinstall.migrateXorgConf}] - stepsBase = [{"text":_("Copy Pisi index..."),"operation":copyPisiIndex}, - {"text":_("Setting misc. package configurations..."),"operation":setPackages}, + stepsBase = [{"text":_("Copy Pisi index..."),"operation":yali4.postinstall.copyPisiIndex}, + {"text":_("Setting misc. package configurations..."),"operation":yali4.postinstall.setPackages}, {"text":_("Installing BootLoader..."),"operation":self.installBootloader}] if self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: Modified: trunk/yali4/yali4/postinstall.py ================================================================= --- trunk/yali4/yali4/postinstall.py (original) +++ trunk/yali4/yali4/postinstall.py Mon Oct 20 03:38:04 2008 @@ -11,11 +11,24 @@ # import os -import shutil import grp +import time +import dbus +import yali4 +import shutil + +import gettext +__trans = gettext.translation('yali4', fallback=True) +_ = __trans.ugettext -from yali4.constants import consts import yali4.gui.context as ctx +from yali4.constants import consts + +YALI_INSTALL, \ + YALI_FIRSTBOOT, \ + YALI_OEMINSTALL, \ + YALI_PLUGIN, \ + YALI_PARTITIONER = range(5) def cp(s, d): src = os.path.join(consts.target_dir, s) @@ -82,3 +95,117 @@ ctx.debugger.log("Copying from '%s' to '%s'" % (conf, joy(conf))) shutil.copyfile(conf, joy(conf)) +global bus +bus = None + +def connectToDBus(): + global bus + for i in range(20): + try: + ctx.debugger.log("trying to start dbus..") + bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % ctx.consts.dbus_socket_file) + break + except dbus.DBusException: + time.sleep(1) + ctx.debugger.log("wait dbus for 1 second...") + if bus: + return True + return False + +def setHostName(): + global bus + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + obj.setHostName(str(ctx.installData.hostName), dbus_interface="tr.org.pardus.comar.Net.Stack") + ctx.debugger.log("Hostname set as %s" % ctx.installData.hostName) + return True + +def addUsers(): + global bus + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + for u in yali4.users.pending_users: + ctx.debugger.log("User %s adding to system" % u.username) + uid = obj.addUser(-1, u.username, u.realname, "", "", unicode(u.passwd), u.groups, [], [], dbus_interface="tr.org.pardus.comar.User.Manager") + ctx.debugger.log("New user's id is %s" % uid) + + # Use random user icon from YALI Archive + iconPath = os.path.join(ctx.consts.target_dir,"home/%s/.face.icon" % u.username) + shutil.copy(u.icon, iconPath) + os.chmod(iconPath, 0644) + os.chown(iconPath, uid, 100) + + # Chown for old users.. + user_home_dir = os.path.join(consts.target_dir, 'home', u.username) + ctx.yali.info.updateAndShow(_("User %s's home directory is being prepared..") % u.username) + os.system('chown -R %d:%d %s ' % (uid, 100, user_home_dir)) + os.chmod(user_home_dir, 0711) + ctx.yali.info.hide() + + # Enable auto-login + if u.username == ctx.installData.autoLoginUser: + u.setAutoLogin() + return True + +def setRootPassword(): + if not ctx.installData.useYaliFirstBoot: + global bus + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + obj.setUser(0, "", "", "", str(ctx.installData.rootPassword), "", dbus_interface="tr.org.pardus.comar.User.Manager") + return True + +def writeConsoleData(): + yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) + ctx.debugger.log("Keymap stored.") + return True + +def migrateXorgConf(): + if not ctx.yali.install_type == YALI_FIRSTBOOT: + yali4.postinstall.migrate_xorg() + ctx.debugger.log("xorg.conf and other files merged.") + return True + +def copyPisiIndex(): + target = os.path.join(ctx.consts.target_dir, "var/lib/pisi/index/%s" % ctx.consts.pardus_repo_name) + + if os.path.exists(ctx.consts.pisiIndexFile): + # Copy package index + shutil.copy(ctx.consts.pisiIndexFile, target) + shutil.copy(ctx.consts.pisiIndexFileSum, target) + + # Extract the index + import bz2 + pureIndex = file(os.path.join(target,"pisi-index.xml"),"w") + pureIndex.write(bz2.decompress(open(ctx.consts.pisiIndexFile).read())) + pureIndex.close() + + ctx.debugger.log("pisi index files copied.") + else: + ctx.debugger.log("pisi index file not found!") + return True + +def setPackages(): + global bus + if ctx.yali.install_type == YALI_OEMINSTALL: + ctx.debugger.log("OemInstall selected.") + try: + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + file("%s/etc/yali-is-firstboot" % ctx.consts.target_dir, "w") + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + except: + ctx.debugger.log("Dbus error: package doesnt exist !") + return False + elif ctx.yali.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: + try: + obj = bus.get_object("tr.org.pardus.comar", "/package/yali4") + obj.setState("off", dbus_interface="tr.org.pardus.comar.System.Service") + obj = bus.get_object("tr.org.pardus.comar", "/package/kdebase") + obj.setState("on", dbus_interface="tr.org.pardus.comar.System.Service") + os.unlink("%s/etc/yali-is-firstboot" % ctx.consts.target_dir) + os.system("pisi rm yali4") + except: + ctx.debugger.log("Dbus error: package doesnt exist !") + return False + return True + + Modified: trunk/yali4/yali4/sysutils.py ================================================================= --- trunk/yali4/yali4/sysutils.py (original) +++ trunk/yali4/yali4/sysutils.py Mon Oct 20 03:38:04 2008 @@ -39,12 +39,20 @@ os.system("chroot %s /bin/service dbus start" % consts.target_dir) def checkYaliParams(param): - for i in [x for x in open("/proc/cmdline", "r").read().split()]: + for i in [x for x in open("/proc/cmdline", "r").read().split(' ')]: if i.startswith("yali4="): if param in i.split("=")[1].split(","): return True return False +def checkPlugin(): + for i in [x for x in open("/proc/cmdline", "r").read().split(' ')]: + if i.startswith("yali4=") and not i.find("plugin:") == -1: + for param in i.split("=")[1].split(","): + if param.startswith("plugin:"): + return param.split(':')[1] + return False + def swap_as_file(filepath, mb_size): dd, mkswap = find_executable('dd'), find_executable('mkswap') From uludag-commits at pardus.org.tr Tue Oct 21 02:12:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 21 Oct 2008 02:12:52 +0300 (EEST) Subject: [Uludag-commits] r20458 - in trunk/yali4: . yali4 yali4/gui Message-ID: <20081020231252.51DFC13840B0@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue Oct 21 02:12:52 2008 New Revision: 20458 Modified: trunk/yali4/setup.py trunk/yali4/yali4/gui/runner.py trunk/yali4/yali4/installer.py trunk/yali4/yali4/options.py trunk/yali4/yali4/sysutils.py Log: * plugin stuff.. Modified: trunk/yali4/setup.py ================================================================= --- trunk/yali4/setup.py (original) +++ trunk/yali4/setup.py Tue Oct 21 02:12:52 2008 @@ -67,7 +67,7 @@ class YaliBuild(build): def add_gettext_support(self, ui_file): - # hacky, too hacky. but works... + # hacky, too hacky. but it works... py_file = py_file_name(ui_file) # lines in reverse order lines = ["\n_ = __trans.ugettext\n", Modified: trunk/yali4/yali4/gui/runner.py ================================================================= --- trunk/yali4/yali4/gui/runner.py (original) +++ trunk/yali4/yali4/gui/runner.py Tue Oct 21 02:12:52 2008 @@ -64,12 +64,12 @@ if yali4.sysutils.checkYaliParams(param=ctx.consts.oemInstallParam): install_type = YALI_OEMINSTALL - install_plugin = yali4.sysutils.checkPlugin() + install_plugin = yali4.sysutils.checkPlugin() or ctx.options.plugin or None if install_plugin: install_type = YALI_PLUGIN # Creating the installer - ctx.yali = yali4.installer.Yali(install_type) + ctx.yali = yali4.installer.Yali(install_type, install_plugin) # yimirtaShortCut = QtGui.QShortcut(QtGui.QKeySequence(Qt.SHIFT + Qt.Key_F5),self._window.ui) # QObject.connect(yimirtaShortCut, SIGNAL("activated()"), ctx.yali.toggleYimirta) Modified: trunk/yali4/yali4/installer.py ================================================================= --- trunk/yali4/yali4/installer.py (original) +++ trunk/yali4/yali4/installer.py Tue Oct 21 02:12:52 2008 @@ -124,11 +124,10 @@ ] # Let the show begin.. - self.screens = self._screens[install_type] - - # TODO if install_type == YALI_PLUGIN: - self.screens = getScreensFromPlugin(install_plugin) + self.screens = self.getScreensFromPlugin(install_plugin) + else: + self.screens = self._screens[install_type] self.install_type = install_type self.info = InformationWindow(_("YALI Is Working...")) @@ -143,6 +142,14 @@ # else: # self.yimirta.start() + def getScreensFromPlugin(self, p): + try: + _p = __import__("yali4.plugins.%s.config" % p) + except ImportError: + raise YaliException, "No Plugin found named with %s " % p + plugin = getattr(_p.plugins,p) + return plugin.config.screens + def checkCD(self, rootWidget): ctx.mainScreen.disableNext() ctx.mainScreen.disableBack() Modified: trunk/yali4/yali4/options.py ================================================================= --- trunk/yali4/yali4/options.py (original) +++ trunk/yali4/yali4/options.py Tue Oct 21 02:12:52 2008 @@ -28,12 +28,14 @@ action="store_true", default="False", help="start with first boot options") parser.add_option("-k", "--kahyaFile", dest="kahyaFile", - help="Run with Kahya file", metavar="FILE") + help="run with Kahya file", metavar="FILE") parser.add_option("-K", "--useKahyaDefault", dest="useKahya", action="store_true", default="False", help="start kahya with default.xml") parser.add_option("-s", "--startFrom", dest="startupScreen", - help="Start from the given screen (num)", type="int", default=0) + help="start from the given screen (num)", type="int", default=0) + parser.add_option("-p", "--plugin", dest="plugin", + help="load given plugin", type="str", default=None) self.options, self.args = parser.parse_args() def __getattr__(self, name): Modified: trunk/yali4/yali4/sysutils.py ================================================================= --- trunk/yali4/yali4/sysutils.py (original) +++ trunk/yali4/yali4/sysutils.py Tue Oct 21 02:12:52 2008 @@ -39,7 +39,7 @@ os.system("chroot %s /bin/service dbus start" % consts.target_dir) def checkYaliParams(param): - for i in [x for x in open("/proc/cmdline", "r").read().split(' ')]: + for i in [x for x in open("/proc/cmdline", "r").read().split()]: if i.startswith("yali4="): if param in i.split("=")[1].split(","): return True @@ -51,7 +51,7 @@ for param in i.split("=")[1].split(","): if param.startswith("plugin:"): return param.split(':')[1] - return False + return None def swap_as_file(filepath, mb_size): dd, mkswap = find_executable('dd'), find_executable('mkswap') From uludag-commits at pardus.org.tr Tue Oct 21 12:11:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 21 Oct 2008 12:11:00 +0300 (EEST) Subject: [Uludag-commits] r20459 - in trunk/yali4/yali4: . gui Message-ID: <20081021091100.83C1E13840AF@liste.pardus.org.tr> Author: gokmen.goksel Date: Tue Oct 21 12:11:00 2008 New Revision: 20459 Modified: trunk/yali4/yali4/gui/context.py trunk/yali4/yali4/installer.py trunk/yali4/yali4/postinstall.py trunk/yali4/yali4/sysutils.py Log: * support for different steps.. Modified: trunk/yali4/yali4/gui/context.py ================================================================= --- trunk/yali4/yali4/gui/context.py (original) +++ trunk/yali4/yali4/gui/context.py Tue Oct 21 12:11:00 2008 @@ -44,3 +44,6 @@ # keydata keydata = None + +# Bus +bus = None Modified: trunk/yali4/yali4/installer.py ================================================================= --- trunk/yali4/yali4/installer.py (original) +++ trunk/yali4/yali4/installer.py Tue Oct 21 12:11:00 2008 @@ -125,30 +125,25 @@ # Let the show begin.. if install_type == YALI_PLUGIN: - self.screens = self.getScreensFromPlugin(install_plugin) + self.plugin = self.getPlugin(install_plugin) + self.screens = self.plugin.config.screens + # run plugins setup + self.plugin.config.setup() else: self.screens = self._screens[install_type] self.install_type = install_type self.info = InformationWindow(_("YALI Is Working...")) - # self.yimirta = Yimirta(self.info) - # self.yimirta.stop() self.info.hide() self.checkCDStop = True - # def toggleYimirta(self): - # if self.yimirta.isVisible(): - # self.yimirta.stop() - # else: - # self.yimirta.start() - - def getScreensFromPlugin(self, p): + def getPlugin(self, p): try: _p = __import__("yali4.plugins.%s.config" % p) except ImportError: raise YaliException, "No Plugin found named with %s " % p plugin = getattr(_p.plugins,p) - return plugin.config.screens + return plugin def checkCD(self, rootWidget): ctx.mainScreen.disableNext() @@ -488,6 +483,8 @@ if self.install_type in [YALI_INSTALL, YALI_FIRSTBOOT]: rootWidget.steps.setOperations(steps) + elif self.install_type == YALI_PLUGIN: + rootWidget.steps.setOperations(self.plugin.config.steps) rootWidget.steps.setOperations(stepsBase) Modified: trunk/yali4/yali4/postinstall.py ================================================================= --- trunk/yali4/yali4/postinstall.py (original) +++ trunk/yali4/yali4/postinstall.py Tue Oct 21 12:11:00 2008 @@ -103,7 +103,7 @@ for i in range(20): try: ctx.debugger.log("trying to start dbus..") - bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % ctx.consts.dbus_socket_file) + ctx.bus = bus = dbus.bus.BusConnection(address_or_type="unix:path=%s" % ctx.consts.dbus_socket_file) break except dbus.DBusException: time.sleep(1) Modified: trunk/yali4/yali4/sysutils.py ================================================================= --- trunk/yali4/yali4/sysutils.py (original) +++ trunk/yali4/yali4/sysutils.py Tue Oct 21 12:11:00 2008 @@ -50,7 +50,7 @@ if i.startswith("yali4=") and not i.find("plugin:") == -1: for param in i.split("=")[1].split(","): if param.startswith("plugin:"): - return param.split(':')[1] + return str(param.split(':')[1]).strip() return None def swap_as_file(filepath, mb_size): From uludag-commits at pardus.org.tr Tue Oct 21 14:02:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 21 Oct 2008 14:02:14 +0300 (EEST) Subject: [Uludag-commits] r20462 - trunk/tasma/tasma/modules/tasmatv Message-ID: <20081021110214.73BAF1384108@liste.pardus.org.tr> Author: onur Date: Tue Oct 21 14:02:14 2008 New Revision: 20462 Modified: trunk/tasma/tasma/modules/tasmatv/tvconfig.cpp Log: modules settings are now in modprobe.d Modified: trunk/tasma/tasma/modules/tasmatv/tvconfig.cpp ================================================================= --- trunk/tasma/tasma/modules/tasmatv/tvconfig.cpp (original) +++ trunk/tasma/tasma/modules/tasmatv/tvconfig.cpp Tue Oct 21 14:02:14 2008 @@ -124,7 +124,7 @@ int card, tuner, pll, radio = 0; KConfig *config = new KConfig("kcmtasmatvrc"); - QFile bttv("/etc/modules.d/bttv"); + QFile bttv("/etc/modprobe.d/bttv"); card = getCard(); tuner = getTuner(); From uludag-commits at pardus.org.tr Wed Oct 22 10:33:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 22 Oct 2008 10:33:11 +0300 (EEST) Subject: [Uludag-commits] r20463 - trunk/yali4/yali4/plugins Message-ID: <20081022073311.8FAC713840F0@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed Oct 22 10:33:11 2008 New Revision: 20463 Added: trunk/yali4/yali4/plugins/ trunk/yali4/yali4/plugins/__init__.py Log: plugins directory .. From uludag-commits at pardus.org.tr Wed Oct 22 10:42:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 22 Oct 2008 10:42:23 +0300 (EEST) Subject: [Uludag-commits] r20464 - trunk/yali4 Message-ID: <20081022074223.2A04313840BE@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed Oct 22 10:42:22 2008 New Revision: 20464 Modified: trunk/yali4/setup.py Log: * install plugins default .. Modified: trunk/yali4/setup.py ================================================================= --- trunk/yali4/setup.py (original) +++ trunk/yali4/setup.py Wed Oct 22 10:42:22 2008 @@ -146,6 +146,7 @@ if os.path.exists(data_dir): print "removing: ", data_dir shutil.rmtree(data_dir) + os.unlink("/usr/bin/yali4-bin") i18n_domain = "yali4" i18n_languages = ["tr", @@ -182,7 +183,7 @@ author="Pardus Developers", author_email="yali at pardus.org.tr", url="http://www.pardus.org.tr/eng/yali/", - packages = ['yali4', 'yali4.gui', 'yali4.gui.Ui'], + packages = ['yali4', 'yali4.gui', 'yali4.gui.Ui', 'yali4.plugins'], package_dir = {'': ''}, data_files = [('/usr/share/yali4/slideshow', gui_slidepics()), ('/usr/share/yali4/user_faces', user_faces()), From uludag-commits at pardus.org.tr Wed Oct 22 16:07:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 22 Oct 2008 16:07:34 +0300 (EEST) Subject: [Uludag-commits] r20465 - trunk/yali4 Message-ID: <20081022130734.72E4D1384129@liste.pardus.org.tr> Author: gokmen.goksel Date: Wed Oct 22 16:07:34 2008 New Revision: 20465 Modified: trunk/yali4/setup.py Log: * clean these .. Modified: trunk/yali4/setup.py ================================================================= --- trunk/yali4/setup.py (original) +++ trunk/yali4/setup.py Wed Oct 22 16:07:34 2008 @@ -125,6 +125,11 @@ if os.path.exists(f): os.unlink(f) + if os.path.exists("yali4/data_rc.py"): + os.unlink("yali4/data_rc.py") + if os.path.exists("build"): + shutil.rmtree("build") + ## # uninstall command class YaliUninstall(Command): From uludag-commits at pardus.org.tr Thu Oct 23 01:05:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 01:05:02 +0300 (EEST) Subject: [Uludag-commits] r20469 - in trunk/yali4/yali4: . gui Message-ID: <20081022220502.5D860138405A@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 01:05:01 2008 New Revision: 20469 Modified: trunk/yali4/yali4/gui/ScrGoodbye.py trunk/yali4/yali4/gui/ScrSummary.py trunk/yali4/yali4/gui/installdata.py trunk/yali4/yali4/installer.py trunk/yali4/yali4/postinstall.py Log: * Also support for summary from plugins .. Modified: trunk/yali4/yali4/gui/ScrGoodbye.py ================================================================= --- trunk/yali4/yali4/gui/ScrGoodbye.py (original) +++ trunk/yali4/yali4/gui/ScrGoodbye.py Thu Oct 23 01:05:01 2008 @@ -36,8 +36,7 @@ from yali4.gui.YaliSteps import YaliSteps from yali4.gui.Ui.goodbyewidget import Ui_GoodByeWidget import yali4.gui.context as ctx - -YALI_INSTALL, YALI_FIRSTBOOT, YALI_OEMINSTALL, YALI_PARTITIONER = range(4) +from yali4.gui.installdata import * ## # Goodbye screen Modified: trunk/yali4/yali4/gui/ScrSummary.py ================================================================= --- trunk/yali4/yali4/gui/ScrSummary.py (original) +++ trunk/yali4/yali4/gui/ScrSummary.py Thu Oct 23 01:05:01 2008 @@ -104,6 +104,17 @@ content.append("""

    """) + # Plugin Summary + if ctx.yali.install_type == YALI_PLUGIN: + try: + _summary = ctx.yali.plugin.config.getSummary() + content.append(subject % _summary["subject"]) + for _item in _summary["items"]: + content.append(item % _item) + content.append(end) + except: + pass + # Keyboard Layout if ctx.installData.keyData: content.append(subject % _("Keyboard Settings")) Modified: trunk/yali4/yali4/gui/installdata.py ================================================================= --- trunk/yali4/yali4/gui/installdata.py (original) +++ trunk/yali4/yali4/gui/installdata.py Thu Oct 23 01:05:01 2008 @@ -19,6 +19,12 @@ B_INSTALL_MBR = 2 B_INSTALL_SMART= 3 +YALI_INSTALL, \ + YALI_FIRSTBOOT, \ + YALI_OEMINSTALL, \ + YALI_PLUGIN, \ + YALI_PARTITIONER = range(5) + class InstallData: keyData = None rootPassword = None Modified: trunk/yali4/yali4/installer.py ================================================================= --- trunk/yali4/yali4/installer.py (original) +++ trunk/yali4/yali4/installer.py Thu Oct 23 01:05:01 2008 @@ -68,11 +68,6 @@ import yali4.gui.ScrGoodbye PARTITION_ERASE_ALL, PARTITION_USE_AVAIL, PARTITION_USE_OLD = range(3) -YALI_INSTALL, \ - YALI_FIRSTBOOT, \ - YALI_OEMINSTALL, \ - YALI_PLUGIN, \ - YALI_PARTITIONER = range(5) class Yali: def __init__(self, install_type=YALI_INSTALL, install_plugin=None): Modified: trunk/yali4/yali4/postinstall.py ================================================================= --- trunk/yali4/yali4/postinstall.py (original) +++ trunk/yali4/yali4/postinstall.py Thu Oct 23 01:05:01 2008 @@ -23,12 +23,7 @@ import yali4.gui.context as ctx from yali4.constants import consts - -YALI_INSTALL, \ - YALI_FIRSTBOOT, \ - YALI_OEMINSTALL, \ - YALI_PLUGIN, \ - YALI_PARTITIONER = range(5) +from yali4.gui.installdata import * def cp(s, d): src = os.path.join(consts.target_dir, s) From uludag-commits at pardus.org.tr Thu Oct 23 13:25:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 13:25:54 +0300 (EEST) Subject: [Uludag-commits] r20470 - trunk/yali4/yali4 Message-ID: <20081023102554.78C0E13840AA@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 13:25:54 2008 New Revision: 20470 Modified: trunk/yali4/yali4/installer.py Log: * use readable warning message when plugin not installed. Modified: trunk/yali4/yali4/installer.py ================================================================= --- trunk/yali4/yali4/installer.py (original) +++ trunk/yali4/yali4/installer.py Thu Oct 23 13:25:54 2008 @@ -118,13 +118,20 @@ yali4.gui.ScrPartitionManual # Manual Partitioning ] + self.plugin = None + # Let the show begin.. if install_type == YALI_PLUGIN: self.plugin = self.getPlugin(install_plugin) - self.screens = self.plugin.config.screens - # run plugins setup - self.plugin.config.setup() - else: + if self.plugin: + self.screens = self.plugin.config.screens + # run plugins setup + self.plugin.config.setup() + else: + install_type = YALI_INSTALL + self.showFail(_("Plugin (%s) not found or error occured while loading switching to normal installation process." % install_plugin)) + + if not self.plugin: self.screens = self._screens[install_type] self.install_type = install_type @@ -136,10 +143,13 @@ try: _p = __import__("yali4.plugins.%s.config" % p) except ImportError: - raise YaliException, "No Plugin found named with %s " % p + return False plugin = getattr(_p.plugins,p) return plugin + def showFail(self, message): + QtGui.QMessageBox.warning(None, _("Warning !"), message, QtGui.QMessageBox.Ok) + def checkCD(self, rootWidget): ctx.mainScreen.disableNext() ctx.mainScreen.disableBack() From uludag-commits at pardus.org.tr Thu Oct 23 15:55:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 15:55:52 +0300 (EEST) Subject: [Uludag-commits] r20471 - trunk/yali4/yali4 Message-ID: <20081023125552.572A0138414F@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 15:55:52 2008 New Revision: 20471 Modified: trunk/yali4/yali4/postinstall.py Log: use str. . Modified: trunk/yali4/yali4/postinstall.py ================================================================= --- trunk/yali4/yali4/postinstall.py (original) +++ trunk/yali4/yali4/postinstall.py Thu Oct 23 15:55:52 2008 @@ -148,6 +148,9 @@ return True def writeConsoleData(): + keymap = ctx.installData.keyData["consolekeymap"] + if type(keymap) == list: + keymap = keymap[1] yali4.localeutils.write_keymap(ctx.installData.keyData["consolekeymap"]) ctx.debugger.log("Keymap stored.") return True From uludag-commits at pardus.org.tr Thu Oct 23 15:56:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 15:56:28 +0300 (EEST) Subject: [Uludag-commits] r20472 - trunk/yali4/yali4 Message-ID: <20081023125628.0F6BA138414F@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 15:56:27 2008 New Revision: 20472 Modified: trunk/yali4/yali4/__init__.py Log: * New version 2.0.5 Major change is plug-in support .. Modified: trunk/yali4/yali4/__init__.py ================================================================= --- trunk/yali4/yali4/__init__.py (original) +++ trunk/yali4/yali4/__init__.py Thu Oct 23 15:56:27 2008 @@ -10,7 +10,7 @@ # Please read the COPYING file. # -__version__ = "2.0.4" +__version__ = "2.0.5" import sys import exceptions From uludag-commits at pardus.org.tr Thu Oct 23 16:50:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 16:50:58 +0300 (EEST) Subject: [Uludag-commits] r20473 - trunk/pardusman/src Message-ID: <20081023135058.8509B1384148@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 16:50:58 2008 New Revision: 20473 Modified: trunk/pardusman/src/gui.py trunk/pardusman/src/maker.py trunk/pardusman/src/project.py Log: * YALI Plugin support for Pardusman Modified: trunk/pardusman/src/gui.py ================================================================= --- trunk/pardusman/src/gui.py (original) +++ trunk/pardusman/src/gui.py Thu Oct 23 16:50:58 2008 @@ -138,17 +138,30 @@ ) grid.addWidget(self.exparams, 4, 1) - lab = QLabel(_("Type:"), box) + lab = QLabel(_("Plugin package:"), box) grid.addWidget(lab, 5, 0, Qt.AlignRight) + hb2 = QHBox(box) + hb2.setSpacing(3) + self.plugin_package = QLineEdit(hb2) + QToolTip.add( + self.plugin_package, + _("YALI4 plugin package") + ) + but = QPushButton("...", hb2) + self.connect(but, SIGNAL("clicked()"), self.selectPlugin) + grid.addWidget(hb2, 5, 1) + + lab = QLabel(_("Type:"), box) + grid.addWidget(lab, 6, 0, Qt.AlignRight) self.project_type = QHButtonGroup(box) QRadioButton(_("Installation"), self.project_type) QRadioButton(_("Live system"), self.project_type) - grid.addWidget(self.project_type, 5, 1) + grid.addWidget(self.project_type, 6, 1) lab = QLabel(_("Media:"), box) - grid.addWidget(lab, 6, 0, Qt.AlignRight) + grid.addWidget(lab, 7, 0, Qt.AlignRight) self.project_media = QComboBox(False, box) - grid.addWidget(self.project_media, 6, 1) + grid.addWidget(self.project_media, 7, 1) self.media_types = [ ("cd", 700, _("CD (700 MB)"), "cdrom_unmount"), @@ -206,7 +219,16 @@ ) if not path.isNull(): self.release_files.setText(path) - + + def selectPlugin(self): + path = QFileDialog.getOpenFileName( + "*.pisi", + _("Select plugin package"), + self + ) + if not path.isNull(): + self.plugin_package.setText(path) + def selectWorkdir(self): path = QFileDialog.getExistingDirectory( self.work_dir.text(), @@ -264,7 +286,7 @@ ppath = sys.argv[0] if ppath[0] != '/': ppath = os.path.join(os.getcwd(), ppath) - cmd = 'konsole --workdir "%s" -e "%s" make "%s"' % (os.getcwd(), ppath, f.name) + cmd = 'konsole --noclose --workdir "%s" -e "%s" make "%s"' % (os.getcwd(), ppath, f.name) # Hacky KDE4 patch .. if os.popen("konsole --version").readlines()[0].find("Qt: 4") != -1: subprocess.Popen(["/usr/kde/4/lib/kde4/libexec/kdesu", "-d", "-u", "root", "-c", cmd]) @@ -290,6 +312,9 @@ self.project.exparams = tmp else: self.project.exparams = None + + self.project.plugin_package = unicode(self.plugin_package.text()) + tmp = unicode(self.work_dir.text()) if tmp: self.project.work_dir = tmp @@ -327,6 +352,7 @@ else: tmp = "" self.exparams.setText(tmp) + self.plugin_package.setText(unicode(self.project.plugin_package)) if self.project.work_dir: tmp = unicode(self.project.work_dir) else: Modified: trunk/pardusman/src/maker.py ================================================================= --- trunk/pardusman/src/maker.py (original) +++ trunk/pardusman/src/maker.py Thu Oct 23 16:50:58 2008 @@ -332,6 +332,9 @@ run('pisi --yes-all -D"%s" ar pardus-install %s' % (image_dir, repo_dir + "/pisi-index.xml.bz2")) if project.type == "install": run('pisi --yes-all --ignore-comar -D"%s" it yali4' % image_dir) + if project.plugin_package: + plugin_package = project.plugin_package + run('pisi --yes-all --ignore-comar -D"%s" it %s' % plugin_package) else: install_packages(project) Modified: trunk/pardusman/src/project.py ================================================================= --- trunk/pardusman/src/project.py (original) +++ trunk/pardusman/src/project.py Thu Oct 23 16:50:58 2008 @@ -111,6 +111,7 @@ self.selected_packages = [] self.all_packages = [] self.exparams = '' + self.plugin_package = '' def open(self, filename): try: @@ -132,6 +133,7 @@ self.work_dir = doc.getTagData("WorkDir") self.release_files = doc.getTagData("ReleaseFiles") self.exparams = doc.getTagData("ExtraParameters") + self.plugin_package = doc.getTagData("PluginPackage") paksel = doc.getTag("PackageSelection") if paksel: @@ -157,6 +159,8 @@ doc.insertTag("ReleaseFiles").insertData(self.release_files) if self.exparams: doc.insertTag("ExtraParameters").insertData(self.exparams) + if self.plugin_package: + doc.insertTag("PluginPackage").insertData(self.plugin_package) if self.repo_uri: paks = doc.insertTag("PackageSelection") paks.setAttribute("repo_uri", self.repo_uri) From uludag-commits at pardus.org.tr Thu Oct 23 16:53:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 23 Oct 2008 16:53:20 +0300 (EEST) Subject: [Uludag-commits] r20474 - trunk/pardusman/src Message-ID: <20081023135320.129321384148@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu Oct 23 16:53:19 2008 New Revision: 20474 Modified: trunk/pardusman/src/maker.py Log: typo .. Modified: trunk/pardusman/src/maker.py ================================================================= --- trunk/pardusman/src/maker.py (original) +++ trunk/pardusman/src/maker.py Thu Oct 23 16:53:19 2008 @@ -334,7 +334,7 @@ run('pisi --yes-all --ignore-comar -D"%s" it yali4' % image_dir) if project.plugin_package: plugin_package = project.plugin_package - run('pisi --yes-all --ignore-comar -D"%s" it %s' % plugin_package) + run('pisi --yes-all --ignore-comar -D"%s" it %s' % (image_dir, plugin_package)) else: install_packages(project) From uludag-commits at pardus.org.tr Fri Oct 24 13:24:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 24 Oct 2008 13:24:12 +0300 (EEST) Subject: [Uludag-commits] r20475 - trunk/tasma/package-manager Message-ID: <20081024102412.D65411384136@liste.pardus.org.tr> Author: gokcen.eraslan Date: Fri Oct 24 13:24:12 2008 New Revision: 20475 Added: trunk/tasma/package-manager/todo2 Log: bir takım todolar ekleyelim, bunları yapalım. herkes evinin önündeki todo'ları yapsa dünya tostoparlak olmaz mı? From uludag-commits at pardus.org.tr Fri Oct 24 14:29:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 24 Oct 2008 14:29:17 +0300 (EEST) Subject: [Uludag-commits] r20476 - trunk/pisi/pisi/cli Message-ID: <20081024112917.7DE3F138416E@liste.pardus.org.tr> Author: faik Date: Fri Oct 24 14:29:17 2008 New Revision: 20476 Modified: trunk/pisi/pisi/cli/searchfile.py Log: If a symbolic link file of a package is linked to a directory and is in your current working directory and you search that link file with sf, pisi sf returns wrong results... Actually this should have been returning "Kör müsün Gökçen burda işte!"... but here is another fix for that. :) Modified: trunk/pisi/pisi/cli/searchfile.py ================================================================= --- trunk/pisi/pisi/cli/searchfile.py (original) +++ trunk/pisi/pisi/cli/searchfile.py Fri Oct 24 14:29:17 2008 @@ -63,7 +63,4 @@ for path in self.args: if not ctx.config.options.quiet: ctx.ui.info(_('Searching for %s') % path) - import os.path - if os.path.exists(path): - path = os.path.realpath(path) self.search_file(path) From uludag-commits at pardus.org.tr Fri Oct 24 18:06:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 24 Oct 2008 18:06:50 +0300 (EEST) Subject: [Uludag-commits] r20477 - trunk/python-modules/catbox/tests Message-ID: <20081024150650.E320A138414A@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 24 18:06:50 2008 New Revision: 20477 Added: trunk/python-modules/catbox/tests/kernel-module.py Log: Add a new test case which tests whether kernel module compilation fails or not with the newly added LDFLAG --build-id From uludag-commits at pardus.org.tr Fri Oct 24 23:33:15 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 24 Oct 2008 23:33:15 +0300 (EEST) Subject: [Uludag-commits] r20478 - in trunk/python-modules/catbox: src tests Message-ID: <20081024203315.25677138414A@liste.pardus.org.tr> Author: gurer Date: Fri Oct 24 23:33:14 2008 New Revision: 20478 Modified: trunk/python-modules/catbox/src/syscall.c trunk/python-modules/catbox/tests/kernel-module.py Log: Fix kernel problem with gcc O_RDWR opening of the file. If there is no O_CREAT and there is no file, instead of a violation ENOENT error is returned Modified: trunk/python-modules/catbox/src/syscall.c ================================================================= --- trunk/python-modules/catbox/src/syscall.c (original) +++ trunk/python-modules/catbox/src/syscall.c Fri Oct 24 23:33:14 2008 @@ -96,6 +96,16 @@ mkdir_case = strcmp("mkdir", name) == 0; ret = path_writable(ctx->pathlist, canonical, mkdir_case); if (ret == 0) { + if (strcmp("open", name) == 0) { + // Special case for kernel build + unsigned int flags; + struct stat st; + flags = ptrace(PTRACE_PEEKUSER, pid, 4, 0); + if ((flags & O_CREAT) == 0 && stat(canonical, &st) == -1 && errno == ENOENT) { + free(canonical); + return ENOENT; + } + } catbox_retval_add_violation(ctx, name, path, canonical); err = -EACCES; } else if (ret == -1) { Modified: trunk/python-modules/catbox/tests/kernel-module.py ================================================================= --- trunk/python-modules/catbox/tests/kernel-module.py (original) +++ trunk/python-modules/catbox/tests/kernel-module.py Fri Oct 24 23:33:14 2008 @@ -13,7 +13,6 @@ def bad_open_syscall(): # Should bork because it creates the file if it doesn't exist f = os.open("/usr/src/linux/null.gcda", os.O_RDWR | os.O_CREAT) - f.close() ret = catbox.run(good_open_syscall, writable_paths=[os.getcwd()]) assert(ret.code == 0) From uludag-commits at pardus.org.tr Sat Oct 25 15:05:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 25 Oct 2008 15:05:33 +0300 (EEST) Subject: [Uludag-commits] r20479 - in trunk/pisi: . po Message-ID: <20081025120533.A0C2D13840AE@liste.pardus.org.tr> Author: ozan.caglayan Date: Sat Oct 25 15:05:33 2008 New Revision: 20479 Modified: trunk/pisi/ChangeLog trunk/pisi/po/de.po Log: - Correct word for "Package" is "Paket" (Fixes #8501) BUG:FIXED:8501 Modified: trunk/pisi/ChangeLog ================================================================= --- trunk/pisi/ChangeLog (original) +++ trunk/pisi/ChangeLog Sat Oct 25 15:05:33 2008 @@ -1,3 +1,6 @@ +2008-10-15 Ozan Çağlayan + * (po/de.po): Correct word for "Package" is "Paket" (Fixes #8501) + 2008-10-15 Faik Uygur * doman should also work on compressed man files. (#8426) Modified: trunk/pisi/po/de.po ================================================================= --- trunk/pisi/po/de.po (original) +++ trunk/pisi/po/de.po Sat Oct 25 15:05:33 2008 @@ -1805,7 +1805,7 @@ #: pisi/operations/remove.py:55 msgid "Package %s does not exist. Cannot remove." -msgstr "Packat %s existiert nicht. Kann nicht entfernt werden." +msgstr "Paket %s existiert nicht. Kann nicht entfernt werden." #: pisi/operations/remove.py:59 msgid "No packages to remove." From uludag-commits at pardus.org.tr Sun Oct 26 19:55:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 26 Oct 2008 19:55:25 +0200 (EET) Subject: [Uludag-commits] r20481 - trunk/pisi/pisi/actionsapi Message-ID: <20081026175525.BECA613840E3@liste.pardus.org.tr> Author: gokcen.eraslan Date: Sun Oct 26 19:55:25 2008 New Revision: 20481 Modified: trunk/pisi/pisi/actionsapi/cmaketools.py Log: Now, default build type for CMake is 'release'. Difference between the build type release and RelWithDebInfo (this is the build type when you do not specify any parameter about the build type): - There is no -g flag in build type 'release' - There are additional flags like -DNDEBUG and -DQT_NO_DEBUG If CMAKE_BUILD_TYPE is specified as a parameter to the configure method, since the last build type is accepted by CMake, it will be used as a build type. Modified: trunk/pisi/pisi/actionsapi/cmaketools.py ================================================================= --- trunk/pisi/pisi/actionsapi/cmaketools.py (original) +++ trunk/pisi/pisi/actionsapi/cmaketools.py Sun Oct 26 19:55:25 2008 @@ -59,7 +59,8 @@ args = 'cmake -DCMAKE_INSTALL_PREFIX=%s \ -DCMAKE_C_FLAGS="%s" \ -DCMAKE_CXX_FLAGS="%s" \ - -DCMAKE_LD_FLAGS="%s" %s %s' % (installPrefix, get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS(), parameters, sourceDir) + -DCMAKE_LD_FLAGS="%s" \ + -DCMAKE_BUILD_TYPE=release %s %s' % (installPrefix, get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS(), parameters, sourceDir) if system(args): raise ConfigureError(_('Configure failed.')) From uludag-commits at pardus.org.tr Mon Oct 27 00:35:57 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 00:35:57 +0200 (EET) Subject: [Uludag-commits] r20482 - in trunk/comar/api: . comar Message-ID: <20081026223557.B27E413840DC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon Oct 27 00:35:56 2008 New Revision: 20482 Added: trunk/comar/api/README Modified: trunk/comar/api/ChangeLog trunk/comar/api/comar/__init__.py trunk/comar/api/setup.py Log: New release. Good old friend, Link() is back. More info available at README file Modified: trunk/comar/api/ChangeLog ================================================================= --- trunk/comar/api/ChangeLog (original) +++ trunk/comar/api/ChangeLog Mon Oct 27 00:35:56 2008 @@ -1,3 +1,9 @@ +2008-10-27 Bahadır Kandemir + + * comar: New release. Good old friend, Link() is back. + More info available at README file. + + 2008-10-05 Bahadır Kandemir * setup.py: New release Modified: trunk/comar/api/comar/__init__.py ================================================================= --- trunk/comar/api/comar/__init__.py (original) +++ trunk/comar/api/comar/__init__.py Mon Oct 27 00:35:56 2008 @@ -9,4 +9,107 @@ # option) any later version. Please read the COPYING file. # -__version__ = '2.0_alpha1' +__version__ = '2.1.0' + +import dbus + +class Call: + def __init__(self, link, group, class_=None, package=None, method=None): + self.link = link + self.group = group + self.class_ = class_ + self.package = package + self.method = method + self.async = None + self.quiet = False + + def __getitem__(self, key): + if not self.class_: + raise KeyError, "Package should be selected after class" + if not isinstance(key, basestring): + raise KeyError + return Call(self.link, self.group, self.class_, key) + + def __getattr__(self, name): + if self.class_: + c = Call(self.link, self.group, self.class_, self.package, name) + return c.call + else: + if name[0] < 'A' or name[0] > 'Z': + raise AttributeError + + return Call(self.link, self.group, name) + + def __iter__(self): + if self.class_: + obj = self.link.bus.get_object(self.link.address, "/", introspect=False) + packages = obj.listModelApplications("%s.%s" % (self.group, self.class_), dbus_interface="tr.org.pardus.comar") + for package in packages: + yield unicode(package) + + def call(self, *args, **kwargs): + self.async = kwargs.get("async", None) + self.quiet = kwargs.get("quiet", False) + if self.async and self.quiet: + raise Exception, "async and quiet arguments can't be used together" + if self.async or self.quiet: + if self.package: + obj = self.link.bus.get_object(self.link.address, "/package/%s" % self.package, introspect=False) + met = getattr(obj, self.method) + + def handleResult(*result): + self.async(self.package, None, result) + def handleError(exception): + self.async(self.package, exception, None) + + if self.quiet: + met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), ignore_reply=True, *args) + else: + met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), reply_handler=handleResult, error_handler=handleError, *args) + else: + def handlePackages(packages): + for package in packages: + obj = self.link.bus.get_object(self.link.address, "/package/%s" % package, introspect=False) + met = getattr(obj, self.method) + + if self.quiet: + met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), ignore_reply=True, *args) + else: + def handleResult(*result): + self.async(package, None, result) + def handleError(exception): + self.async(package, exception, None) + + met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), reply_handler=handleResult, error_handler=handleError, *args) + + def handlePackError(exception): + if self.quiet: + pass + else: + raise exception + + if self.quiet: + obj = self.link.bus.get_object(self.link.address, "/", introspect=False) + packages = obj.listModelApplications("%s.%s" % (self.group, self.class_), dbus_interface="tr.org.pardus.comar") + handlePackages(packages) + else: + obj = self.link.bus.get_object(self.link.address, "/", introspect=False) + obj.listModelApplications("%s.%s" % (self.group, self.class_), dbus_interface="tr.org.pardus.comar", reply_handler=handlePackages, error_handler=handlePackError) + else: + if self.package: + obj = self.link.bus.get_object(self.link.address, "/package/%s" % self.package, introspect=False) + met = getattr(obj, self.method) + return met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), *args) + else: + raise AttributeError, "Package name required for non-async calls." + + +class Link: + def __init__(self, address="tr.org.pardus.comar"): + self.address = address + self.bus = dbus.SystemBus() + + def __getattr__(self, name): + if name[0] < 'A' or name[0] > 'Z': + raise AttributeError + return Call(self, name) Modified: trunk/comar/api/setup.py ================================================================= --- trunk/comar/api/setup.py (original) +++ trunk/comar/api/setup.py Mon Oct 27 00:35:56 2008 @@ -16,7 +16,7 @@ from distutils.core import setup from distutils.command.install import install -version = "2.0.1" +version = "2.1.0" distfiles = """ setup.py From uludag-commits at pardus.org.tr Mon Oct 27 00:43:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 00:43:55 +0200 (EET) Subject: [Uludag-commits] r20483 - trunk/comar/api Message-ID: <20081026224355.8AB5513840DC@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon Oct 27 00:43:54 2008 New Revision: 20483 Modified: trunk/comar/api/README Log: ooops, quiet should be True of course :) Modified: trunk/comar/api/README ================================================================= --- trunk/comar/api/README (original) +++ trunk/comar/api/README Mon Oct 27 00:43:54 2008 @@ -13,7 +13,7 @@ link.System.Service["kdebase"].start() # Stop all services, ignore replies from packages. - link.System.Service.stop(quiet=False) + link.System.Service.stop(quiet=True) Async calls: From uludag-commits at pardus.org.tr Mon Oct 27 01:58:05 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 01:58:05 +0200 (EET) Subject: [Uludag-commits] r20484 - trunk/comar/api/comar Message-ID: <20081026235805.63E6813840D8@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon Oct 27 01:58:05 2008 New Revision: 20484 Modified: trunk/comar/api/comar/__init__.py Log: Defining functions in loops, i'm loving it. Functions should be defined outside of loop, always remember that. Modified: trunk/comar/api/comar/__init__.py ================================================================= --- trunk/comar/api/comar/__init__.py (original) +++ trunk/comar/api/comar/__init__.py Mon Oct 27 01:58:05 2008 @@ -68,19 +68,26 @@ met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), reply_handler=handleResult, error_handler=handleError, *args) else: def handlePackages(packages): - for package in packages: - obj = self.link.bus.get_object(self.link.address, "/package/%s" % package, introspect=False) - met = getattr(obj, self.method) - - if self.quiet: + if self.quiet: + for package in packages: + obj = self.link.bus.get_object(self.link.address, "/package/%s" % package, introspect=False) + met = getattr(obj, self.method) met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), ignore_reply=True, *args) - else: - def handleResult(*result): - self.async(package, None, result) - def handleError(exception): - self.async(package, exception, None) + else: + def handleResult(package): + def handler(*result): + return self.async(package, None, result) + return handler + def handleError(package): + def handler(exception): + return self.async(package, exception, None) + return handler + + for package in packages: + obj = self.link.bus.get_object(self.link.address, "/package/%s" % package, introspect=False) + met = getattr(obj, self.method) - met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), reply_handler=handleResult, error_handler=handleError, *args) + met(dbus_interface="tr.org.pardus.comar.%s.%s" % (self.group, self.class_), reply_handler=handleResult(package), error_handler=handleError(package), *args) def handlePackError(exception): if self.quiet: From uludag-commits at pardus.org.tr Mon Oct 27 10:14:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 10:14:09 +0200 (EET) Subject: [Uludag-commits] r20485 - trunk/repository-scripts Message-ID: <20081027081409.D9BF913840D5@liste.pardus.org.tr> Author: ozan.caglayan Date: Mon Oct 27 10:14:09 2008 New Revision: 20485 Added: trunk/repository-scripts/my-packages.py Log: New script: my-packages.py Write down your e-mail and the path to your local working copy of a source repository into the script to see the packages that you are the maintainer. From uludag-commits at pardus.org.tr Mon Oct 27 20:11:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 20:11:51 +0200 (EET) Subject: [Uludag-commits] r20486 - trunk/pardusman/projects Message-ID: <20081027181151.736F213840C8@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 20:11:51 2008 New Revision: 20486 Modified: trunk/pardusman/projects/Kurulan.xml Log: Add br2684ctl and linux-atm to Kurulan CD BUG:FIXED:7652 Modified: trunk/pardusman/projects/Kurulan.xml ================================================================= --- trunk/pardusman/projects/Kurulan.xml (original) +++ trunk/pardusman/projects/Kurulan.xml Mon Oct 27 20:11:51 2008 @@ -33,6 +33,7 @@ bogofilter boost boot-manager + br2684ctl bridge-utils cabextract cdparanoia @@ -118,6 +119,7 @@ libsvg-cairo libtool libwmf + linux-atm linux-uvc lirc-drivers lmpcm_usb @@ -252,6 +254,7 @@ boot-manager bootsplash bootsplash-theme-pardus + br2684ctl bridge-utils bzip2 cabextract @@ -591,6 +594,7 @@ libxkbui libxml2 libxslt + linux-atm linux-uvc lirc lirc-drivers From uludag-commits at pardus.org.tr Mon Oct 27 20:13:22 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 20:13:22 +0200 (EET) Subject: [Uludag-commits] r20487 - trunk/pardusman/projects Message-ID: <20081027181322.4313A1384104@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 20:13:21 2008 New Revision: 20487 Modified: trunk/pardusman/projects/Kurulan-int.xml Log: Add br2684ctl and linux-atm to Kurulan CD BUG:FIXED:7652 Modified: trunk/pardusman/projects/Kurulan-int.xml ================================================================= --- trunk/pardusman/projects/Kurulan-int.xml (original) +++ trunk/pardusman/projects/Kurulan-int.xml Mon Oct 27 20:13:21 2008 @@ -34,6 +34,7 @@ bogofilter boost boot-manager + br2684ctl bridge-utils cabextract cdparanoia @@ -161,6 +162,7 @@ libsvg-cairo libtool libwmf + linux-atm linux-uvc lirc-drivers lmpcm_usb @@ -297,6 +299,7 @@ boot-manager bootsplash bootsplash-theme-pardus + br2684ctl bridge-utils bzip2 cabextract @@ -677,6 +680,7 @@ libxkbui libxml2 libxslt + linux-atm linux-uvc lirc lirc-drivers From uludag-commits at pardus.org.tr Mon Oct 27 20:53:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 20:53:11 +0200 (EET) Subject: [Uludag-commits] r20488 - trunk/pardusman/src Message-ID: <20081027185312.09EBF1384101@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 20:53:11 2008 New Revision: 20488 Modified: trunk/pardusman/src/maker.py trunk/pardusman/src/project.py Log: merge live CD fixes from branches/pardusman-2008 : KDE3 based live CD support - Türker Sezer KDE4 based live CD support and Policykit fixes - Ekin Meroğlu Seperate live CD exclude list support - Bahadır Kandemir Modified: trunk/pardusman/src/maker.py ================================================================= --- trunk/pardusman/src/maker.py (original) +++ trunk/pardusman/src/maker.py Mon Oct 27 20:53:11 2008 @@ -10,12 +10,14 @@ # import os +import re import subprocess import sha import tempfile import stat import sys import time +import dbus from utility import xterm_title, waitBus @@ -30,6 +32,21 @@ print "%s returned %s" % (cmd, ret) sys.exit(1) +def connectToDBus(path): + global bus + bus = None + for i in range(20): + try: + print("trying to start dbus..") + bus = dbus.bus.BusConnection(address_or_type="unix:path=%s/var/run/dbus/system_bus_socket" % path) + break + except dbus.DBusException: + time.sleep(1) + print("wait dbus for 1 second...") + if bus: + return True + return False + def chroot_comar(image_dir): if os.fork() == 0: # Workaround for creating ISO's on 2007 with PiSi 2.* @@ -200,7 +217,11 @@ def setup_live_kdm(project): image_dir = project.image_dir() - path = os.path.join(image_dir, "etc/X11/kdm/kdmrc") + if "kdebase" in project.all_packages : + path = os.path.join(image_dir, "etc/X11/kdm/kdmrc") + elif "kdebase4" in project.all_packages : + # FIXME : find a generic way to do this + path = os.path.join(image_dir, "etc/X11/kdm/kdmrc4") lines = [] for line in file(path): if line.startswith("#AutoLoginEnable"): @@ -211,10 +232,35 @@ lines.append(line) file(path, "w").write("".join(lines)) +def setup_live_policykit_conf(project): + policykit_conf_tmpl = """ + + + + + + + + + + + +""" + + # Write PolicyKit.conf + image_dir = project.image_dir() + dest = os.path.join(image_dir, "etc/PolicyKit/PolicyKit.conf") + + f = file(dest, "w") + f.write(policykit_conf_tmpl) + f.close() + def copyPisiIndex(project): image_dir = project.image_dir() path = os.path.join(image_dir, "usr/share/yali4/data/pisi-index.xml.bz2") repo = os.path.join(project.work_dir, "repo_cache/pisi-index.xml.bz2") + run('cp -PR "%s" "%s"' % (repo, path)) run('sha1sum "%s" > "%s"' % (repo, "%s.sha1sum" % path)) print('cp -PR "%s" "%s"' % (repo, path)) @@ -316,6 +362,8 @@ sys.exit(1) def make_image(project): + global bus + print "Preparing install image..." xterm_title("Preparing install image") @@ -357,9 +405,22 @@ chrun("/usr/bin/pisi configure-pending baselayout") chrun("/usr/bin/pisi configure-pending") - chrun("hav call baselayout User.Manager setUser 0 'Pardus Root' '/root' '/bin/bash' 'pardus' '' ") - if project.type != "install" and 1==3: - chrun("hav call User.Manager addUser '1000' 'pars' 'Panter Pardus' '' password pardus") + # FIXME : find a generic way to do this + if "kdebase4" in project.all_packages : + chrun("/bin/service kdebase4_workspace on") + # Change headstart + fn_config = os.path.join(image_dir, "etc/conf.d/mudur") + str_conf = file(fn_config).read() + str_conf = re.sub("kdebase", "kdebase4_workspace", str_conf) + file(fn_config, "w").write(str_conf) + + connectToDBus(image_dir) + + obj = bus.get_object("tr.org.pardus.comar", "/package/baselayout") + + obj.setUser(0, "", "", "", "pardus", "", dbus_interface="tr.org.pardus.comar.User.Manager") + if project.type != "install": + obj.addUser(1000, "pars", "Panter Pardus", "/home/pars", "/bin/bash", "pardus", ["wheel", "users", "pnp", "pnpadmin", "removable", "disk", "audio", "video", "power", "dialout"], [], [], dbus_interface="tr.org.pardus.comar.User.Manager") chrun("/sbin/depmod -a %s-%s" % (repo.packages["kernel"].version, repo.packages["kernel"].release)) @@ -370,10 +431,12 @@ file(os.path.join(image_dir, "etc/pardus-release"), "w").write("%s\n" % project.title) - if project.type != "install" and "kdebase" in project.all_packages: + if project.type != "install" and ("kdebase" in project.all_packages or "kdebase4" in project.all_packages): setup_live_kdm(project) + setup_live_policykit_conf(project) - copyPisiIndex(project) + if project.type == "install": + copyPisiIndex(project) # Make sure environment is updated regardless of the booting system, by setting comparison # files' atime and mtime to UNIX time 1 Modified: trunk/pardusman/src/project.py ================================================================= --- trunk/pardusman/src/project.py (original) +++ trunk/pardusman/src/project.py Mon Oct 27 20:53:11 2008 @@ -36,7 +36,6 @@ usr/share/groff/ usr/share/dict/ var/db/pisi/ -var/lib/pisi/ var/cache/pisi/packages/ var/cache/pisi/archives/ var/tmp/pisi/ @@ -82,7 +81,20 @@ root/.bash_history """ -default_glob_excludes = ( +default_install_glob_excludes = ( + ( "usr/lib/python2.5/", "*.pyc" ), + ( "usr/lib/python2.5/", "*.pyo" ), + ( "usr/lib/pardus/", "*.pyc" ), + ( "usr/lib/pardus/", "*.pyo" ), + ( "usr/lib/", "*.a" ), + ( "usr/lib/", "*.la" ), + ( "lib/", "*.a" ), + ( "lib/", "*.la" ), + ( "var/db/comar/", "__db*" ), + ( "var/db/comar/", "log.*" ), +) + +default_live_glob_excludes = ( ( "usr/lib/python2.5/", "*.pyc" ), ( "usr/lib/python2.5/", "*.pyo" ), ( "usr/lib/pardus/", "*.pyc" ), @@ -93,6 +105,9 @@ ( "lib/", "*.la" ), ( "var/db/comar/", "__db*" ), ( "var/db/comar/", "log.*" ), + ( "var/lib/pisi/index", "*" ), + ( "var/lib/pisi/info", "*" ), + ( "var/lib/pisi/package", "*" ), ) @@ -181,17 +196,21 @@ def exclude_list(self): import fnmatch + def _glob_exclude(lst, excludes): + image_dir = self.image_dir() + for exc in excludes: + path = os.path.join(image_dir, exc[0]) + for root, dirs, files in os.walk(path): + for name in files: + if fnmatch.fnmatch(name, exc[1]): + lst.append(os.path.join(root[len(image_dir)+1:], name)) + if self.type == "install": temp = default_install_exclude_list.split() + _glob_exclude(temp, default_install_glob_excludes) else: temp = default_live_exclude_list.split() - image_dir = self.image_dir() - for exc in default_glob_excludes: - path = os.path.join(image_dir, exc[0]) - for root, dirs, files in os.walk(path): - for name in files: - if fnmatch.fnmatch(name, exc[1]): - temp.append(os.path.join(root[len(image_dir)+1:], name)) + _glob_exclude(temp, default_live_glob_excludes) return temp def _get_dir(self, name, clean=False): @@ -223,6 +242,12 @@ for component in self.selected_components: for package in repo.components[component]: collect(package) + + if not "gfxtheme-pardus-install" in self.selected_packages: + self.selected_packages.append("gfxtheme-pardus-install") + if not "syslinux" in self.selected_packages: + self.selected_packages.append("syslinux") + for package in self.selected_packages: collect(package) packages.sort() From uludag-commits at pardus.org.tr Mon Oct 27 21:02:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 21:02:04 +0200 (EET) Subject: [Uludag-commits] r20489 - in trunk/pardusman: projects src Message-ID: <20081027190204.71ADF13840BA@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 21:02:04 2008 New Revision: 20489 Modified: trunk/pardusman/projects/MinimalTest.xml trunk/pardusman/src/browser.py trunk/pardusman/src/gui.py trunk/pardusman/src/maker.py trunk/pardusman/src/project.py Log: merge localized CD support from branches/pardusman-locale : Localized CD and boot support - Onur Küçük GUI and Improvements for Localized CD support - Pınar Yanardağ Modified: trunk/pardusman/projects/MinimalTest.xml ================================================================= --- trunk/pardusman/projects/MinimalTest.xml (original) +++ trunk/pardusman/projects/MinimalTest.xml Mon Oct 27 21:02:04 2008 @@ -111,4 +111,17 @@ zip zlib - \ No newline at end of file + + ca_ES + de_DE + en_US + es_ES + fr_FR + it_IT + nl_NL + pl_PL + pt_BR + sv_SE + tr_TR + + Modified: trunk/pardusman/src/browser.py ================================================================= --- trunk/pardusman/src/browser.py (original) +++ trunk/pardusman/src/browser.py Mon Oct 27 21:02:04 2008 @@ -317,7 +317,6 @@ self.nr_paks -= 1 self._update_label() - class Browser(QDialog): def __init__(self, parent, repo, callback, components, packages, mediasize): QDialog.__init__(self, parent) @@ -342,3 +341,120 @@ def reject(self): self.callback(None, None) QDialog.reject(self) + +class Language(QDialog): + def __init__(self, parent, callback, langdef, langall): + QDialog.__init__(self, parent) + + self.availablelangs = ["ca_ES", "de_DE", "en_US", "es_ES", "fr_FR", "it_IT", "nl_NL", "pl_PL", "pt_BR", "sv_SE", "tr_TR"] + + if langdef not in self.availablelangs: + self.defaultlang = "en_US" + else: + self.defaultlang = langdef + + self.callback = callback + + self.listLang= KListView(self,"listLang") + self.listLang.addColumn(i18n("Lang Layouts")) + self.listLang.setGeometry(QRect(30,50,290,270)) + self.listLang.setAllColumnsShowFocus(1) + self.listLang.setResizeMode(QListView.AllColumns) + + for each in self.availablelangs: + item = QCheckListItem(self.listLang, "lang", QCheckListItem.CheckBox) + item.setText(0, each) + if each in langall: + item.activate() + + LayoutWidget = QWidget(self,"layout1") + LayoutWidget.setGeometry(QRect(80,380,234,58)) + layout1 = QHBoxLayout(LayoutWidget,11,6,"layout1") + + self.but1 = QPushButton(LayoutWidget,"but1") + layout1.addWidget(self.but1) + + self.but2 = QPushButton(LayoutWidget,"but2") + layout1.addWidget(self.but2) + self.but1.setText(i18n("Okay")) + self.but2.setText(i18n("Cancel")) + + self.checkBox1 = QCheckBox(self,"checkBox1") + self.checkBox1.setGeometry(QRect(70,320,180,21)) + self.checkBox1.setText(i18n("Select all")) + + self.comboBox = QComboBox(0,self,"comboBox") + self.comboBox.setGeometry(QRect(60,340,240,30)) + self.comboBox.insertStrList(langall) + + if not langall: + self.comboBox.insertItem(self.defaultlang) + else: + self.comboBox.setCurrentText(str(self.defaultlang)) + + if not langall: + aww = self.listLang.firstChild() + while aww: + if aww.text() == self.defaultlang: + aww.activate() + aww = aww.nextSibling() + + self.connect(self.but1, SIGNAL("clicked()"), self.accept) + self.connect(self.but2, SIGNAL("clicked()"), self.reject) + self.connect(self.listLang, SIGNAL("clicked(QListViewItem *)"), self.syncCombo) + self.connect(self.listLang, SIGNAL("clicked(QListViewItem *)"), self.setDefaultLang) + self.connect(self.checkBox1, SIGNAL("toggled(bool)"), self.selectAll) + self.connect(self.comboBox, SIGNAL("activated(int)"), self.setDefaultLang) + self.connect(self.checkBox1, SIGNAL("toggled(bool)"), self.syncCombo) + + def setDefaultLang(self): + self.defaultlang = self.comboBox.currentText() + + def setSelectedLangs(self): + self.selectedLangs = [] + aww = self.listLang.firstChild() + while aww: + if aww.isOn(): + self.selectedLangs.append(str(aww.text())) + aww = aww.nextSibling() + + def accept(self): + self.setSelectedLangs() + self.setDefaultLang() + self.callback(str(self.defaultlang), self.selectedLangs) + QDialog.accept(self) + + def selectAll(self, checked): + aww = self.listLang.firstChild() + while aww: + if checked: + if not aww.isOn(): + aww.activate() + else: + if aww.isOn(): + aww.activate() + aww = aww.nextSibling() + + def reject(self): + self.callback("", None) + QDialog.reject(self) + + def syncCombo(self, checked): + self.setSelectedLangs() + """ + if not len(self.selectedLangs) == len(self.availablelangs): + self.checkBox1.setChecked(False) + """ + self.comboBox.clear() + if not checked: + self.comboBox.insertItem(self.defaultlang) + aww = self.listLang.firstChild() + while aww: + if aww.text() == self.defaultlang: + aww.activate() + aww = aww.nextSibling() + else: + self.comboBox.insertStrList(self.selectedLangs) + if self.defaultlang in self.selectedLangs: + self.comboBox.setCurrentText(self.defaultlang) + Modified: trunk/pardusman/src/gui.py ================================================================= --- trunk/pardusman/src/gui.py (original) +++ trunk/pardusman/src/gui.py Mon Oct 27 21:02:04 2008 @@ -175,12 +175,19 @@ bar = QToolBar("lala", None, vb) self.toolbar = bar QLabel(" ", bar) + but = QToolButton(getIconSet("reload"), _("Update Repo"), "lala", self.update, bar) but.setUsesTextLabel(True) but.setTextPosition(but.BesideIcon) + but = QToolButton(getIconSet("package"), _("Select packages"), "lala", self.browse, bar) but.setUsesTextLabel(True) but.setTextPosition(but.BesideIcon) + + but = QToolButton(getIconSet("gear"), _("Select languages"), "lala", self.lang, bar) + but.setUsesTextLabel(True) + but.setTextPosition(but.BesideIcon) + but = QToolButton(getIconSet("gear"), _("Make ISO"), "lala", self.make, bar) but.setUsesTextLabel(True) but.setTextPosition(but.BesideIcon) @@ -277,6 +284,22 @@ ) w.show() + def langResult(self, langdef, langall): + self.toolbar.setEnabled(True) + if langdef != "": + self.project.selected_languages = langall + self.project.default_language = langdef + + def lang(self): + if not self.checkSettings(): + return + self.toolbar.setEnabled(False) + w = browser.Language(self, + self.langResult, + self.project.default_language, + self.project.selected_languages) + w.show() + def make(self): if not self.checkSettings(): return Modified: trunk/pardusman/src/maker.py ================================================================= --- trunk/pardusman/src/maker.py (original) +++ trunk/pardusman/src/maker.py Mon Oct 27 21:02:04 2008 @@ -141,6 +141,9 @@ image_dir = project.image_dir() iso_dir = project.iso_dir() + lang_default = project.default_language + lang_all = project.selected_languages + isolinux_tmpl = """ prompt 1 timeout 200 @@ -172,6 +175,28 @@ f.write(data % dict) f.close() + if len(lang_all) and lang_default != "": + langdata = "" + + if not lang_default in lang_all: + lang_all.append(lang_default) + + lang_all.sort() + + for i in lang_all: + langdata += "%s\n" % i + + + # write default language + f = file(os.path.join(iso_dir, "boot/isolinux/lang"), "w") + f.write("%s\n" % lang_default) + f.close() + + # write available languages + f = file(os.path.join(iso_dir, "boot/isolinux/languages"), "w") + f.write(langdata) + f.close() + def setup_isolinux(project): print "Generating isolinux files..." Modified: trunk/pardusman/src/project.py ================================================================= --- trunk/pardusman/src/project.py (original) +++ trunk/pardusman/src/project.py Mon Oct 27 21:02:04 2008 @@ -125,6 +125,8 @@ self.selected_components = [] self.selected_packages = [] self.all_packages = [] + self.selected_languages = [] + self.default_language = None self.exparams = '' self.plugin_package = '' @@ -159,6 +161,15 @@ self.selected_packages.append(tag.firstChild().data()) for tag in paksel.tags("Package"): self.all_packages.append(tag.firstChild().data()) + + langsel = doc.getTag("LanguageSelection") + if langsel: + self.default_language = langsel.getAttribute("default_language") + for tag in langsel.tags("Language"): + self.selected_languages.append(tag.firstChild().data()) + + if self.default_language not in self.selected_languages: + self.selected_languages.append(self.default_language) return None @@ -188,6 +199,12 @@ self.all_packages.sort() for item in self.all_packages: paks.insertTag("Package").insertData(item) + if self.default_language: + langs = doc.insertTag("LanguageSelection") + langs.setAttribute("default_language", self.default_language) + self.selected_languages.sort() + for item in self.selected_languages: + langs.insertTag("Language").insertData(item) data = doc.toPrettyString() f = file(filename, "w") f.write(data) From uludag-commits at pardus.org.tr Mon Oct 27 21:07:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 21:07:21 +0200 (EET) Subject: [Uludag-commits] r20490 - branches/pardusman-2008 Message-ID: <20081027190721.C336613840F7@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 21:07:21 2008 New Revision: 20490 Removed: branches/pardusman-2008/ Log: merged to trunk, bye... From uludag-commits at pardus.org.tr Mon Oct 27 21:08:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 27 Oct 2008 21:08:11 +0200 (EET) Subject: [Uludag-commits] r20491 - branches/pardusman-locale Message-ID: <20081027190811.A84EF13840F7@liste.pardus.org.tr> Author: eki Date: Mon Oct 27 21:08:11 2008 New Revision: 20491 Removed: branches/pardusman-locale/ Log: merged to trunk, bye... From uludag-commits at pardus.org.tr Tue Oct 28 09:13:11 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 09:13:11 +0200 (EET) Subject: [Uludag-commits] r20492 - trunk/repository-scripts Message-ID: <20081028071311.CD3381384149@liste.pardus.org.tr> Author: bahadir.kandemir Date: Tue Oct 28 09:13:11 2008 New Revision: 20492 Removed: trunk/repository-scripts/bump_version.py Log: bumping blindly is evil From uludag-commits at pardus.org.tr Tue Oct 28 10:57:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 10:57:44 +0200 (EET) Subject: [Uludag-commits] r20493 - branches/buildfarm-delta Message-ID: <20081028085744.7D999138412C@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 10:57:44 2008 New Revision: 20493 Modified: branches/buildfarm-delta/pisiinterface.py Log: add getName, start using dictionaries instead of lists for one-to-one delta generation process Modified: branches/buildfarm-delta/pisiinterface.py ================================================================= --- branches/buildfarm-delta/pisiinterface.py (original) +++ branches/buildfarm-delta/pisiinterface.py Tue Oct 28 10:57:44 2008 @@ -47,6 +47,9 @@ self.__newBinaryPackages = [] self.__oldBinaryPackages = [] + def getName(package): + return package.rstrip(".pisi").rsplit("-", 3)[0] + def getPreviousBuild(self, package): """ Returns the previous build with buildno < buildno(package) (nearest) """ package = package.rstrip(".pisi\n").rsplit("-", 3) @@ -68,6 +71,10 @@ logger.debug("delta() -> oldBinaryPackages: %s" % oldBinaryPackages) logger.debug("delta() -> newBinaryPackages: %s" % newBinaryPackages) + # Sort them correctly, please.. + oldDict = dict([(getName(l),l) for l in oldBinaryPackages]) + packages = dict([(getName(p), (oldDict.get(getName(p), ""), p)) for p in newBinaryPackages]) + # Delta packages to be installed on farm for upgrading to new packages deltas_to_install = [] @@ -79,7 +86,7 @@ logger.debug("Current (old,new) tuple is: %s" % str(pl)) # Parse the name of the new package - name = os.path.basename(pl[1]).rstrip(".pisi").rsplit("-", 3)[0] + name = getName(os.path.basename(pl[1]) # Full path of the new package p = os.path.join(config.workDir, pl[1]) From uludag-commits at pardus.org.tr Tue Oct 28 19:29:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 19:29:29 +0200 (EET) Subject: [Uludag-commits] r20494 - branches/buildfarm-delta Message-ID: <20081028172929.7016713840CA@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 19:29:29 2008 New Revision: 20494 Modified: branches/buildfarm-delta/pisiinterface.py Log: new sorting method for brand new builds of a source package Modified: branches/buildfarm-delta/pisiinterface.py ================================================================= --- branches/buildfarm-delta/pisiinterface.py (original) +++ branches/buildfarm-delta/pisiinterface.py Tue Oct 28 19:29:29 2008 @@ -71,9 +71,19 @@ logger.debug("delta() -> oldBinaryPackages: %s" % oldBinaryPackages) logger.debug("delta() -> newBinaryPackages: %s" % newBinaryPackages) - # Sort them correctly, please.. - oldDict = dict([(getName(l),l) for l in oldBinaryPackages]) - packages = dict([(getName(p), (oldDict.get(getName(p), ""), p)) for p in newBinaryPackages]) + brandNewBinaryPackages = [] + + for p in newBinaryPackages: + if not getName(p) in [getName(p) for p in oldBinaryPackages]: + brandNewBinaryPackages.append(newBinaryPackages.pop(newBinaryPackages.index(p))) + + # brandNew contains the possible first builds + # Just add those to the end of newBinaryPackages for + # correct delta generation.. + + oldBinaryPackages.sort() + newBinaryPackages.sort() + newBinaryPackages.extend(brandNewBinaryPackages) # Delta packages to be installed on farm for upgrading to new packages deltas_to_install = [] From uludag-commits at pardus.org.tr Tue Oct 28 19:39:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 19:39:25 +0200 (EET) Subject: [Uludag-commits] r20495 - branches/buildfarm-delta Message-ID: <20081028173925.C5B8513840E0@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 19:39:25 2008 New Revision: 20495 Modified: branches/buildfarm-delta/pisiinterface.py Log: add missing parenthese Modified: branches/buildfarm-delta/pisiinterface.py ================================================================= --- branches/buildfarm-delta/pisiinterface.py (original) +++ branches/buildfarm-delta/pisiinterface.py Tue Oct 28 19:39:25 2008 @@ -96,7 +96,7 @@ logger.debug("Current (old,new) tuple is: %s" % str(pl)) # Parse the name of the new package - name = getName(os.path.basename(pl[1]) + name = getName(os.path.basename(pl[1])) # Full path of the new package p = os.path.join(config.workDir, pl[1]) From uludag-commits at pardus.org.tr Tue Oct 28 19:40:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 19:40:14 +0200 (EET) Subject: [Uludag-commits] r20496 - trunk/tasma/network-manager Message-ID: <20081028174014.BA43313840E0@liste.pardus.org.tr> Author: isbaran Date: Tue Oct 28 19:40:14 2008 New Revision: 20496 Added: trunk/tasma/network-manager/connSharing.py trunk/tasma/network-manager/connSharing.ui Modified: trunk/tasma/network-manager/connsharing.py trunk/tasma/network-manager/setup.py Log: add connection sharing ui Modified: trunk/tasma/network-manager/connsharing.py ================================================================= --- trunk/tasma/network-manager/connsharing.py (original) +++ trunk/tasma/network-manager/connsharing.py Tue Oct 28 19:40:14 2008 @@ -16,63 +16,17 @@ from handler import CallHandler import commands +from connSharing import ConnSharing + # DBus -class connShare(QDialog): +class connShare(ConnSharing): def __init__(self, parent=None): - QDialog.__init__(self, parent, "connShare") + ConnSharing.__init__(self, parent, "connShare") self.parent = parent - connShareLayout = QGridLayout(self,1,1,11,6,"connShareLayout") - self.sharecheckBox = QCheckBox(self,"sharecheckBox") - connShareLayout.addWidget(self.sharecheckBox,0,0) - - self.groupBox1 = QGroupBox(self,"") - self.groupBox1.setColumnLayout(0,Qt.Vertical) - self.groupBox1.layout().setSpacing(6) - self.groupBox1.layout().setMargin(11) - groupBox1Layout = QGridLayout(self.groupBox1.layout()) - groupBox1Layout.setAlignment(Qt.AlignTop) - - self.textLabel1 = QLabel(self.groupBox1,"textLabel1") - groupBox1Layout.addWidget(self.textLabel1,0,0) - self.intcombo = QComboBox(0,self.groupBox1,"intcombo") - groupBox1Layout.addWidget(self.intcombo,0,1) - self.sharecombo = QComboBox(0,self.groupBox1,"sharecombo") - groupBox1Layout.addWidget(self.sharecombo,1,1) - self.textLabel2 = QLabel(self.groupBox1,"textLabel2") - groupBox1Layout.addWidget(self.textLabel2,1,0) - connShareLayout.addWidget(self.groupBox1,1,0) - - self.buttonGroup2 = QButtonGroup(self,"buttonGroup2") - self.buttonGroup2.setFrameStyle(QFrame.MenuBarPanel | QFrame.Plain) - self.buttonGroup2.setColumnLayout(0,Qt.Vertical) - self.buttonGroup2.layout().setSpacing(6) - self.buttonGroup2.layout().setMargin(11) - buttonGroup2Layout = QHBoxLayout(self.buttonGroup2.layout()) - buttonGroup2Layout.setAlignment(Qt.AlignTop) - spacer2 = QSpacerItem(200,30,QSizePolicy.Expanding,QSizePolicy.Minimum) - buttonGroup2Layout.addItem(spacer2) - - self.applyBut = QPushButton(self.buttonGroup2,"applyBut") - buttonGroup2Layout.addWidget(self.applyBut) - - self.cancelBut = QPushButton(self.buttonGroup2,"cancelBut") - buttonGroup2Layout.addWidget(self.cancelBut) - - connShareLayout.addWidget(self.buttonGroup2,2,0) - self.languageChange() - self.resize(QSize(400,120).expandedTo(self.minimumSizeHint())) - self.clearWState(Qt.WState_Polished) - - self.textLabel1.setBuddy(self.intcombo) - self.textLabel2.setBuddy(self.sharecombo) - - self.groupBox1.setEnabled(False) - self.applyBut.setEnabled(False) - self.connect(self.sharecheckBox, SIGNAL("stateChanged(int)"), self.slotCheckBox) self.connect(self.applyBut, SIGNAL("clicked()"), self.shareConnection) self.connect(self.cancelBut, SIGNAL("clicked()"), self.close) @@ -98,10 +52,8 @@ def languageChange(self): self.setCaption(i18n("Internet Connection Sharing")) self.sharecheckBox.setText(i18n("Share Internet Connection")) - self.groupBox1.setTitle("") self.textLabel1.setText(i18n("Interface that goes to internet")) self.textLabel2.setText(i18n("Interface that will share connection")) - self.buttonGroup2.setTitle(QString.null) self.applyBut.setText(i18n("Apply")) self.cancelBut.setText(i18n("Close")) Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Tue Oct 28 19:40:14 2008 @@ -17,11 +17,12 @@ import shutil import kdedistutils -version = "2.1.4" +version = "2.1.5" distfiles = """ README *.py + *.ui *.desktop images/*.png help/*.css @@ -66,6 +67,8 @@ 'comariface.py', 'nameconf.py', 'connsharing.py', + 'connSharing.ui', + 'connSharing.py', ('/usr/share/autostart/', ['network-applet.desktop']), ('/usr/kde/3.5/share/applications/kde/', ['network-applet.desktop']), 'images/wireless-online.png', From uludag-commits at pardus.org.tr Tue Oct 28 20:09:25 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 20:09:25 +0200 (EET) Subject: [Uludag-commits] r20497 - trunk/planet/planet.pardus.org.tr Message-ID: <20081028180925.E149D13840B9@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 20:09:25 2008 New Revision: 20497 Modified: trunk/planet/planet.pardus.org.tr/config.ini Log: Publish blogs to planet.pardus.org.tr Modified: trunk/planet/planet.pardus.org.tr/config.ini ================================================================= --- trunk/planet/planet.pardus.org.tr/config.ini (original) +++ trunk/planet/planet.pardus.org.tr/config.ini Tue Oct 28 20:09:25 2008 @@ -83,3 +83,7 @@ [http://cihangirbesiktas.blogspot.com/feeds/posts/default?alt=rss] name = Cihangir Beşiktaş + +[http://cekirdek.pardus.org.tr/~ozan/zangetsu/blog/feed/rss/planet/] +name = Ozan Çağlayan +face = http://cekirdek.pardus.org.tr/~ozan/ivir/face.png From uludag-commits at pardus.org.tr Tue Oct 28 20:09:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 20:09:56 +0200 (EET) Subject: [Uludag-commits] r20498 - trunk/planet/gezegen.pardus.org.tr Message-ID: <20081028180956.E2FB113840BC@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 20:09:56 2008 New Revision: 20498 Modified: trunk/planet/gezegen.pardus.org.tr/config.ini Log: add face Modified: trunk/planet/gezegen.pardus.org.tr/config.ini ================================================================= --- trunk/planet/gezegen.pardus.org.tr/config.ini (original) +++ trunk/planet/gezegen.pardus.org.tr/config.ini Tue Oct 28 20:09:56 2008 @@ -139,6 +139,7 @@ [http://cekirdek.pardus.org.tr/~ozan/zangetsu/blog/feed/rss/Pardus] name=Ozan Çağlayan +face=http://cekirdek.pardus.org.tr/~ozan/ivir/face.png [http://pinguar.org/gunluk/category/pardus/feed] name=Pınar Yanardağ From uludag-commits at pardus.org.tr Tue Oct 28 20:36:09 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 20:36:09 +0200 (EET) Subject: [Uludag-commits] r20499 - branches/buildfarm-delta Message-ID: <20081028183609.48AF01384134@liste.pardus.org.tr> Author: ozan.caglayan Date: Tue Oct 28 20:36:08 2008 New Revision: 20499 Modified: branches/buildfarm-delta/pisiinterface.py Log: refactor a little, finalize sorting stuff. I hope that it works now.. Modified: branches/buildfarm-delta/pisiinterface.py ================================================================= --- branches/buildfarm-delta/pisiinterface.py (original) +++ branches/buildfarm-delta/pisiinterface.py Tue Oct 28 20:36:08 2008 @@ -47,9 +47,6 @@ self.__newBinaryPackages = [] self.__oldBinaryPackages = [] - def getName(package): - return package.rstrip(".pisi").rsplit("-", 3)[0] - def getPreviousBuild(self, package): """ Returns the previous build with buildno < buildno(package) (nearest) """ package = package.rstrip(".pisi\n").rsplit("-", 3) @@ -68,13 +65,16 @@ def delta(self, isopackages, oldBinaryPackages, newBinaryPackages): + def getName(package): + return package.rstrip(".pisi").rsplit("-", 3)[0] + logger.debug("delta() -> oldBinaryPackages: %s" % oldBinaryPackages) logger.debug("delta() -> newBinaryPackages: %s" % newBinaryPackages) brandNewBinaryPackages = [] for p in newBinaryPackages: - if not getName(p) in [getName(p) for p in oldBinaryPackages]: + if not getName(p) in [getName(pa) for pa in oldBinaryPackages]: brandNewBinaryPackages.append(newBinaryPackages.pop(newBinaryPackages.index(p))) # brandNew contains the possible first builds From uludag-commits at pardus.org.tr Tue Oct 28 20:49:02 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 20:49:02 +0200 (EET) Subject: [Uludag-commits] r20500 - trunk/tasma/network-manager Message-ID: <20081028184902.DCD6013840FF@liste.pardus.org.tr> Author: isbaran Date: Tue Oct 28 20:49:02 2008 New Revision: 20500 Added: trunk/tasma/network-manager/nameConf.py trunk/tasma/network-manager/nameConf.ui Modified: trunk/tasma/network-manager/nameconf.py trunk/tasma/network-manager/setup.py Log: add name config. ui Modified: trunk/tasma/network-manager/nameconf.py ================================================================= --- trunk/tasma/network-manager/nameconf.py (original) +++ trunk/tasma/network-manager/nameconf.py Tue Oct 28 20:49:02 2008 @@ -17,95 +17,70 @@ from icons import getIconSet from comariface import comlink +from nameConf import NameConf -class Window(QDialog): +class Window(NameConf): def __init__(self, parent): - QDialog.__init__(self, parent) - + NameConf.__init__(self, parent) + self.old_host = None self.old_dns = None - - self.setCaption(i18n("Name Service Settings")) - self.resize(260, 290) - - vb = QVBoxLayout(self) - vb.setMargin(12) - vb.setSpacing(6) - - line = widgets.HLine(i18n("Computer"), self) - vb.addWidget(line) - - hb = QHBox(self) - vb.addWidget(hb) - hb.setSpacing(6) - QLabel(i18n("Host name:"), hb) - self.host = QLineEdit(hb) - - vb.addSpacing(6) - line = widgets.HLine(i18n("Name servers"), self) - vb.addWidget(line) - - vb2 = QVBox(self) - vb.addWidget(vb2) - vb2.setSpacing(3) - - self.dns = QListBox(vb2) - - hb = QHBox(vb2) - hb.setSpacing(3) - but = QPushButton(getIconSet("up", KIcon.Small), i18n("Up"), hb) - self.connect(but, SIGNAL("clicked()"), self.slotUp) - self.b1 = but - but = QPushButton(getIconSet("down", KIcon.Small), i18n("Down"), hb) - self.connect(but, SIGNAL("clicked()"), self.slotDown) - self.b2 = but - but = QPushButton(getIconSet("add", KIcon.Small), i18n("Add"), hb) - self.connect(but, SIGNAL("clicked()"), self.slotAdd) - but = QPushButton(getIconSet("remove", KIcon.Small), i18n("Remove"), hb) - self.connect(but, SIGNAL("clicked()"), self.slotRemove) - self.b3 = but - + + self.fillLabels() + + self.connect(self.b1, SIGNAL("clicked()"), self.slotUp) + self.connect(self.b2, SIGNAL("clicked()"), self.slotDown) + self.connect(self.b3, SIGNAL("clicked()"), self.slotRemove) + self.connect(self.b4, SIGNAL("clicked()"), self.slotAdd) + self.connect(self.dns, SIGNAL("selectionChanged()"), self.slotSelection) self.slotSelection() - - hb = QWidget(self) - vb.addSpacing(6) - vb.addWidget(hb) - lay = QHBoxLayout(hb) - lay.setMargin(3) - lay.setSpacing(12) - lay.addStretch(1) - but = QPushButton(getIconSet("apply", KIcon.Small), i18n("Apply"), hb) - self.connect(but, SIGNAL("clicked()"), self.accept) - lay.addWidget(but) - but = QPushButton(getIconSet("cancel", KIcon.Small), i18n("Cancel"), hb) - self.connect(but, SIGNAL("clicked()"), self.reject) - lay.addWidget(but) - + + self.connect(self.applyBut, SIGNAL("clicked()"), self.accept) + self.connect(self.cancelBut, SIGNAL("clicked()"), self.reject) + comlink.name_hook.append(self.slotName) - + + def fillLabels(self): + self.setCaption(i18n("Name Service Settings")) + self.hostNameLabel.setText(i18n("Host name:")) + self.nameServLabel.setText(i18n("Name servers")) + + self.b1.setIconSet(getIconSet("up", KIcon.Small)) + self.b1.setText(i18n("Up")) + self.b2.setIconSet(getIconSet("down", KIcon.Small)) + self.b2.setText(i18n("Down")) + self.b3.setIconSet(getIconSet("remove", KIcon.Small)) + self.b3.setText(i18n("Remove")) + self.b4.setIconSet(getIconSet("add", KIcon.Small)) + self.b4.setText(i18n("Add")) + self.applyBut.setIconSet(getIconSet("apply", KIcon.Small)) + self.applyBut.setText(i18n("Apply")) + self.cancelBut.setIconSet(getIconSet("cancel", KIcon.Small)) + self.cancelBut.setText(i18n("Cancel")) + def accept(self): host = str(self.host.text()) dns = [] - + item = self.dns.firstItem() while item: dns.append(str(item.text())) item = item.next() - + self.done = 0 def handler(): self.done += 1 if self.done == 2: self.setEnabled(True) QDialog.accept(self) - + def error(exception): self.setEnabled(True) - + def cancel(): self.setEnabled(True) - + if self.old_host != host: self.setEnabled(False) ch = comlink.callHandler("baselayout", "Net.Stack", "setHostName", "tr.org.pardus.comar.net.stack.set") @@ -117,7 +92,7 @@ ch.call(host) else: self.done += 1 - + if self.old_dns != dns: self.setEnabled(False) ch = comlink.callHandler("baselayout", "Net.Stack", "setNameServers", "tr.org.pardus.comar.net.stack.set") @@ -129,21 +104,21 @@ ch.call(dns) else: self.done += 1 - + if self.done == 2: self.setEnabled(True) QDialog.accept(self) - - + + def reject(self): QDialog.reject(self) - + def slotSelection(self): item = self.dns.selectedItem() self.b1.setEnabled(item != None and item.prev() != None) self.b2.setEnabled(item != None and item.next() != None) self.b3.setEnabled(item != None) - + def slotUp(self): item = self.dns.selectedItem() prev = item.prev() @@ -156,7 +131,7 @@ self.dns.insertItem(item, 0) self.dns.setCurrentItem(item) self.slotSelection() - + def slotDown(self): item = self.dns.selectedItem() next = item.next() @@ -165,7 +140,7 @@ self.dns.insertItem(item, next) self.dns.setCurrentItem(item) self.slotSelection() - + def slotAdd(self): tmp = KInputDialog.getText( i18n("Add Name Server"), @@ -178,18 +153,19 @@ if tmp[1]: self.dns.insertItem(tmp[0]) self.slotSelection() - + def slotRemove(self): item = self.dns.selectedItem() if item: self.dns.removeItem(self.dns.index(item)) self.slotSelection() - + def slotName(self, hostname, servers): self.dns.clear() self.old_dns = servers for item in self.old_dns: self.dns.insertItem(item) - + self.old_host = hostname self.host.setText(hostname) + Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Tue Oct 28 20:49:02 2008 @@ -66,6 +66,8 @@ 'icons.py', 'comariface.py', 'nameconf.py', + 'nameConf.ui', + 'nameConf.py', 'connsharing.py', 'connSharing.ui', 'connSharing.py', From uludag-commits at pardus.org.tr Tue Oct 28 22:30:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 22:30:55 +0200 (EET) Subject: [Uludag-commits] r20501 - trunk/tasma/network-manager Message-ID: <20081028203055.D7BF213840D3@liste.pardus.org.tr> Author: isbaran Date: Tue Oct 28 22:30:55 2008 New Revision: 20501 Modified: trunk/tasma/network-manager/connsharing.py trunk/tasma/network-manager/icons.py Log: ui consistency Modified: trunk/tasma/network-manager/connsharing.py ================================================================= --- trunk/tasma/network-manager/connsharing.py (original) +++ trunk/tasma/network-manager/connsharing.py Tue Oct 28 22:30:55 2008 @@ -10,12 +10,13 @@ import sys from qt import * -from kdecore import KCmdLineArgs, KApplication, i18n +from kdecore import * from kdeui import * from comariface import comlink from handler import CallHandler import commands +from icons import getIconSet from connSharing import ConnSharing # DBus @@ -25,7 +26,7 @@ ConnSharing.__init__(self, parent, "connShare") self.parent = parent - self.languageChange() + self.fillLabels() self.connect(self.sharecheckBox, SIGNAL("stateChanged(int)"), self.slotCheckBox) self.connect(self.applyBut, SIGNAL("clicked()"), self.shareConnection) @@ -49,13 +50,15 @@ self.intcombo.insertItem(profile.name) self.sharecombo.insertItem(profile.name) - def languageChange(self): + def fillLabels(self): self.setCaption(i18n("Internet Connection Sharing")) self.sharecheckBox.setText(i18n("Share Internet Connection")) self.textLabel1.setText(i18n("Interface that goes to internet")) self.textLabel2.setText(i18n("Interface that will share connection")) self.applyBut.setText(i18n("Apply")) + self.applyBut.setIconSet(getIconSet("apply", KIcon.Small)) self.cancelBut.setText(i18n("Close")) + self.cancelBut.setIconSet(getIconSet("cancel", KIcon.Small)) def callMethod(self, method, action, model="Net.Filter"): ch = CallHandler("iptables", model, method, Modified: trunk/tasma/network-manager/icons.py ================================================================= --- trunk/tasma/network-manager/icons.py (original) +++ trunk/tasma/network-manager/icons.py Tue Oct 28 22:30:55 2008 @@ -17,11 +17,12 @@ class Icons: - def _pix(self, name): + def _pix(self, name, scale=True): img = QImage(locate("data", "network-manager/" + name)) - img = img.smoothScale(32, 32) + if scale: + img = img.smoothScale(32, 32) return QPixmap(img) - + def load_icons(self): self.nets = { "up": self._pix("ethernet-online.png"), From uludag-commits at pardus.org.tr Tue Oct 28 22:50:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 28 Oct 2008 22:50:07 +0200 (EET) Subject: [Uludag-commits] r20502 - trunk/tasma/network-manager Message-ID: <20081028205007.94F9413840CE@liste.pardus.org.tr> Author: isbaran Date: Tue Oct 28 22:50:07 2008 New Revision: 20502 Added: trunk/tasma/network-manager/newConn.py trunk/tasma/network-manager/newConn.ui Modified: trunk/tasma/network-manager/newconn.py trunk/tasma/network-manager/setup.py Log: add new connection ui Modified: trunk/tasma/network-manager/newconn.py ================================================================= --- trunk/tasma/network-manager/newconn.py (original) +++ trunk/tasma/network-manager/newconn.py Tue Oct 28 22:50:07 2008 @@ -17,33 +17,24 @@ from icons import icons, getIconSet from comariface import comlink +from newConn import NewConn -class Window(QDialog): +class Window(NewConn): def __init__(self, parent): - QDialog.__init__(self, parent) - self.setMinimumSize(340, 340) - self.resize(340, 340) - self.setCaption(i18n("Create a new connection")) - vb = QVBoxLayout(self) - vb.setSpacing(6) - vb.setMargin(12) - - lab = QLabel(i18n("Select device:"), self) - vb.addWidget(lab) - - self.links = QListView(self) + NewConn.__init__(self, parent) + + self.links.header().hide() + self.fillLabels() + self.connect(self.links, SIGNAL("doubleClicked(QListViewItem *, const QPoint &, int)"), self.slotDouble) self.connect(self.links, SIGNAL("selectionChanged()"), self.slotSelection) self.connect(self.links, SIGNAL("collapsed(QListViewItem *)"), self.slotCollapse) - self.links.setAllColumnsShowFocus(True) - vb.addWidget(self.links) - self.links.addColumn("") - self.links.addColumn("") - self.links.header().hide() + links = comlink.links.values() links.sort(key=lambda x: x.name) - + comlink.device_hook.append(self.slotDevices) + for link in links: item = QListViewItem(self.links) item.setSelectable(False) @@ -52,25 +43,24 @@ item.setText(2, link.script) item.setOpen(True) comlink.queryDevices(link.script) - - hb = QHBox(self) - hb.setSpacing(6) - but = QPushButton(getIconSet("add", KIcon.Small), i18n("Create"), hb) - but.setEnabled(False) - self.connect(but, SIGNAL("clicked()"), self.accept) - but.setDefault(True) - self.but = but - - but = QPushButton(getIconSet("cancel", KIcon.Small), i18n("Cancel"), hb) - self.connect(but, SIGNAL("clicked()"), self.reject) - - vb.addWidget(hb) + + self.connect(self.createBut, SIGNAL("clicked()"), self.accept) + self.connect(self.cancelBut, SIGNAL("clicked()"), self.reject) + self.show() - + + def fillLabels(self): + self.setCaption(i18n("Create a new connection")) + self.deviceLabel.setText(i18n("Select device:")) + self.createBut.setIconSet(getIconSet("add", KIcon.Small)) + self.createBut.setText(i18n("Create")) + self.cancelBut.setIconSet(getIconSet("cancel", KIcon.Small)) + self.cancelBut.setText(i18n("Cancel")) + def reject(self): comlink.device_hook.remove(self.slotDevices) QDialog.reject(self) - + def accept(self): comlink.device_hook.remove(self.slotDevices) item = self.links.selectedItem() @@ -78,23 +68,23 @@ link = comlink.links[str(item.parent().text(2))] connection.Window(self.parent(), None, link, (str(item.text(2)), str(item.text(1)))) QDialog.accept(self) - + def slotDouble(self, item, point, col): if item and self.links.selectedItem() != None: self.links.setSelected(item, True) self.accept() - + def slotCollapse(self, item): item.setOpen(True) child = item.firstChild() if child: self.links.setCurrentItem(child) child.setSelected(True) - + def slotSelection(self): item = self.links.selectedItem() - self.but.setEnabled(item != None) - + self.createBut.setEnabled(item != None) + def slotDevices(self, script, devices): item = self.links.firstChild() parent = None @@ -111,7 +101,7 @@ else: item = QListViewItem(parent, "", i18n("No suitable device found")) item.setSelectable(False) - + def closeEvent(self, event): QDialog.closeEvent(self, event) Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Tue Oct 28 22:50:07 2008 @@ -62,9 +62,11 @@ 'handler.py', 'connection.py', 'widgets.py', - 'newconn.py', 'icons.py', 'comariface.py', + 'newconn.py', + 'newConn.ui', + 'newConn.py', 'nameconf.py', 'nameConf.ui', 'nameConf.py', From uludag-commits at pardus.org.tr Wed Oct 29 23:51:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 29 Oct 2008 23:51:51 +0200 (EET) Subject: [Uludag-commits] r20503 - trunk/planet/planet.pardus.org.tr Message-ID: <20081029215151.9B21313840C7@liste.pardus.org.tr> Author: ozan.caglayan Date: Wed Oct 29 23:51:51 2008 New Revision: 20503 Modified: trunk/planet/planet.pardus.org.tr/config.ini Log: tidy up Modified: trunk/planet/planet.pardus.org.tr/config.ini ================================================================= --- trunk/planet/planet.pardus.org.tr/config.ini (original) +++ trunk/planet/planet.pardus.org.tr/config.ini Wed Oct 29 23:51:51 2008 @@ -48,7 +48,7 @@ face = http://photos1.blogger.com/blogger/5018/1604/320/eu%20de%20novo.jpg [http://beboptech.blogspot.com/feeds/posts/default] -name = Amine Chadly +name = Amine Chadly [http://www.faikuygur.com/blog/feed/?cat=4] name = Faik Uygur @@ -59,15 +59,15 @@ [http://www.ratonred.com/?feed=atom&cat=13] name = Gökmen GÖKSEL -face= http://cekirdek.pardus.org.tr/~gokmen/img/head.png +face = http://cekirdek.pardus.org.tr/~gokmen/img/head.png [http://cekirdek.pardus.org.tr/~bahadir/zangetsu/blog/feed/rss/planet/] name = Bahadır Kandemir face = http://cekirdek.pardus.org.tr/~bahadir/files/kelle.png [http://feeds.feedburner.com/WeblogOfPinguar] -name=Pınar Yanardağ -face=http://cekirdek.pardus.org.tr/~pinar/images/pinguar.png +name = Pınar Yanardağ +face = http://cekirdek.pardus.org.tr/~pinar/images/pinguar.png [http://ekin.fisek.com.tr/blog/wp-rss2.php?cat=12] name = Ekin Meroğlu From uludag-commits at pardus.org.tr Thu Oct 30 01:00:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:00:12 +0200 (EET) Subject: [Uludag-commits] r20504 - trunk/tasma/network-manager Message-ID: <20081029230012.9BF3013841A5@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:00:12 2008 New Revision: 20504 Added: trunk/tasma/network-manager/settingsWindow.py trunk/tasma/network-manager/settingsWindow.ui Modified: trunk/tasma/network-manager/connection.py trunk/tasma/network-manager/setup.py Log: connection settings window breaks comar and wireless-tools Modified: trunk/tasma/network-manager/connection.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Thu Oct 30 01:00:12 2008 @@ -60,10 +60,12 @@ 'browser.py', 'autoswitch.py', 'handler.py', - 'connection.py', 'widgets.py', 'icons.py', 'comariface.py', + 'connection.py', + 'settingsWindow.py', + 'settingsWindow.ui', 'newconn.py', 'newConn.ui', 'newConn.py', From uludag-commits at pardus.org.tr Thu Oct 30 01:00:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:00:47 +0200 (EET) Subject: [Uludag-commits] r20505 - trunk/tasma/network-manager Message-ID: <20081029230048.032F713841A8@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:00:47 2008 New Revision: 20505 Modified: trunk/tasma/network-manager/comariface.py Log: will find a way to make these (keytype, keymode) auto Modified: trunk/tasma/network-manager/comariface.py ================================================================= --- trunk/tasma/network-manager/comariface.py (original) +++ trunk/tasma/network-manager/comariface.py Thu Oct 30 01:00:47 2008 @@ -315,7 +315,7 @@ ch2.call() def handleConnectionInfo(self, script, info): - def handler(conn, mode, username, password, channel, auth, anon, inner, clicert, cacert, prikey, prikeypass): + def handler(conn, mode, username, password, channel, auth, anon, inner, clicert, cacert, prikey, prikeypass, kmode, ktype): conn.got_auth = True conn.auth_mode = mode conn.auth_user = username @@ -328,6 +328,8 @@ conn.auth_client_cert = clicert conn.auth_private_key = prikey conn.auth_private_key_pass = prikeypass + conn.keymode = kmode + conn.keytype = ktype if conn.first_time: conn.first_time = False From uludag-commits at pardus.org.tr Thu Oct 30 01:46:23 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:46:23 +0200 (EET) Subject: [Uludag-commits] r20506 - trunk/tasma/network-manager Message-ID: <20081029234623.99C2C13841A5@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:46:23 2008 New Revision: 20506 Modified: trunk/tasma/network-manager/connection.py Log: missing i18n Modified: trunk/tasma/network-manager/connection.py ================================================================= --- trunk/tasma/network-manager/connection.py (original) +++ trunk/tasma/network-manager/connection.py Thu Oct 30 01:46:23 2008 @@ -273,11 +273,10 @@ def fillLabels(self): self.connectionGroupBox.setTitle(i18n("Connection")) - self.authenticationGroupBox.setTitle(i18n("Authentication")) self.addressGroupBox.setTitle(i18n("Address Settings")) - self.dnsGroupBox.setTitle(i18n("Name Server")) - self.nameLabel.setText(i18n("Name :")) - self.deviceLabel.setText(i18n("Device :")) + self.dnsGroupBox.setTitle(i18n("Name Server Settings")) + self.nameLabel.setText(i18n("Name")) + self.deviceLabel.setText(i18n("Device")) self.devices_but.setText(i18n("Select")) self.ssidLabel.setText(unicode(self.link.remote_name)) self.r1.setText(i18n("Automatic query (DHCP)")) @@ -290,6 +289,18 @@ self.dns1.setText(i18n("Default")) self.dns2.setText(i18n("Automatic")) self.dns3.setText(i18n("Custom")) + self.security_mode_label.setText("Security")) + self.auth_private_key_label.setText(i18n("Private Key File :")) + self.auth_private_key_pass_label.setText(i18n("Private Key Password :")) + self.auth_ca_cert_label.setText(i18n("CA Certificate :")) + self.auth_client_cert_label.setText(i18n("Client Certificate :")) + self.auth_passphrase_label.setText(i18n("Password :")) + self.auth_user_label.setText(i18n("User/Identity :")) + self.auth_anon_id_label.setText(i18n("Anonymous User :")) + self.auth_inner_label.setText(i18n("Inner Authentication")) + self.auth_mode_label.setText(i18n("Authentication")) + self.auth_key_type_label.setText(i18n("Key Type")) + self.auth_key_mode_label.setText(i18n("Mode")) self.auth_client_cert_but.setText(i18n("browse")) self.auth_client_cert_but.setIconSet(getIconSet("file", KIcon.Small)) self.auth_ca_cert_but.setText(i18n("browse")) From uludag-commits at pardus.org.tr Thu Oct 30 01:46:56 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:46:56 +0200 (EET) Subject: [Uludag-commits] r20507 - trunk/tasma/network-manager/ui Message-ID: <20081029234656.5627813841A5@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:46:56 2008 New Revision: 20507 Added: trunk/tasma/network-manager/ui/ trunk/tasma/network-manager/ui/connSharing.py (props changed) - copied unchanged from r20496, trunk/tasma/network-manager/connSharing.py trunk/tasma/network-manager/ui/connSharing.ui (props changed) - copied unchanged from r20496, trunk/tasma/network-manager/connSharing.ui trunk/tasma/network-manager/ui/nameConf.py (props changed) - copied unchanged from r20500, trunk/tasma/network-manager/nameConf.py trunk/tasma/network-manager/ui/nameConf.ui (props changed) - copied unchanged from r20500, trunk/tasma/network-manager/nameConf.ui trunk/tasma/network-manager/ui/newConn.py (props changed) - copied unchanged from r20502, trunk/tasma/network-manager/newConn.py trunk/tasma/network-manager/ui/newConn.ui (props changed) - copied unchanged from r20502, trunk/tasma/network-manager/newConn.ui trunk/tasma/network-manager/ui/settingsWindow.py (props changed) - copied unchanged from r20504, trunk/tasma/network-manager/settingsWindow.py trunk/tasma/network-manager/ui/settingsWindow.ui (props changed) - copied unchanged from r20504, trunk/tasma/network-manager/settingsWindow.ui Log: move these to a subdir From uludag-commits at pardus.org.tr Thu Oct 30 01:47:16 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:47:16 +0200 (EET) Subject: [Uludag-commits] r20508 - trunk/tasma/network-manager/po Message-ID: <20081029234716.1839A13841A5@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:47:15 2008 New Revision: 20508 Modified: trunk/tasma/network-manager/po/ca.po trunk/tasma/network-manager/po/de.po trunk/tasma/network-manager/po/es.po trunk/tasma/network-manager/po/fr.po trunk/tasma/network-manager/po/it.po trunk/tasma/network-manager/po/network-manager.pot trunk/tasma/network-manager/po/nl.po trunk/tasma/network-manager/po/pl.po trunk/tasma/network-manager/po/pt_BR.po trunk/tasma/network-manager/po/sv.po trunk/tasma/network-manager/po/tr.po Log: update messages Modified: trunk/tasma/network-manager/po/ca.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/de.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/es.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/fr.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/it.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/network-manager.pot ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/nl.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/pl.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/pt_BR.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/sv.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/network-manager/po/tr.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Thu Oct 30 01:47:43 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 01:47:43 +0200 (EET) Subject: [Uludag-commits] r20509 - trunk/tasma/network-manager Message-ID: <20081029234744.0661C13841A5@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 01:47:43 2008 New Revision: 20509 Removed: trunk/tasma/network-manager/connSharing.py trunk/tasma/network-manager/connSharing.ui trunk/tasma/network-manager/nameConf.py trunk/tasma/network-manager/nameConf.ui trunk/tasma/network-manager/newConn.py trunk/tasma/network-manager/newConn.ui trunk/tasma/network-manager/settingsWindow.py trunk/tasma/network-manager/settingsWindow.ui Modified: trunk/tasma/network-manager/setup.py Log: moved to ui folder Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Thu Oct 30 01:47:43 2008 @@ -22,7 +22,8 @@ distfiles = """ README *.py - *.ui + ui/*.ui + ui/*.py *.desktop images/*.png help/*.css @@ -64,17 +65,17 @@ 'icons.py', 'comariface.py', 'connection.py', - 'settingsWindow.py', - 'settingsWindow.ui', + 'ui/settingsWindow.py', + 'ui/settingsWindow.ui', 'newconn.py', - 'newConn.ui', - 'newConn.py', + 'ui/newConn.ui', + 'ui/newConn.py', 'nameconf.py', - 'nameConf.ui', - 'nameConf.py', + 'ui/nameConf.ui', + 'ui/nameConf.py', 'connsharing.py', - 'connSharing.ui', - 'connSharing.py', + 'ui/connSharing.ui', + 'ui/connSharing.py', ('/usr/share/autostart/', ['network-applet.desktop']), ('/usr/kde/3.5/share/applications/kde/', ['network-applet.desktop']), 'images/wireless-online.png', From uludag-commits at pardus.org.tr Thu Oct 30 03:36:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 03:36:36 +0200 (EET) Subject: [Uludag-commits] r20510 - trunk/tasma/network-manager Message-ID: <20081030013636.A934C13841AB@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 03:36:35 2008 New Revision: 20510 Modified: trunk/tasma/network-manager/connection.py Log: typo Modified: trunk/tasma/network-manager/connection.py ================================================================= --- trunk/tasma/network-manager/connection.py (original) +++ trunk/tasma/network-manager/connection.py Thu Oct 30 03:36:35 2008 @@ -289,7 +289,7 @@ self.dns1.setText(i18n("Default")) self.dns2.setText(i18n("Automatic")) self.dns3.setText(i18n("Custom")) - self.security_mode_label.setText("Security")) + self.security_mode_label.setText(i18n("Security")) self.auth_private_key_label.setText(i18n("Private Key File :")) self.auth_private_key_pass_label.setText(i18n("Private Key Password :")) self.auth_ca_cert_label.setText(i18n("CA Certificate :")) From uludag-commits at pardus.org.tr Thu Oct 30 11:50:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 11:50:29 +0200 (EET) Subject: [Uludag-commits] r20511 - in trunk/staj-projeleri/paket-arama: . search Message-ID: <20081030095029.2FE361384113@liste.pardus.org.tr> Author: emre.aladag Date: Thu Oct 30 11:50:28 2008 New Revision: 20511 Modified: trunk/staj-projeleri/paket-arama/local_settings.py trunk/staj-projeleri/paket-arama/search/settings.py Log: * Put DEBUG mode OFF * Removed 2007 from local_settings.py * This is for publishing a beta version Modified: trunk/staj-projeleri/paket-arama/local_settings.py ================================================================= --- trunk/staj-projeleri/paket-arama/local_settings.py (original) +++ trunk/staj-projeleri/paket-arama/local_settings.py Thu Oct 30 11:50:28 2008 @@ -1,5 +1,5 @@ # Can add/remove a version support here -versions = [2007, 2008] +versions = [2008] #2007,2008 # Paths WEB_URL = 'http://paketler.pardus.org.tr/search' Modified: trunk/staj-projeleri/paket-arama/search/settings.py ================================================================= --- trunk/staj-projeleri/paket-arama/search/settings.py (original) +++ trunk/staj-projeleri/paket-arama/search/settings.py Thu Oct 30 11:50:28 2008 @@ -1,7 +1,7 @@ # Django settings for search project. -DEBUG = True -TEMPLATE_DEBUG = True #DEBUG +DEBUG = False +TEMPLATE_DEBUG = False #DEBUG WEB_URL = 'http://localhost/search' From uludag-commits at pardus.org.tr Thu Oct 30 19:34:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 19:34:04 +0200 (EET) Subject: [Uludag-commits] r20512 - trunk/tasma/network-manager Message-ID: <20081030173404.E747A138419C@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 19:34:04 2008 New Revision: 20512 Modified: trunk/tasma/network-manager/network-manager.py Log: tidy ( remove whitespaces ) change confusing variable (self) in attachMainWidget Modified: trunk/tasma/network-manager/network-manager.py ================================================================= --- trunk/tasma/network-manager/network-manager.py (original) +++ trunk/tasma/network-manager/network-manager.py Thu Oct 30 19:34:04 2008 @@ -40,17 +40,16 @@ "bugs at pardus.org.tr" ) -def attachMainWidget(self): +def attachMainWidget(win): KGlobal.iconLoader().addAppDir(mod_app) icons.load_icons() # Import module after setting DBus mainloop # This module makes async. calls on startup import browser - self.mainwidget = browser.Widget(self) - toplayout = QVBoxLayout(self, 0, KDialog.spacingHint()) - toplayout.addWidget(self.mainwidget) - self.aboutus = KAboutApplication(self) - + win.mainwidget = browser.Widget(win) + toplayout = QVBoxLayout(win, 0, KDialog.spacingHint()) + toplayout.addWidget(win.mainwidget) + win.aboutus = KAboutApplication(win) class Module(KCModule): def __init__(self, parent, name): @@ -60,7 +59,7 @@ self.setButtons(0) self.aboutdata = AboutData() attachMainWidget(self) - + def aboutData(self): return self.aboutdata @@ -68,8 +67,7 @@ # KCModule factory def create_network_manager(parent, name): global kapp - - kapp = KApplication.kApplication() + kapp = KUniqueApplication.kApplication() if not dbus.get_default_main_loop(): DBusQtMainLoop(set_as_default=True) return Module(parent, name) @@ -77,14 +75,15 @@ # Standalone def main(): global kapp - + about = AboutData() KCmdLineArgs.init(sys.argv, about) KCmdLineArgs.addCmdLineOptions ([("auto-connect", I18N_NOOP("Just try to connect automatically"))]) KUniqueApplication.addCmdLineOptions() - args = KCmdLineArgs.parsedArgs() - + """ + args = KCmdLineArgs.parsedArgs() + if args.isSet("auto-connect"): # Import module after setting DBus mainloop # This module makes async. calls on startup @@ -93,20 +92,20 @@ autoSwitch.scanAndConnect(force=True) sys.exit() """ - + if not KUniqueApplication.start(): print i18n("Network manager module is already started!") return - + kapp = KUniqueApplication(True, True, True) win = QDialog() - + DBusQtMainLoop(set_as_default=True) - + # PolicyKit Agent requires window ID from comariface import comlink comlink.winID = win.winId() - + win.setCaption(i18n("Network Manager")) win.setMinimumSize(500, 440) win.resize(620, 440) @@ -115,6 +114,6 @@ kapp.setMainWidget(win) sys.exit(win.exec_loop()) - if __name__ == "__main__": main() + From uludag-commits at pardus.org.tr Thu Oct 30 19:52:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 19:52:04 +0200 (EET) Subject: [Uludag-commits] r20513 - trunk/tasma/network-manager Message-ID: <20081030175204.4FB2D1384156@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 19:52:03 2008 New Revision: 20513 Modified: trunk/tasma/network-manager/autoswitch.py Log: * hash is a builtin function * remove whitespaces Modified: trunk/tasma/network-manager/autoswitch.py ================================================================= --- trunk/tasma/network-manager/autoswitch.py (original) +++ trunk/tasma/network-manager/autoswitch.py Thu Oct 30 19:52:03 2008 @@ -45,27 +45,27 @@ # Get wireless devices & profiles devices = [] profiles = [] - for hash, conn in self.comlink.connections.iteritems(): + for myhash, conn in self.comlink.connections.iteritems(): if conn.script == 'wireless_tools': if conn.devid not in devices: devices.append(conn.devid) profiles.append(conn) - + # If there is no wi-fi device, go on if not profiles or not devices: return - + # If already connected, go on for profile in profiles: if profile.state == "up": return - + self.notify(i18n("Scanning..."), SUCCESS) - + # Get current APs justEssIds = [] justMacAddr = [] - + def handler(remotes): if remotes: for remote in remotes: @@ -88,12 +88,12 @@ self.notify(i18n("There is no matched profile"),FAIL) else: self.notify(i18n("No scan result"),FAIL) - + for dev in devices: ch = self.comlink.callHandler("wireless_tools", "Net.Link", "scanRemote", "tr.org.pardus.comar.net.link.get") ch.registerDone(handler) ch.call(dev) - + def connect(self, profile, force=False): profileName = profile.name if not profile.state.startswith('up') or force: @@ -101,3 +101,4 @@ self.notify(m % profileName) ch = self.comlink.callHandler("wireless_tools", "Net.Link", "setState", "tr.org.pardus.comar.net.link.setstate") ch.call(profileName, "up") + From uludag-commits at pardus.org.tr Thu Oct 30 20:40:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 20:40:51 +0200 (EET) Subject: [Uludag-commits] r20514 - trunk/tasma/network-manager Message-ID: <20081030184051.8541913841F6@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 20:40:51 2008 New Revision: 20514 Modified: trunk/tasma/network-manager/browser.py Log: * remove some unused variables * added ConnectionTipper __init__ function * remove whitespaces Modified: trunk/tasma/network-manager/browser.py ================================================================= --- trunk/tasma/network-manager/browser.py (original) +++ trunk/tasma/network-manager/browser.py Thu Oct 30 20:40:51 2008 @@ -37,15 +37,19 @@ class ConnectionTipper(QToolTip): + def __init__(self, parent): + QToolTip.__init__(self, parent) + self.parent = parent + def maybeTip(self, point): conn = self.parent - + rect = conn.rect() rect.setWidth(rect.width() - conn.del_but.myWidth - conn.edit_but.myWidth - 6 - 6 - 4) rect.setX(rect.x() + conn.pix_start) if not rect.contains(point): return - + conn = conn.conn link = comlink.links[conn.script] tip = "" @@ -72,7 +76,7 @@ tip += i18n("Mod:") tip += " %s" % capitalize(conn.device_mode) tip += "" - + self.tip(rect, tip) @@ -87,12 +91,12 @@ self.tipper = ConnectionTipper(self) self.tipper.parent = self dev.connections.append(self) - + self.view = view self.conn = conn - + self.edit = None - + self.mypix = icons.get_state(comlink.links[conn.script].type, conn.state) if self.conn.state in ("inaccessible", "unavailable"): self.mypix = KIconEffect().apply(self.mypix, KIconEffect.ToGray, 1, QColor(), False) @@ -102,45 +106,44 @@ self.check.setGeometry(6, 3, 16, 16) self.connect(self.check, SIGNAL("toggled(bool)"), self.slotToggle) self.check.setAutoMask(True) - + w = self.check.width() self.pix_start = 6 + w + 3 w = self.mypix.width() self.text_start = self.pix_start + w + 6 - + view.connections[conn.hash] = self - + self.edit_but = IconButton("configure", self) QToolTip.add(self.edit_but, i18n("Configure connection")) self.connect(self.edit_but, SIGNAL("clicked()"), self.slotEdit) self.del_but = IconButton("cancel", self) QToolTip.add(self.del_but, i18n("Delete connection")) self.connect(self.del_but, SIGNAL("clicked()"), self.slotDelete) - + self.show() - + self.ignore_signal = False - + def slotToggle(self, on): if self.ignore_signal: return - dev = self.parent() state = "down" if on: state = "up" - + self.view.setEnabled(False) ch = comlink.callHandler(self.conn.script, "Net.Link", "setState", "tr.org.pardus.comar.net.link.setstate") ch.call(self.conn.name, state) self.view.setEnabled(True) - + def slotDelete(self): conn = self.conn m = i18n("Should I delete the\n'%s'\nconnection?") if KMessageBox.Yes == KMessageBox.questionYesNo(self, unicode(m) % conn.name, i18n("Delete connection?")): ch = comlink.callHandler(self.conn.script, "Net.Link", "deleteConnection", "tr.org.pardus.comar.net.link.set") ch.call(conn.name) - + def slotEdit(self): if self.edit: try: @@ -150,10 +153,10 @@ except RuntimeError: pass self.edit = connection.Window(self.view.parent(), self.conn) - + def mouseDoubleClickEvent(self, event): self.slotEdit() - + def updateState(self): self.ignore_signal = True self.check.setChecked(self.conn.state in ("up", "connecting", "inaccessible")) @@ -162,7 +165,7 @@ if self.conn.state in ("inaccessible", "unavailable"): self.mypix = KIconEffect().apply(self.mypix, KIconEffect.ToGray, 1, QColor(), False) self.update() - + def addressText(self): text = "" if self.conn.state == "up": @@ -173,7 +176,7 @@ if self.conn.message: text = unicode(self.conn.message) return text - + def paintEvent(self, event): paint = QPainter(self) col = KGlobalSettings.baseColor() @@ -194,7 +197,7 @@ paint.restore() fm = self.fontMetrics() paint.drawText(self.text_start, 5 + fark + 3 + fm.ascent(), self.addressText()) - + def resizeEvent(self, event): w = event.size().width() h = event.size().height() @@ -204,7 +207,7 @@ self.del_but.setGeometry(w - self.del_but.myWidth - 6 - 6, dip, self.del_but.myWidth, self.del_but.myHeight) self.edit_but.setGeometry(w - self.del_but.myWidth - 6 - 6 - self.edit_but.myWidth - 3, dip, self.edit_but.myWidth, self.edit_but.myHeight) return QWidget.resizeEvent(self, event) - + def sizeHint(self): f = QFont(self.font()) f.setPointSize(f.pointSize() + 2) @@ -242,7 +245,6 @@ return rect.height() + 7 def paintEvent(self, event): - cg = self.colorGroup() QWidget.paintEvent(self, event) paint = QPainter(self) paint.fillRect(QRect(0, 0, self.width(), self.myHeight()), QBrush(KGlobalSettings.buttonBackground(), Qt.Dense3Pattern)) From uludag-commits at pardus.org.tr Thu Oct 30 20:51:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 20:51:24 +0200 (EET) Subject: [Uludag-commits] r20515 - trunk/tasma/network-manager Message-ID: <20081030185124.E4B3613841F6@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 20:51:24 2008 New Revision: 20515 Modified: trunk/tasma/network-manager/connsharing.py Log: * hash is a builtin function * there is no setupBusses function implemented, commented it out * this is not a standalone application and can not be used this way ever, so removed main function Modified: trunk/tasma/network-manager/connsharing.py ================================================================= --- trunk/tasma/network-manager/connsharing.py (original) +++ trunk/tasma/network-manager/connsharing.py Thu Oct 30 20:51:24 2008 @@ -41,7 +41,7 @@ self.profiles = [] self.intcombo.clear() self.sharecombo.clear() - for hash, profile in comlink.connections.iteritems(): + for myhash, profile in comlink.connections.iteritems(): if profile in self.profiles: continue if profile.script != "net_tools" and profile.script != "wireless_tools": @@ -72,7 +72,8 @@ def busError(self, exception): KMessageBox.error(self, str(exception), i18n("D-Bus Error")) - self.setupBusses() + # where is setupBusses ? + # self.setupBusses() def comarError(self, exception): KMessageBox.error(self, str(exception), i18n("COMAR Error")) @@ -272,20 +273,3 @@ self.applyBut.setEnabled(True) -if __name__ == "__main__": - - """ do we need this ? without dbus mainloop this is useless i guess """ - - appname = "" - description = "" - version = "" - - KCmdLineArgs.init(sys.argv, appname, description, version) - a = KApplication() - - QObject.connect(a, SIGNAL("lastWindowClosed()"), a, SLOT("quit()")) - w = connShare(None) - a.setMainWidget(w) - w.show() - a.exec_loop() - From uludag-commits at pardus.org.tr Thu Oct 30 21:04:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 21:04:55 +0200 (EET) Subject: [Uludag-commits] r20516 - trunk/tasma/network-manager Message-ID: <20081030190455.BD79C13841F7@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 21:04:55 2008 New Revision: 20516 Modified: trunk/tasma/network-manager/connsharing.py trunk/tasma/network-manager/nameconf.py trunk/tasma/network-manager/newconn.py trunk/tasma/network-manager/widgets.py Log: remove not used imports and classes Modified: trunk/tasma/network-manager/connsharing.py ================================================================= --- trunk/tasma/network-manager/connsharing.py (original) +++ trunk/tasma/network-manager/connsharing.py Thu Oct 30 21:04:55 2008 @@ -7,8 +7,6 @@ # # WARNING! All changes made in this file will be lost! - -import sys from qt import * from kdecore import * from kdeui import * Modified: trunk/tasma/network-manager/nameconf.py ================================================================= --- trunk/tasma/network-manager/nameconf.py (original) +++ trunk/tasma/network-manager/nameconf.py Thu Oct 30 21:04:55 2008 @@ -12,7 +12,6 @@ from qt import * from kdecore import * from kdeui import * -import widgets from icons import getIconSet from comariface import comlink Modified: trunk/tasma/network-manager/newconn.py ================================================================= --- trunk/tasma/network-manager/newconn.py (original) +++ trunk/tasma/network-manager/newconn.py Thu Oct 30 21:04:55 2008 @@ -13,7 +13,6 @@ from kdecore import * import connection -import widgets from icons import icons, getIconSet from comariface import comlink Modified: trunk/tasma/network-manager/widgets.py ================================================================= --- trunk/tasma/network-manager/widgets.py (original) +++ trunk/tasma/network-manager/widgets.py Thu Oct 30 21:04:55 2008 @@ -10,46 +10,12 @@ # import os -import locale from qt import * from kdecore import * from khtml import * from icons import getIconSet - -class Edit(QHBox): - def __init__(self, parent, is_password=False): - QHBox.__init__(self, parent) - - self.edit = QLineEdit(self) - self.setStretchFactor(self.edit, 3) - if is_password: - self.edit.setEchoMode(QLineEdit.Password) - - self.layout().insertStretch(-1, 2) - - -class HLine(QHBox): - def __init__(self, title, parent, pixmap=None): - QHBox.__init__(self, parent) - self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) - self.setSpacing(6) - - line = QFrame(self) - line.setFrameStyle(line.HLine | line.Sunken) - line.setFixedWidth(24) - - if pixmap: - gfx = QLabel(self) - gfx.setPixmap(getIconSet(pixmap).pixmap(QIconSet.Small, QIconSet.Normal)) - text = QLabel(unicode(title), self) - - line = QFrame(self) - line.setFrameStyle(line.HLine | line.Sunken) - self.setStretchFactor(line, 8) - - class HelpDialog(QDialog): def __init__(self, name, title, parent=None): QDialog.__init__(self, parent) @@ -58,7 +24,7 @@ self.htmlPart = KHTMLPart(self) self.resize(500, 600) self.layout.addWidget(self.htmlPart.view(), 1, 1) - + lang = str(KGlobal().locale().language()) if "_" in lang: lang = lang.split("_", 1)[0] @@ -70,3 +36,4 @@ def closeEvent(self, event): QDialog.closeEvent(self, event) + From uludag-commits at pardus.org.tr Thu Oct 30 21:13:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 21:13:33 +0200 (EET) Subject: [Uludag-commits] r20517 - trunk/tasma/network-manager Message-ID: <20081030191333.526FC13841F6@liste.pardus.org.tr> Author: isbaran Date: Thu Oct 30 21:13:33 2008 New Revision: 20517 Modified: trunk/tasma/network-manager/network-applet.py Log: * type and hash are builtin functions * removed unused variable Modified: trunk/tasma/network-manager/network-applet.py ================================================================= --- trunk/tasma/network-manager/network-applet.py (original) +++ trunk/tasma/network-manager/network-applet.py Thu Oct 30 21:13:33 2008 @@ -293,8 +293,8 @@ ch.call() def getConn(self, script, name): - hash = Connection.hash(script, name) - return self.connections.get(hash, None) + myhash = Connection.hash(script, name) + return self.connections.get(myhash, None) def getConnById(self, mid): for dev in self.devices.values(): @@ -329,14 +329,14 @@ def get_state(self, script, state): link = comlink.links.get(script, None) if link: - type = link.type + mytype = link.type else: - type = "net" + mytype = "net" if not type in ("net", "wifi", "dialup"): - type = "net" + mytype = "net" if not state in ("up", "connecting", "down"): state = "down" - return self.iconmap.get("%s-%s" % (type, state)) + return self.iconmap.get("%s-%s" % (mytype, state)) def getPath(self,icon): return KGlobal.iconLoader().iconPath(icon, KIcon.Desktop, True) @@ -682,7 +682,6 @@ KSystemTray.mousePressEvent(self, event) def slotSelect(self, mid): - menu = self.contextMenu() conn = comlink.getConnById(mid) if conn.state in ("up", "connecting", "inaccessible"): state = "down" From uludag-commits at pardus.org.tr Thu Oct 30 23:41:08 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 30 Oct 2008 23:41:08 +0200 (EET) Subject: [Uludag-commits] r20518 - trunk/tasma/package-manager Message-ID: <20081030214108.358C6138420E@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu Oct 30 23:41:07 2008 New Revision: 20518 Modified: trunk/tasma/package-manager/todo2 Log: Fatih'in de katkısıyla eklemeler yapalım Modified: trunk/tasma/package-manager/todo2 ================================================================= --- trunk/tasma/package-manager/todo2 (original) +++ trunk/tasma/package-manager/todo2 Thu Oct 30 23:41:07 2008 @@ -3,3 +3,5 @@ - Performans iyileştirmeleri (profiling + paket bilgilerinin pakete tıklanınca alınması) - Log ve debug desteği - Alınan bir exception'da mouse'un mesgul işaretinden normal'e dönmesi ve exception'ın ekranda gösterilmesi +- Paket ikonu SVG olunca, gösterilemiyor +- Paket ikonlarının index'e yazılması planı, böylece kurulu olmayan paketlerin de ikonunun gözükmesi From uludag-commits at pardus.org.tr Fri Oct 31 07:48:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 31 Oct 2008 07:48:39 +0200 (EET) Subject: [Uludag-commits] r20519 - trunk/planet/gezegen.pardus.org.tr Message-ID: <20081031054839.1AA3A1384125@liste.pardus.org.tr> Author: pinar Date: Fri Oct 31 07:48:38 2008 New Revision: 20519 Modified: trunk/planet/gezegen.pardus.org.tr/config.ini Log: update feed Modified: trunk/planet/gezegen.pardus.org.tr/config.ini ================================================================= --- trunk/planet/gezegen.pardus.org.tr/config.ini (original) +++ trunk/planet/gezegen.pardus.org.tr/config.ini Fri Oct 31 07:48:38 2008 @@ -141,7 +141,7 @@ name=Ozan Çağlayan face=http://cekirdek.pardus.org.tr/~ozan/ivir/face.png -[http://pinguar.org/gunluk/category/pardus/feed] +[http://feeds.feedburner.com/pinguar-all] name=Pınar Yanardağ face=http://cekirdek.pardus.org.tr/~pinar/images/pinguar.png From uludag-commits at pardus.org.tr Fri Oct 31 11:19:03 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 31 Oct 2008 11:19:03 +0200 (EET) Subject: [Uludag-commits] r20520 - in trunk/pisi/pisi: . cli Message-ID: <20081031091904.017561384223@liste.pardus.org.tr> Author: faik Date: Fri Oct 31 11:19:03 2008 New Revision: 20520 Modified: trunk/pisi/pisi/api.py trunk/pisi/pisi/cli/build.py Log: pisi.api.install is locked... build calls it Modified: trunk/pisi/pisi/api.py ================================================================= --- trunk/pisi/pisi/api.py (original) +++ trunk/pisi/pisi/api.py Fri Oct 31 11:19:03 2008 @@ -744,11 +744,9 @@ def reorder_base_packages(*args, **kw): return pisi.operations.helper.reorder_base_packages(*args, **kw) - at locked def build_until(*args, **kw): return pisi.operations.build.build_until(*args, **kw) - at locked def build(*args, **kw): return pisi.atomicoperations.build(*args, **kw) Modified: trunk/pisi/pisi/cli/build.py ================================================================= --- trunk/pisi/pisi/cli/build.py (original) +++ trunk/pisi/pisi/cli/build.py Fri Oct 31 11:19:03 2008 @@ -66,8 +66,6 @@ default=False, help=_("Bypass testing step")) group.add_option("--create-static", action="store_true", default=False, help=_("Create a static package with ar files")) - group.add_option("--no-install", action="store_true", - default=False, help=_("Do not install build dependencies, fail if a build dependency is present")) group.add_option("-F", "--package-format", action="store", default='1.1', help=_("PiSi binary package formats: '1.0', '1.1' (default)")) group.add_option("--use-quilt", action="store_true", default=False, From uludag-commits at pardus.org.tr Fri Oct 31 15:25:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 31 Oct 2008 15:25:31 +0200 (EET) Subject: [Uludag-commits] r20521 - in trunk/pisi/pisi: cli operations Message-ID: <20081031132531.978C41384233@liste.pardus.org.tr> Author: faik Date: Fri Oct 31 15:25:31 2008 New Revision: 20521 Modified: trunk/pisi/pisi/cli/build.py trunk/pisi/pisi/operations/build.py Log: no_install da gitsin Modified: trunk/pisi/pisi/cli/build.py ================================================================= --- trunk/pisi/pisi/cli/build.py (original) +++ trunk/pisi/pisi/cli/build.py Fri Oct 31 15:25:31 2008 @@ -96,10 +96,7 @@ self.help() return - if self.options.no_install: - self.init(database=True, write=False) - else: - self.init() + self.init() if ctx.get_option('package_format') not in Build.package_formats: raise Error(_('package_format must be one of %s ') % pisi.util.strlist(Build.package_formats)) Modified: trunk/pisi/pisi/operations/build.py ================================================================= --- trunk/pisi/pisi/operations/build.py (original) +++ trunk/pisi/pisi/operations/build.py Fri Oct 31 15:25:31 2008 @@ -514,9 +514,6 @@ def fail(): raise Error(_('Cannot build package due to unsatisfied build dependencies')) - if ctx.config.get_option('no_install'): - fail() - if not ctx.config.get_option('ignore_dependency'): for dep in dep_unsatis: if not dependency.repo_satisfies_dep(dep): From uludag-commits at pardus.org.tr Fri Oct 31 15:33:12 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 31 Oct 2008 15:33:12 +0200 (EET) Subject: [Uludag-commits] r20522 - branches/buildfarm-delta Message-ID: <20081031133312.30D601384233@liste.pardus.org.tr> Author: ozan.caglayan Date: Fri Oct 31 15:33:11 2008 New Revision: 20522 Modified: branches/buildfarm-delta/main.py Log: Be verbose when packages.db is not found Modified: branches/buildfarm-delta/main.py ================================================================= --- branches/buildfarm-delta/main.py (original) +++ branches/buildfarm-delta/main.py Fri Oct 31 15:33:11 2008 @@ -42,7 +42,12 @@ f.close() # Unpickle and load ISO package list here - isopackages = cPickle.Unpickler(open("data/packages.db", "rb")).load() + try: + isopackages = cPickle.Unpickler(open("data/packages.db", "rb")).load() + except: + logger.error("You have to put packages.db in data/ for delta generation.") + os.unlink("/var/run/buildfarm") + sys.exit(1) logger.raw("QUEUE") logger.info("*** Work Queue: %s" % qmgr.workQueue)