From uludag-commits at pardus.org.tr Sat Sep 1 00:05:48 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 00:05:48 +0300 (EEST) Subject: [Uludag-commits] r15238 - trunk/comar/zorg Message-ID: <20070831210548.E56DC7C00C1@liste.uludag.org.tr> Author: erdinc Date: Sat Sep 1 00:05:48 2007 New Revision: 15238 Modified: trunk/comar/zorg/xdriverlist Log: more nv.. Modified: trunk/comar/zorg/xdriverlist ================================================================= --- trunk/comar/zorg/xdriverlist (original) +++ trunk/comar/zorg/xdriverlist Sat Sep 1 00:05:48 2007 @@ -626,6 +626,7 @@ 10de029d nv 10de029e nv 10de029f nv +10de02e1 nv 10de0300 nv 10de0301 nv 10de0302 nv From uludag-commits at pardus.org.tr Sat Sep 1 00:18:39 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 00:18:39 +0300 (EEST) Subject: [Uludag-commits] r15239 - trunk/comar/zorg Message-ID: <20070831211839.AF2E07C00D3@liste.uludag.org.tr> Author: erdinc Date: Sat Sep 1 00:18:39 2007 New Revision: 15239 Modified: trunk/comar/zorg/xdriverlist Log: more nv.. Modified: trunk/comar/zorg/xdriverlist ================================================================= --- trunk/comar/zorg/xdriverlist (original) +++ trunk/comar/zorg/xdriverlist Sat Sep 1 00:18:39 2007 @@ -694,6 +694,8 @@ 10de0402 nv 10de0407 nv 10de040b nv +10de040c nv +10de040d nv 10de0421 nv 10de0422 nv 10de0423 nv From uludag-commits at pardus.org.tr Sat Sep 1 00:20:44 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 00:20:44 +0300 (EEST) Subject: [Uludag-commits] r15240 - trunk/comar/zorg Message-ID: <20070831212044.C9CAA7C00D3@liste.uludag.org.tr> Author: erdinc Date: Sat Sep 1 00:20:44 2007 New Revision: 15240 Modified: trunk/comar/zorg/xdriverlist Log: more nv.. Modified: trunk/comar/zorg/xdriverlist ================================================================= --- trunk/comar/zorg/xdriverlist (original) +++ trunk/comar/zorg/xdriverlist Sat Sep 1 00:20:44 2007 @@ -706,6 +706,7 @@ 10de0429 nv 10de042a nv 10de042b nv +10de042d nv 10e09128 imstt 10e09135 imstt 10ea2010 fbdev From uludag-commits at pardus.org.tr Sat Sep 1 12:56:11 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 12:56:11 +0300 (EEST) Subject: [Uludag-commits] r15241 - in trunk/pijama: . locale/tr/LC_MESSAGES pijidb templates Message-ID: <20070901095611.696B47C00C4@liste.uludag.org.tr> Author: oguzy Date: Sat Sep 1 12:56:10 2007 New Revision: 15241 Added: trunk/pijama/locale/tr/LC_MESSAGES/django.mo (contents, props changed) trunk/pijama/templates/HeadLogo.png (contents, props changed) trunk/pijama/templates/HeadTile.png (contents, props changed) trunk/pijama/templates/base.html~ trunk/pijama/templates/base_main.html~ trunk/pijama/templates/binary.html~ trunk/pijama/templates/binarypackagedetails.html trunk/pijama/templates/binarypackagedetails.html~ trunk/pijama/templates/index.html~ trunk/pijama/templates/packagedetails.html trunk/pijama/templates/packagedetails.html~ trunk/pijama/templates/packagerdetails.html~ trunk/pijama/templates/packagers.html~ trunk/pijama/templates/search.html trunk/pijama/templates/search.html~ trunk/pijama/templates/search_result.html trunk/pijama/templates/search_result.html~ trunk/pijama/templates/source.html~ trunk/pijama/templates/stil.css~ Modified: trunk/pijama/locale/tr/LC_MESSAGES/django.po trunk/pijama/pijidb/models.py trunk/pijama/syncdb.py trunk/pijama/urls.py trunk/pijama/views.py Log: possible to make searchs according to the source or binary package, packager name or patch Modified: trunk/pijama/locale/tr/LC_MESSAGES/django.po ================================================================= --- trunk/pijama/locale/tr/LC_MESSAGES/django.po (original) +++ trunk/pijama/locale/tr/LC_MESSAGES/django.po Sat Sep 1 12:56:10 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-31 18:34+0300\n" +"POT-Creation-Date: 2007-09-01 12:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Oğuz Yarımtepe \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgid "Binary Packages" msgstr "İkilik Paketler" -#: views.py:143 +#: views.py:143 templates/packagers.html:8 templates/base_main.html:19 msgid "Packagers" msgstr "Paketçiler" @@ -40,6 +40,32 @@ msgid "alphabetical" msgstr "alfabetik" +#: views.py:279 templates/search.html:8 templates/base_main.html:20 +msgid "Search" +msgstr "Arama" + +#: views.py:284 +msgid "Search Result" +msgstr "Arama Sonuçları" + +#: templates/search.html:19 templates/packagerdetails.html:15 +#: templates/packagers.html:16 templates/binary.html:16 +#: templates/source.html:16 +msgid "Packager" +msgstr "Paketçi adı" + +#: templates/search.html:20 +msgid "Binary" +msgstr "" + +#: templates/search.html:21 +msgid "Source" +msgstr "Kaynak paketler" + +#: templates/search.html:22 +msgid "Patch" +msgstr "Yamalar" + #: templates/packagedetails.html:20 msgid "License" msgstr "Lisans" @@ -90,11 +116,6 @@ msgid "Summary" msgstr "Özet" -#: templates/packagerdetails.html:15 templates/packagers.html:16 -#: templates/binary.html:16 templates/source.html:16 -msgid "Packager" -msgstr "Paketçi adı" - #: templates/packagerdetails.html:18 msgid "Packages that he/she responsible from" msgstr "Sorumlu olduğu paketler" @@ -104,14 +125,22 @@ msgstr "Paket güncelleştirmeleri" #: templates/binarypackagedetails.html:17 +msgid "Installed size" +msgstr "" + +#: templates/binarypackagedetails.html:18 +msgid "Package size" +msgstr "Paket büyüklüğü" + +#: templates/binarypackagedetails.html:20 msgid "Source package" msgstr "Kaynak paketler" -#: templates/binarypackagedetails.html:19 +#: templates/binarypackagedetails.html:22 msgid "Buildtime dependencies" msgstr "İnşa bağımlılıkları" -#: templates/binarypackagedetails.html:23 +#: templates/binarypackagedetails.html:26 msgid "Runtime dependencies" msgstr "Çalışma zamanı bağımlılıkları" @@ -147,9 +176,13 @@ msgid "Longest action.py file" msgstr "En uzun inşa betiği:" -#: templates/base_main.html:20 -msgid "Search" -msgstr "Arama" +#: templates/search_result.html:8 +msgid "Search Results" +msgstr "Arama Sonuçları" + +#: templates/search_result.html:15 +msgid "Result" +msgstr "Sonuç" #: templates/base_main.html:21 msgid "Feed" Modified: trunk/pijama/pijidb/models.py ================================================================= --- trunk/pijama/pijidb/models.py (original) +++ trunk/pijama/pijidb/models.py Sat Sep 1 12:56:10 2007 @@ -21,6 +21,7 @@ actionpylen=models.IntegerField(default=0) numofpatchs=models.IntegerField(default=0) path=models.CharField(maxlength=500, null=True) + summary=models.CharField(maxlength=2000, null=True) def __str__(self): return self.pkgname @@ -67,6 +68,7 @@ pkgname=models.ForeignKey(RepoPackages) name=models.CharField(maxlength=50) reponame=models.CharField(maxlength=50) + summary=models.CharField(maxlength=2000) def __str__(self): return self.name Modified: trunk/pijama/syncdb.py ================================================================= --- trunk/pijama/syncdb.py (original) +++ trunk/pijama/syncdb.py Sat Sep 1 12:56:10 2007 @@ -44,7 +44,7 @@ return datetime.date(int(li[0]), int(li[1]), int(li[2])) - def tableactions(self, pckgname, reponame, dirs, root, actionfilelen, numofpatchs): + def tableactions(self, pckgname, reponame, dirs, root, actionfilelen, numofpatchs, summary): try:#try whether there exists a package at the repo, if so just edit the repo date edit info something=__import__("pijama.pijidb.models") @@ -74,7 +74,7 @@ #print pckgname, reponame, self.spec.source.isA[0], self.spec.source.partOf, actionfilelen - x=t(pkgname=pckgname, reponame=reponame, isa=ISA, partof=PARTOF, actionpylen=actionfilelen, numofpatchs=numofpatchs, path=root) + x=t(pkgname=pckgname, reponame=reponame, isa=ISA, partof=PARTOF, actionpylen=actionfilelen, numofpatchs=numofpatchs, path=root, summary=summary) x.save() @@ -125,7 +125,7 @@ binaries=self.spec.packages for binary in binaries: - p.binarypacks_set.create(name=binary.name, reponame=reponame) + p.binarypacks_set.create(name=binary.name, reponame=reponame, summary=binary.summary) print "binaries done" for pkgknowledge in binaries: @@ -178,7 +178,7 @@ else: t1=history[-1].type if history[0].type == None: t2="normal" else: t2=history[0].type - p.history_set.create(updatetype=t1, date=self.makedate(history[-1].date)i reponame=reponame)#first relase date + p.history_set.create(updatetype=t1, date=self.makedate(history[-1].date), reponame=reponame)#first relase date p.history_set.create(updatetype=t2, date=self.makedate(history[0].date), reponame=reponame)#last edit date if "screenshots" in dirs: @@ -226,11 +226,15 @@ print self.pkgname numofpatchs=len(self.spec.source.patches) + summary=self.spec.source.summary + print summary + #if summary.has_key("en"):summary=summary["en"] + #if summary.has_key("tr"):summary=summary["tr"] f=open(os.path.join(root,"actions.py")) actionfilelen=len(f.readlines()) f.close() - self.tableactions(self.pkgname, self.reponame, dirs, root, actionfilelen, numofpatchs) + self.tableactions(self.pkgname, self.reponame, dirs, root, actionfilelen, numofpatchs, summary) if __name__ == "__main__": Modified: trunk/pijama/urls.py ================================================================= --- trunk/pijama/urls.py (original) +++ trunk/pijama/urls.py Sat Sep 1 12:56:10 2007 @@ -23,4 +23,6 @@ (r'^main/(?P.*)/packagers/(?P.*)/$', 'pijama.views.showpackagerdetails'), (r'^main/(?P.*)/sources/(?P.*)/$', 'pijama.views.showpkgdetails'), (r'^main/(?P.*)/binaries/(?P.*)/$', 'pijama.views.showbinarydetails'), + (r'^main/(?P.*)/search/$', 'pijama.views.search'), + (r'^main/(?P.*)/search_result/$', 'pijama.views.searchresult'), ) Modified: trunk/pijama/views.py ================================================================= --- trunk/pijama/views.py (original) +++ trunk/pijama/views.py Sat Sep 1 12:56:10 2007 @@ -267,11 +267,65 @@ h=spec.history pkgversion=h[0].version - return render_to_response("binarypackagedetails.html", {"pkgname":packagename, "builddeps":builddeps, "runtimedeps":runtimedeps, "pkgversion":pkgversion, "pkgsource":pkgsource, "reponame":reponame}) + pisi.api.init(write=False) + x=pisi.context.packagedb.get_package(pkg) + pkginstalledsize=x.installedSize + pkgpackagesize=x.packageSize + + return render_to_response("binarypackagedetails.html", {"title":title,"pkgname":packagename, "builddeps":builddeps, "runtimedeps":runtimedeps, "pkgversion":pkgversion, "pkgsource":pkgsource, "reponame":reponame, "pkginstalledsize":pkginstalledsize, "pkgpackagesize":pkgpackagesize}) +def search(request, reponame): + + title=_("Search") + return render_to_response("search.html", {"title":title, "reponame":reponame}) +def searchresult(request, reponame): + + title=_("Search Result") + + wordli=request.POST["keywords"].strip().split() + something=__import__("pijama.pijidb.models") + rsltli=[] + option="" + if request.POST["searchin"] == "packager": + + t=something.pijidb.models.__getattribute__("Packager") + for word in wordli: + p=t.objects.filter(name__icontains=word, reponame=reponame).values("name") + li1=[x["name"] for x in p] + rsltli=list(set(li1+rsltli)) + + if request.POST["searchin"] == "binary": + + pisi.api.init(write=False) + t=something.pijidb.models.__getattribute__("BinaryPacks") + for word in wordli: + p=t.objects.filter(name__icontains=word, reponame=reponame).values("name") + li1=[x["name"] for x in p] + p=t.objects.filter(summary__icontains=word, reponame=reponame).values("name") + li2=[x["name"] for x in p] + rsltli=list(set(li1+rsltli)) + + if request.POST["searchin"] == "source": + + pisi.api.init(write=False) + t=something.pijidb.models.__getattribute__("RepoPackages") + for word in wordli: + p=t.objects.filter(pkgname__icontains=word, reponame=reponame).values("pkgname") + li1=[x["pkgname"] for x in p] + p=t.objects.filter(summary__icontains=word, reponame=reponame).values("pkgname") + li2=[x["pkgname"] for x in p] + rsltli=list(set(li1+rsltli)) + + if request.POST["searchin"] == "patch": + + pisi.api.init(write=False) + t=something.pijidb.models.__getattribute__("Patch") + for word in wordli: + p=t.objects.filter(name__icontains=word, reponame=reponame) + rsltli=[(x.name,x.pkgname.path+"/files/"+x.name) for x in p] + - - \ No newline at end of file + return render_to_response("search_result.html", {"title":title, "reponame":reponame, "rslt":rsltli, "option":request.POST["searchin"]}) \ No newline at end of file From uludag-commits at pardus.org.tr Sat Sep 1 14:34:02 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 14:34:02 +0300 (EEST) Subject: [Uludag-commits] r15243 - branches/pisi-db/pisi Message-ID: <20070901113402.80DA57C00D0@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 14:34:02 2007 New Revision: 15243 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/index.py Log: Remove update_db The only package db we need is pisi-index.xml Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 14:34:02 2007 @@ -416,7 +416,6 @@ except pisi.file.NoSignatureFound, e: ctx.ui.warning(e) - index.update_db(repo) ctx.ui.info(_('* Package database updated.')) else: raise Error(_('No repository named %s found.') % repo) @@ -442,7 +441,6 @@ except IOError, e: ctx.ui.warning(_("Input/Output error while reading %s: %s") % (indexpath, unicode(e))) return - index.update_db(repo) else: raise Error(_('No repository named %s found.') % repo) Modified: branches/pisi-db/pisi/index.py ================================================================= --- branches/pisi-db/pisi/index.py (original) +++ branches/pisi-db/pisi/index.py Sat Sep 1 14:34:02 2007 @@ -109,32 +109,6 @@ ctx.ui.info(_('Adding %s to package index') % pkg) self.add_package(pkg, deltas, repo_uri) - def update_db(self, repo): - # FIXME: updating db takes too much time. So a notify mechanism is used to inform the status - # of the operation. - - self.progress = ctx.ui.Progress(len(self.packages)+len(self.specs)) - self.processed = 0 - - def update_progress(): - self.processed += 1 - ctx.ui.display_progress(operation = "updatingrepo", - percent = self.progress.update(self.processed), - info = _("Updating package database of %s") % repo) - - ctx.componentdb.remove_repo(repo) - for comp in self.components: - ctx.componentdb.update_component(comp, repo) - ctx.packagedb.remove_repo(repo) - ctx.packagedb.add_obsoletes(self.distribution.obsoletes, repo) - for pkg in self.packages: - ctx.packagedb.add_package(pkg, repo) - update_progress() - ctx.sourcedb.remove_repo(repo) - for sf in self.specs: - ctx.sourcedb.add_spec(sf, repo) - update_progress() - def add_package(self, path, deltas, repo_uri): package = pisi.package.Package(path, 'r') md = package.get_metadata() From uludag-commits at pardus.org.tr Sat Sep 1 14:34:00 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 14:34:00 +0300 (EEST) Subject: [Uludag-commits] r15242 - branches/pisi-db/pisi Message-ID: <20070901113400.0C18E7C00C4@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 14:33:59 2007 New Revision: 15242 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/atomicoperations.py branches/pisi-db/pisi/context.py Log: Remove bsddb imports Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 14:33:59 2007 @@ -472,20 +472,6 @@ for pkg in replica: pisi.util.clean_dir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package', pkg)) - def destroy(files): - #TODO: either don't delete version files here, or remove force flag... - import bsddb3.db - for db in os.listdir(ctx.config.db_dir()): - if db.endswith('.bdb'):# or db.startswith('log'): # delete only db files - if db.startswith('files') or db.startswith('filesdbversion'): - clean = files - else: - clean = True - if clean: - fn = pisi.util.join_path(ctx.config.db_dir(), db) - #NB: there is a parameter bug with python-bsddb3, fixed in pardus - #ctx.dbenv.dbremove(file=fn, flags=bsddb3.db.DB_AUTO_COMMIT) - def reload_packages(files): packages = os.listdir(pisi.util.join_path(ctx.config.lib_dir(), 'package')) progress = ctx.ui.Progress(len(packages)) @@ -516,7 +502,6 @@ except Exception: #FIXME: what exception could we catch here, replace with that. files = True # exception means the files db version was wrong shelve.init_dbenv(write=True, writeversion=True) - destroy(files) # bye bye # save parameters and shutdown pisi options = ctx.config.options Modified: branches/pisi-db/pisi/atomicoperations.py ================================================================= --- branches/pisi-db/pisi/atomicoperations.py (original) +++ branches/pisi-db/pisi/atomicoperations.py Sat Sep 1 14:33:59 2007 @@ -16,7 +16,6 @@ _ = __trans.ugettext import os -import bsddb3.db as db import shutil import pisi Modified: branches/pisi-db/pisi/context.py ================================================================= --- branches/pisi-db/pisi/context.py (original) +++ branches/pisi-db/pisi/context.py Sat Sep 1 14:33:59 2007 @@ -61,8 +61,6 @@ # """ Register a UI implementation""" # ui = _impl -import bsddb3.db as db - def disable_keyboard_interrupts(): sig and sig.disable_signal(signal.SIGINT) From uludag-commits at pardus.org.tr Sat Sep 1 16:59:28 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 16:59:28 +0300 (EEST) Subject: [Uludag-commits] r15245 - in branches/pisi-db/pisi: . cli db Message-ID: <20070901135928.429E77C00D5@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 16:59:27 2007 New Revision: 15245 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/atomicoperations.py branches/pisi-db/pisi/cli/commands.py branches/pisi-db/pisi/db/filesdb.py Log: cleanup rebuild-db Delete most of the rebuild-db code. We only have filesdb as a conventional db. Also this db file decreased in size from 120MB to 40MB by only holding (path, pkg_name) as a key, value pair. Previous db code was holding the fileinfo object, which can easily be taken from installdb.get_files(pkg) code if more information is needed. Filesdb is only for searching a path and pkg_name correlation. Unfortunately this db is currently needed as some code in pisi - file conflict - needs a fast has_file function. We could have not used this db and search linear through the files.xml s like other package managers. "The good thing about not having a db is not having a db" ... So we currently need rebuild-db crap for recreating a filesdb. Rebuild-db is bad because every bug of pisi is been tried to solved with this command. If we can get rid of this, we can fix the real bugs.. but we are close.. Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 16:59:27 2007 @@ -446,60 +446,14 @@ def rebuild_db(files=False): - assert not ctx.database + def rebuild_filesdb(): + for pkg in list_installed(): + ctx.ui.info(_('* Adding \'%s\' to db... ') % pkg, noln=True) + files = ctx.installdb.get_files(pkg) + ctx.filesdb.add_files(pkg, files) + ctx.ui.info(_('OK.')) - # Bug 2596 - # finds and cleans duplicate package directories under '/var/lib/pisi/package' - # deletes the _older_ versioned package directories. - def clean_duplicates(): - i_version = {} # installed versions - replica = [] - for pkg in os.listdir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package')): - (name, ver) = pisi.util.parse_package_name(pkg) - if i_version.has_key(name): - if pisi.version.Version(ver) > pisi.version.Version(i_version[name]): - # found a greater version, older one is a replica - replica.append(name + '-' + i_version[name]) - i_version[name] = ver - else: - # found an older version which is a replica - replica.append(name + '-' + ver) - else: - i_version[name] = ver - - for pkg in replica: - pisi.util.clean_dir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package', pkg)) - - def reload_packages(files): - packages = os.listdir(pisi.util.join_path(ctx.config.lib_dir(), 'package')) - progress = ctx.ui.Progress(len(packages)) - processed = 0 - for package_fn in packages: - if not package_fn == "scripts": - ctx.ui.debug('Resurrecting %s' % package_fn) - pisi.api.resurrect_package(package_fn, files) - processed += 1 - ctx.ui.display_progress(operation = "rebuilding-db", - percent = progress.update(processed), - info = _("Rebuilding package database")) - - def reload_indices(): - index_dir = ctx.config.index_dir() - if os.path.exists(index_dir): # it may have been erased, or we may be upgrading from a previous version -- exa - for repo in os.listdir(index_dir): - indexuri = pisi.util.join_path(ctx.config.lib_dir(), 'index', repo, 'uri') - indexuri = open(indexuri, 'r').readline() - pisi.api.add_repo(repo, indexuri) - pisi.api.rebuild_repo(repo) - - # check db schema versions - try: - shelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) - except KeyboardInterrupt: - raise - except Exception: #FIXME: what exception could we catch here, replace with that. - files = True # exception means the files db version was wrong - shelve.init_dbenv(write=True, writeversion=True) + ctx.filesdb.destroy() # save parameters and shutdown pisi options = ctx.config.options @@ -509,9 +463,7 @@ # construct new database init(database=True, options=options, ui=ui, comar=comar) - clean_duplicates() - reload_packages(files) - reload_indices() + rebuild_filesdb() ############# FIXME: this was a quick fix. ############################## @@ -560,9 +512,6 @@ def build(*args, **kw): return pisi.atomicoperations.build(*args, **kw) -def resurrect_package(*args, **kw): - return pisi.atomicoperations.resurrect_package(*args, **kw) - ######################################################################## ## Deletes the cached pisi packages to keep the package cache dir within cache limits Modified: branches/pisi-db/pisi/atomicoperations.py ================================================================= --- branches/pisi-db/pisi/atomicoperations.py (original) +++ branches/pisi-db/pisi/atomicoperations.py Sat Sep 1 16:59:27 2007 @@ -550,56 +550,3 @@ # wrapper for build op import pisi.build return pisi.build.build(package) - -def virtual_install(metadata, files): - """Recreate the package info for rebuilddb command""" - # installdb - ctx.installdb.install(metadata.package.name, - metadata.package.version, - metadata.package.release, - metadata.package.build, - metadata.package.distribution, - rebuild=True) - - # filesdb - if files: - ctx.filesdb.add_files(metadata.package.name, files) - - # installed packages - ctx.installdb.add_package(metadata.package) - -def resurrect_package(package_fn, write_files): - """Resurrect the package from xml files""" - - metadata_xml = util.join_path(ctx.config.lib_dir(), 'package', - package_fn, ctx.const.metadata_xml) - if not os.path.exists(metadata_xml): - raise Error, _("Metadata XML '%s' cannot be found") % metadata_xml - - metadata = pisi.metadata.MetaData() - metadata.read(metadata_xml) - - errs = metadata.errors() - if errs: - util.print_errors(errs) - raise Error, _("MetaData format wrong (%s)") % package_fn - - ctx.ui.info(_('* Adding \'%s\' to db... ') % (metadata.package.name), noln=True) - - if write_files: - files_xml = util.join_path(ctx.config.lib_dir(), 'package', - package_fn, ctx.const.files_xml) - if not os.path.exists(files_xml): - raise Error, _("Files XML '%s' cannot be found") % files_xml - - files = pisi.files.Files() - files.read(files_xml) - if files.errors(): - raise Error, _("Invalid %s") % ctx.const.files_xml - else: - files = None - - #import pisi.atomicoperations - pisi.atomicoperations.virtual_install(metadata, files) - - ctx.ui.info(_('OK.')) Modified: branches/pisi-db/pisi/cli/commands.py ================================================================= --- branches/pisi-db/pisi/cli/commands.py (original) +++ branches/pisi-db/pisi/cli/commands.py Sat Sep 1 16:59:27 2007 @@ -1183,15 +1183,9 @@ self.parser.add_option_group(group) def run(self): - if self.args: - self.init(database=True) - for package_fn in self.args: - pisi.api.resurrect_package(package_fn, ctx.get_option('files`')) - else: - self.init(database=False) - if ctx.ui.confirm(_('Rebuild PiSi databases?')): - pisi.api.rebuild_db(ctx.get_option('files')) - + self.init(database=True) + if ctx.ui.confirm(_('Rebuild PiSi databases?')): + pisi.api.rebuild_db(ctx.get_option('files')) self.finalize() Modified: branches/pisi-db/pisi/db/filesdb.py ================================================================= --- branches/pisi-db/pisi/db/filesdb.py (original) +++ branches/pisi-db/pisi/db/filesdb.py Sat Sep 1 16:59:27 2007 @@ -41,14 +41,19 @@ self.__check_filesdb() - for f in files: - self.filesdb[f] = pkg + for f in files.list: + self.filesdb[f.path] = pkg def remove_files(self, pkg, files): for f in files: if self.filesdb.has_key(f): del self.filesdb[f] + def destroy(self): + files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) + if os.path.exists(files_db): + os.unlink(files_db) + def close(self): if isinstance(self.filesdb, shelve.DbfilenameShelf): self.filesdb.close() @@ -64,11 +69,10 @@ files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) if not os.path.exists(files_db): - flag = "c" + flag = "n" elif os.access(files_db, os.W_OK): flag = "w" else: flag = "r" self.filesdb = shelve.open(files_db, flag) - From uludag-commits at pardus.org.tr Sat Sep 1 16:59:23 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 16:59:23 +0300 (EEST) Subject: [Uludag-commits] r15244 - branches/pisi-db/pisi/db Message-ID: <20070901135923.DA2817C00C4@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 16:59:23 2007 New Revision: 15244 Modified: branches/pisi-db/pisi/db/filesdb.py Log: use __check_filesdb Use check_filesdb in __init__ and add functions Modified: branches/pisi-db/pisi/db/filesdb.py ================================================================= --- branches/pisi-db/pisi/db/filesdb.py (original) +++ branches/pisi-db/pisi/db/filesdb.py Sat Sep 1 16:59:23 2007 @@ -29,16 +29,7 @@ def __init__(self): self.filesdb = {} - - files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) - if os.path.exists(files_db): - - if os.access(files_db, os.W_OK): - flag = "" - else: - flag = "r" - - self.filesdb = shelve.open(files_db, flag) + self.__check_filesdb() def has_file(self, path): return self.filesdb.has_key(path) @@ -71,5 +62,13 @@ os.makedirs(info_dir) files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) + if not os.path.exists(files_db): - self.filesdb = shelve.open(files_db) + flag = "c" + elif os.access(files_db, os.W_OK): + flag = "w" + else: + flag = "r" + + self.filesdb = shelve.open(files_db, flag) + From uludag-commits at pardus.org.tr Sat Sep 1 19:21:38 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 19:21:38 +0300 (EEST) Subject: [Uludag-commits] r15247 - branches/pisi-db/pisi/cli Message-ID: <20070901162138.84EAC7C00D5@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 19:21:38 2007 New Revision: 15247 Added: branches/pisi-db/pisi/cli/addrepo.py branches/pisi-db/pisi/cli/build.py branches/pisi-db/pisi/cli/check.py branches/pisi-db/pisi/cli/clean.py branches/pisi-db/pisi/cli/command.py branches/pisi-db/pisi/cli/configurepending.py branches/pisi-db/pisi/cli/deletecache.py branches/pisi-db/pisi/cli/delta.py branches/pisi-db/pisi/cli/emerge.py branches/pisi-db/pisi/cli/graph.py branches/pisi-db/pisi/cli/help.py branches/pisi-db/pisi/cli/index.py branches/pisi-db/pisi/cli/info.py branches/pisi-db/pisi/cli/install.py branches/pisi-db/pisi/cli/listavailable.py branches/pisi-db/pisi/cli/listcomponents.py branches/pisi-db/pisi/cli/listinstalled.py branches/pisi-db/pisi/cli/listpending.py branches/pisi-db/pisi/cli/listrepo.py branches/pisi-db/pisi/cli/listsources.py branches/pisi-db/pisi/cli/listupgrades.py branches/pisi-db/pisi/cli/rebuilddb.py branches/pisi-db/pisi/cli/remove.py branches/pisi-db/pisi/cli/removerepo.py branches/pisi-db/pisi/cli/search.py branches/pisi-db/pisi/cli/searchfile.py branches/pisi-db/pisi/cli/updaterepo.py branches/pisi-db/pisi/cli/upgrade.py Removed: branches/pisi-db/pisi/cli/commands.py Modified: branches/pisi-db/pisi/cli/pisicli.py Log: divide commands.py It has growed so large. This way it is easier to find what you are looking for. There may be missing imports or some other errors, we will figure those out while porting code to new db code, one command at a time. Also unittest of each command will be written. Modified: branches/pisi-db/pisi/cli/pisicli.py ================================================================= --- branches/pisi-db/pisi/cli/pisicli.py (original) +++ branches/pisi-db/pisi/cli/pisicli.py Sat Sep 1 19:21:38 2007 @@ -11,7 +11,7 @@ # import sys -from optparse import OptionParser +import optparse import gettext __trans = gettext.translation('pisi', fallback=True) @@ -19,18 +19,45 @@ import pisi import pisi.cli -from pisi.cli import printu -from pisi.uri import URI -from pisi.cli.commands import * +import pisi.cli.command as command +import pisi.cli.addrepo +import pisi.cli.build +import pisi.cli.check +import pisi.cli.clean +import pisi.cli.configurepending +import pisi.cli.deletecache +import pisi.cli.delta +import pisi.cli.emerge +import pisi.cli.graph +import pisi.cli.index +import pisi.cli.info +import pisi.cli.install +import pisi.cli.listavailable +import pisi.cli.listcomponents +import pisi.cli.listinstalled +import pisi.cli.listpending +import pisi.cli.listrepo +import pisi.cli.listsources +import pisi.cli.listupgrades +import pisi.cli.rebuilddb +import pisi.cli.remove +import pisi.cli.removerepo +import pisi.cli.searchfile +import pisi.cli.search +import pisi.cli.updaterepo +import pisi.cli.upgrade + +#FIXME: why does this has to be imported last +import pisi.cli.help class ParserError(pisi.Exception): pass -class PreParser(OptionParser): +class PreParser(optparse.OptionParser): """consumes any options, and finds arguments from command line""" def __init__(self, version): - OptionParser.__init__(self, usage=usage_text, version=version) + optparse.OptionParser.__init__(self, usage=pisi.cli.help.usage_text, version=version) def error(self, msg): raise ParserError, msg @@ -96,12 +123,12 @@ except ParserError: raise Error(_('Command line parsing error')) - self.command = Command.get_command(cmd_name, args=orig_args) + self.command = command.Command.get_command(cmd_name, args=orig_args) if not self.command: raise Error(_("Unrecognized command: %s") % cmd_name) def die(self): - printu('\n' + self.parser.format_help()) + pisi.cli.printu('\n' + self.parser.format_help()) sys.exit(1) def run_command(self): From uludag-commits at pardus.org.tr Sat Sep 1 19:21:32 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 19:21:32 +0300 (EEST) Subject: [Uludag-commits] r15246 - branches/pisi-db/pisi Message-ID: <20070901162132.1C6DC7C00C4@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 19:21:31 2007 New Revision: 15246 Modified: branches/pisi-db/pisi/api.py Log: close if filesdb is not None Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 19:21:31 2007 @@ -129,7 +129,8 @@ ctx.loghandler.flush() ctx.log.removeHandler(ctx.loghandler) - ctx.filesdb.close() + if ctx.filesdb: + ctx.filesdb.close() if ctx.build_leftover and os.path.exists(ctx.build_leftover): os.unlink(ctx.build_leftover) From uludag-commits at pardus.org.tr Sat Sep 1 21:04:26 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:04:26 +0300 (EEST) Subject: [Uludag-commits] r15249 - in branches/pisi-db/pisi: . cli operations Message-ID: <20070901180426.305247C00B2@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:04:25 2007 New Revision: 15249 Added: branches/pisi-db/pisi/operations/ branches/pisi-db/pisi/operations/__init__.py branches/pisi-db/pisi/operations/delta.py - copied, changed from r15248, branches/pisi-db/pisi/delta.py Removed: branches/pisi-db/pisi/delta.py Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/atomicoperations.py branches/pisi-db/pisi/cli/delta.py Log: create operations module the idea is to divide the ugliest code piece in pisi a.k.a operations.py. the first step is to create the module and move delta operation into operations module. Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 21:04:25 2007 @@ -40,7 +40,7 @@ import pisi.operations import pisi.build import pisi.atomicoperations -import pisi.delta +import pisi.operations.delta import pisi.comariface import pisi.signalhandler Modified: branches/pisi-db/pisi/atomicoperations.py ================================================================= --- branches/pisi-db/pisi/atomicoperations.py (original) +++ branches/pisi-db/pisi/atomicoperations.py Sat Sep 1 21:04:25 2007 @@ -27,7 +27,7 @@ import pisi.uri import pisi.ui import pisi.version -import pisi.delta +import pisi.operations.delta import pisi.db.packagedb class Error(pisi.Error): @@ -323,7 +323,7 @@ # of these files may be relocated to some other directory in the new package. # We handle these cases here. def relocate_files(): - for old_file, new_file in pisi.delta.find_relocations(self.old_files, self.files): + for old_file, new_file in pisi.operations.delta.find_relocations(self.old_files, self.files): old_path, new_path = ("/" + old_file.path, "/" + new_file.path) destdir = os.path.dirname(new_path) Modified: branches/pisi-db/pisi/cli/delta.py ================================================================= --- branches/pisi-db/pisi/cli/delta.py (original) +++ branches/pisi-db/pisi/cli/delta.py Sat Sep 1 21:04:25 2007 @@ -47,7 +47,7 @@ def run(self): - from pisi.delta import create_delta_package + from pisi.operations.delta import create_delta_package self.init(database=False, write=False) Copied: branches/pisi-db/pisi/operations/delta.py (from r15248, branches/pisi-db/pisi/delta.py) ================================================================= From uludag-commits at pardus.org.tr Sat Sep 1 21:04:22 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:04:22 +0300 (EEST) Subject: [Uludag-commits] r15248 - branches/pisi-db/pisi/cli Message-ID: <20070901180422.8E2567C006F@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:04:22 2007 New Revision: 15248 Modified: branches/pisi-db/pisi/cli/addrepo.py branches/pisi-db/pisi/cli/listcomponents.py Log: fix pisi.context import errors Modified: branches/pisi-db/pisi/cli/addrepo.py ================================================================= --- branches/pisi-db/pisi/cli/addrepo.py (original) +++ branches/pisi-db/pisi/cli/addrepo.py Sat Sep 1 21:04:22 2007 @@ -17,6 +17,7 @@ _ = __trans.ugettext import pisi.cli.command as command +import pisi.context as ctx class AddRepo(command.Command): """Add a repository Modified: branches/pisi-db/pisi/cli/listcomponents.py ================================================================= --- branches/pisi-db/pisi/cli/listcomponents.py (original) +++ branches/pisi-db/pisi/cli/listcomponents.py Sat Sep 1 21:04:22 2007 @@ -17,7 +17,7 @@ _ = __trans.ugettext import pisi.cli.command as command -import pisi.context as cxt +import pisi.context as ctx class ListComponents(command.Command): """List available components From uludag-commits at pardus.org.tr Sat Sep 1 21:04:30 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:04:30 +0300 (EEST) Subject: [Uludag-commits] r15250 - in branches/pisi-db/pisi: . operations Message-ID: <20070901180430.93C2D7C00B2@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:04:30 2007 New Revision: 15250 Added: branches/pisi-db/pisi/operations/emerge.py branches/pisi-db/pisi/operations/helper.py branches/pisi-db/pisi/operations/install.py branches/pisi-db/pisi/operations/remove.py branches/pisi-db/pisi/operations/upgrade.py Removed: branches/pisi-db/pisi/operations.py Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/build.py branches/pisi-db/pisi/operations/__init__.py Log: Divide operations.py Code became unreadable. Divide for easy maintanence. Code will be simplified while porting to new db code. Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 21:04:30 2007 @@ -37,10 +37,14 @@ import pisi.metadata import pisi.file import pisi.version -import pisi.operations import pisi.build import pisi.atomicoperations import pisi.operations.delta +import pisi.operations.remove +import pisi.operations.upgrade +import pisi.operations.install +import pisi.operations.helper +import pisi.operations.emerge import pisi.comariface import pisi.signalhandler @@ -153,7 +157,7 @@ return set(ctx.packagedb.list_packages(repo = repo)) def list_upgradable(): - return filter(pisi.operations.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys() + return filter(pisi.operations.helper.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys() def package_graph(A, repo = pisi.db.installed, ignore_installed = False): """Construct a package relations graph. @@ -478,34 +482,34 @@ # from pisi.atomicoperations import resurrect_package, build def install(*args, **kw): - return pisi.operations.install(*args, **kw) + return pisi.operations.install.install(*args, **kw) def remove(*args, **kw): - return pisi.operations.remove(*args, **kw) + return pisi.operations.remove.remove(*args, **kw) def upgrade(*args, **kw): - return pisi.operations.upgrade(*args, **kw) + return pisi.operations.upgrade.upgrade(*args, **kw) def emerge(*args, **kw): - return pisi.operations.emerge(*args, **kw) + return pisi.operations.emerge.emerge(*args, **kw) def plan_install(*args, **kw): - return pisi.operations.plan_install_pkg_names(*args, **kw) + return pisi.operations.install.plan_install_pkg_names(*args, **kw) def plan_remove(*args, **kw): - return pisi.operations.plan_remove(*args, **kw) + return pisi.operations.remove.plan_remove(*args, **kw) def plan_upgrade(*args, **kw): - return pisi.operations.plan_upgrade(*args, **kw) + return pisi.operations.upgrade.plan_upgrade(*args, **kw) def upgrade_base(*args, **kw): - return pisi.operations.upgrade_base(*args, **kw) + return pisi.operations.upgrade.upgrade_base(*args, **kw) def calculate_conflicts(*args, **kw): return pisi.conflict.calculate_conflicts(*args, **kw) def reorder_base_packages(*args, **kw): - return pisi.operations.reorder_base_packages(*args, **kw) + return pisi.operations.helper.reorder_base_packages(*args, **kw) def build_until(*args, **kw): return pisi.build.build_until(*args, **kw) Modified: branches/pisi-db/pisi/build.py ================================================================= --- branches/pisi-db/pisi/build.py (original) +++ branches/pisi-db/pisi/build.py Sat Sep 1 21:04:30 2007 @@ -29,7 +29,7 @@ import pisi.file import pisi.context as ctx import pisi.dependency as dependency -import pisi.operations as operations +import pisi.operations.install as install import pisi.sourcearchive import pisi.files import pisi.fetcher @@ -502,7 +502,7 @@ if ctx.ui.confirm( _('Do you want to install the unsatisfied build dependencies')): ctx.ui.info(_('Installing build dependencies.')) - operations.install([dep.package for dep in dep_unsatis]) + install.install([dep.package for dep in dep_unsatis]) else: fail() else: Modified: branches/pisi-db/pisi/operations/__init__.py ================================================================= --- branches/pisi-db/pisi/operations/__init__.py (original) +++ branches/pisi-db/pisi/operations/__init__.py Sat Sep 1 21:04:30 2007 @@ -9,3 +9,4 @@ # # Please read the COPYING file. # + From uludag-commits at pardus.org.tr Sat Sep 1 21:04:37 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:04:37 +0300 (EEST) Subject: [Uludag-commits] r15251 - branches/pisi-db/pisi/cli Message-ID: <20070901180437.722CE7C00C4@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:04:36 2007 New Revision: 15251 Modified: branches/pisi-db/pisi/cli/addrepo.py branches/pisi-db/pisi/cli/build.py branches/pisi-db/pisi/cli/check.py branches/pisi-db/pisi/cli/configurepending.py branches/pisi-db/pisi/cli/deletecache.py branches/pisi-db/pisi/cli/emerge.py branches/pisi-db/pisi/cli/graph.py branches/pisi-db/pisi/cli/info.py branches/pisi-db/pisi/cli/install.py branches/pisi-db/pisi/cli/listinstalled.py branches/pisi-db/pisi/cli/listpending.py branches/pisi-db/pisi/cli/listupgrades.py branches/pisi-db/pisi/cli/rebuilddb.py branches/pisi-db/pisi/cli/remove.py branches/pisi-db/pisi/cli/search.py branches/pisi-db/pisi/cli/updaterepo.py branches/pisi-db/pisi/cli/upgrade.py Log: import missed pisi.api Modified: branches/pisi-db/pisi/cli/addrepo.py ================================================================= --- branches/pisi-db/pisi/cli/addrepo.py (original) +++ branches/pisi-db/pisi/cli/addrepo.py Sat Sep 1 21:04:36 2007 @@ -16,6 +16,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi.api import pisi.cli.command as command import pisi.context as ctx Modified: branches/pisi-db/pisi/cli/build.py ================================================================= --- branches/pisi-db/pisi/cli/build.py (original) +++ branches/pisi-db/pisi/cli/build.py Sat Sep 1 21:04:36 2007 @@ -16,6 +16,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi.api import pisi.cli.command as command import pisi.context as ctx Modified: branches/pisi-db/pisi/cli/check.py ================================================================= --- branches/pisi-db/pisi/cli/check.py (original) +++ branches/pisi-db/pisi/cli/check.py Sat Sep 1 21:04:36 2007 @@ -16,6 +16,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi.api import pisi.cli.command as command import pisi.context as ctx Modified: branches/pisi-db/pisi/cli/configurepending.py ================================================================= --- branches/pisi-db/pisi/cli/configurepending.py (original) +++ branches/pisi-db/pisi/cli/configurepending.py Sat Sep 1 21:04:36 2007 @@ -16,6 +16,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi.api import pisi.cli.command as command class ConfigurePending(command.PackageOp): Modified: branches/pisi-db/pisi/cli/deletecache.py ================================================================= --- branches/pisi-db/pisi/cli/deletecache.py (original) +++ branches/pisi-db/pisi/cli/deletecache.py Sat Sep 1 21:04:36 2007 @@ -11,6 +11,7 @@ # import pisi +import pisi.api import pisi.cli.command as command class DeleteCache(command.Command): Modified: branches/pisi-db/pisi/cli/emerge.py ================================================================= --- branches/pisi-db/pisi/cli/emerge.py (original) +++ branches/pisi-db/pisi/cli/emerge.py Sat Sep 1 21:04:36 2007 @@ -19,6 +19,7 @@ import pisi.cli.command as command import pisi.cli.build as build import pisi.context as ctx +import pisi.api class Emerge(build.Build): """Build and install PiSi source packages from repository Modified: branches/pisi-db/pisi/cli/graph.py ================================================================= --- branches/pisi-db/pisi/cli/graph.py (original) +++ branches/pisi-db/pisi/cli/graph.py Sat Sep 1 21:04:36 2007 @@ -17,6 +17,7 @@ _ = __trans.ugettext import pisi +import pisi.api import pisi.cli.command as command import pisi.context as ctx Modified: branches/pisi-db/pisi/cli/info.py ================================================================= --- branches/pisi-db/pisi/cli/info.py (original) +++ branches/pisi-db/pisi/cli/info.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class Info(command.Command): """Display package information Modified: branches/pisi-db/pisi/cli/install.py ================================================================= --- branches/pisi-db/pisi/cli/install.py (original) +++ branches/pisi-db/pisi/cli/install.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class Install(command.PackageOp): """Install PiSi packages Modified: branches/pisi-db/pisi/cli/listinstalled.py ================================================================= --- branches/pisi-db/pisi/cli/listinstalled.py (original) +++ branches/pisi-db/pisi/cli/listinstalled.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class ListInstalled(command.Command): """Print the list of all installed packages Modified: branches/pisi-db/pisi/cli/listpending.py ================================================================= --- branches/pisi-db/pisi/cli/listpending.py (original) +++ branches/pisi-db/pisi/cli/listpending.py Sat Sep 1 21:04:36 2007 @@ -16,6 +16,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class ListPending(command.Command): """List pending packages Modified: branches/pisi-db/pisi/cli/listupgrades.py ================================================================= --- branches/pisi-db/pisi/cli/listupgrades.py (original) +++ branches/pisi-db/pisi/cli/listupgrades.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class ListUpgrades(command.Command): """List packages to be upgraded Modified: branches/pisi-db/pisi/cli/rebuilddb.py ================================================================= --- branches/pisi-db/pisi/cli/rebuilddb.py (original) +++ branches/pisi-db/pisi/cli/rebuilddb.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class RebuildDb(command.Command): """Rebuild Databases Modified: branches/pisi-db/pisi/cli/remove.py ================================================================= --- branches/pisi-db/pisi/cli/remove.py (original) +++ branches/pisi-db/pisi/cli/remove.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class Remove(command.PackageOp): """Remove PiSi packages Modified: branches/pisi-db/pisi/cli/search.py ================================================================= --- branches/pisi-db/pisi/cli/search.py (original) +++ branches/pisi-db/pisi/cli/search.py Sat Sep 1 21:04:36 2007 @@ -19,6 +19,7 @@ import pisi.cli.command as command import pisi.cli.info as info import pisi.context as ctx +import pisi.api class Search(info.Info): """Search packages Modified: branches/pisi-db/pisi/cli/updaterepo.py ================================================================= --- branches/pisi-db/pisi/cli/updaterepo.py (original) +++ branches/pisi-db/pisi/cli/updaterepo.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class UpdateRepo(command.Command): """Update repository databases Modified: branches/pisi-db/pisi/cli/upgrade.py ================================================================= --- branches/pisi-db/pisi/cli/upgrade.py (original) +++ branches/pisi-db/pisi/cli/upgrade.py Sat Sep 1 21:04:36 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.api class Upgrade(command.PackageOp): """Upgrade PiSi packages From uludag-commits at pardus.org.tr Sat Sep 1 21:11:59 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:11:59 +0300 (EEST) Subject: [Uludag-commits] r15252 - in branches/pisi-db/pisi: . operations Message-ID: <20070901181159.35C857C006F@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:11:58 2007 New Revision: 15252 Added: branches/pisi-db/pisi/operations/build.py - copied, changed from r15251, branches/pisi-db/pisi/build.py Removed: branches/pisi-db/pisi/build.py Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/atomicoperations.py branches/pisi-db/pisi/index.py Log: Move build operation to pisi.operations module Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 21:11:58 2007 @@ -37,7 +37,6 @@ import pisi.metadata import pisi.file import pisi.version -import pisi.build import pisi.atomicoperations import pisi.operations.delta import pisi.operations.remove @@ -45,6 +44,7 @@ import pisi.operations.install import pisi.operations.helper import pisi.operations.emerge +import pisi.operations.build import pisi.comariface import pisi.signalhandler @@ -512,7 +512,7 @@ return pisi.operations.helper.reorder_base_packages(*args, **kw) def build_until(*args, **kw): - return pisi.build.build_until(*args, **kw) + return pisi.operations.build.build_until(*args, **kw) def build(*args, **kw): return pisi.atomicoperations.build(*args, **kw) Modified: branches/pisi-db/pisi/atomicoperations.py ================================================================= --- branches/pisi-db/pisi/atomicoperations.py (original) +++ branches/pisi-db/pisi/atomicoperations.py Sat Sep 1 21:11:58 2007 @@ -548,5 +548,5 @@ def build(package): # wrapper for build op - import pisi.build - return pisi.build.build(package) + import pisi.operations.build + return pisi.operations.build.build(package) Modified: branches/pisi-db/pisi/index.py ================================================================= --- branches/pisi-db/pisi/index.py (original) +++ branches/pisi-db/pisi/index.py Sat Sep 1 21:11:58 2007 @@ -161,10 +161,10 @@ #ctx.ui.error(str(Error(*errs))) def add_spec(self, path, repo_uri): - import pisi.build + import pisi.operations.build ctx.ui.info(_('Adding %s to source index') % path) #TODO: may use try/except to handle this - builder = pisi.build.Builder(path) + builder = pisi.operations.build.Builder(path) #ctx.ui.error(_('SpecFile in %s is corrupt, skipping...') % path) #ctx.ui.error(str(Error(*errs))) builder.fetch_component() Copied: branches/pisi-db/pisi/operations/build.py (from r15251, branches/pisi-db/pisi/build.py) ================================================================= From uludag-commits at pardus.org.tr Sat Sep 1 21:54:02 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 21:54:02 +0300 (EEST) Subject: [Uludag-commits] r15253 - in branches/pisi-db/pisi: . pxml Message-ID: <20070901185402.C0FED7C0075@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 21:54:02 2007 New Revision: 15253 Modified: branches/pisi-db/pisi/index.py branches/pisi-db/pisi/pxml/autoxml.py Log: First one is the bsddb, second one is the filesystem db. nodecode option in this commit gives as some extra 3-5 seconds by not decoding the index xml. PS: this autoxml is no generic xml objectifier but some wierd featurefull creature. faik at iago pisi $ time sudo pisi ur --force * pardus-2007-test deposu güncelleniyor pisi-index.xml.bz2.sha1sum (40.0 B)100% 0.00 B/s [??:??:??] [bitti] pisi-index.xml.bz2 (411.0 KB)100% 96.74 KB/s [00:00:00] [bitti] No signature found for http://paketler.pardus.org.tr/pardus-2007-test/pisi-index.xml.bz2 pardus-2007-test paket veritabanı güncelleniyor (100%) [bitti] * Paket veritabanı güncellendi. * pardus-2007-src deposu güncelleniyor pisi-index.xml.bz2.sha1sum (40.0 B)100% 0.00 B/s [??:??:??] [bitti] pardus-2007-src deposu için güncelleme yok. Veritabanı istek üzerine güncelleniyor pisi-index.xml.bz2 (325.0 KB)100% 90.40 KB/s [00:00:00] [bitti] No signature found for http://svn.pardus.org.tr/pardus/2007/pisi-index.xml.bz2 pardus-2007-src paket veritabanı güncelleniyor (100%) [bitti] * Paket veritabanı güncellendi. real 3m29.758s <----------- user 0m54.594s sys 0m4.565s faik at iago pisi $ time sudo ./pisi-cli ur --force * pardus-2007-test deposu güncelleniyor pisi-index.xml.bz2.sha1sum (40.0 B)100% 0.00 B/s [??:??:??] [bitti] pardus-2007-test deposu için güncelleme yok. Veritabanı istek üzerine güncelleniyor pisi-index.xml.bz2 (411.0 KB)100% 94.54 KB/s [00:00:00] [bitti] No signature found for http://paketler.pardus.org.tr/pardus-2007-test/pisi-index.xml.bz2 * Paket veritabanı güncellendi. * pardus-2007-src deposu güncelleniyor pisi-index.xml.bz2.sha1sum (40.0 B)100% 0.00 B/s [??:??:??] [bitti] pardus-2007-src deposu için güncelleme yok. Veritabanı istek üzerine güncelleniyor pisi-index.xml.bz2 (325.0 KB)100% 101.51 KB/s [00:00:00] [bitti] No signature found for http://svn.pardus.org.tr/pardus/2007/pisi-index.xml.bz2 * Paket veritabanı güncellendi. real 0m18.420s <------------ user 0m4.372s sys 0m0.314s Modified: branches/pisi-db/pisi/index.py ================================================================= --- branches/pisi-db/pisi/index.py (original) +++ branches/pisi-db/pisi/index.py Sat Sep 1 21:54:02 2007 @@ -49,7 +49,7 @@ def read_uri(self, uri, tmpdir, force = False): self.read(uri, tmpDir=tmpdir, sha1sum=not force, - compress=pisi.file.File.auto, sign=pisi.file.File.detached, copylocal = True) + compress=pisi.file.File.auto, sign=pisi.file.File.detached, copylocal = True, nodecode = True) # read index for a given repo, force means download even if remote not updated def read_uri_of_repo(self, uri, repo = None, force = False): Modified: branches/pisi-db/pisi/pxml/autoxml.py ================================================================= --- branches/pisi-db/pisi/pxml/autoxml.py (original) +++ branches/pisi-db/pisi/pxml/autoxml.py Sat Sep 1 21:54:02 2007 @@ -438,10 +438,14 @@ errs.append(_("autoxml.parse: String '%s' has errors") % xml) def read(self, uri, keepDoc = False, tmpDir = '/tmp', - sha1sum = False, compress = None, sign = None, copylocal = False): + sha1sum = False, compress = None, sign = None, copylocal = False, nodecode = False): "read XML file and decode it into a python object" self.readxml(uri, tmpDir, sha1sum=sha1sum, compress=compress, sign=sign, copylocal=copylocal) + + if nodecode: + return + errs = [] self.decode(self.rootNode(), errs) if errs: From uludag-commits at pardus.org.tr Sat Sep 1 22:07:15 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 22:07:15 +0300 (EEST) Subject: [Uludag-commits] r15254 - in branches/pisi-db/pisi: . db Message-ID: <20070901190715.E04177C0072@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 22:07:15 2007 New Revision: 15254 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/db/repodb.py Log: implement remove_repo Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 22:07:15 2007 @@ -391,7 +391,6 @@ def remove_repo(name): if ctx.repodb.has_repo(name): ctx.repodb.remove_repo(name) - pisi.util.clean_dir(os.path.join(ctx.config.index_dir(), name)) ctx.ui.info(_('Repo %s removed from system.') % name) else: ctx.ui.error(_('Repository %s does not exist. Cannot remove.') Modified: branches/pisi-db/pisi/db/repodb.py ================================================================= --- branches/pisi-db/pisi/db/repodb.py (original) +++ branches/pisi-db/pisi/db/repodb.py Sat Sep 1 22:07:15 2007 @@ -16,6 +16,7 @@ import pisi import pisi.uri +import pisi.util import pisi.index import pisi.context as ctx @@ -52,4 +53,4 @@ return os.listdir(ctx.config.index_dir()) def remove_repo(self, name): - raise Exception(_('Not implemented')) + pisi.util.clean_dir(os.path.join(ctx.config.index_dir(), name)) From uludag-commits at pardus.org.tr Sat Sep 1 22:32:35 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Sep 2007 22:32:35 +0300 (EEST) Subject: [Uludag-commits] r15255 - in branches/pisi-db/pisi: . operations Message-ID: <20070901193235.82DF57C0072@liste.uludag.org.tr> Author: faik Date: Sat Sep 1 22:32:35 2007 New Revision: 15255 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/operations/upgrade.py Log: fix is_upgradable and comment - temporarly - replaces part of list_upgradables Also havent figured out yet how to find the right repo... in which order... the current db code does need a repo other than the previous code that can take None as a repo parameter... So which_repo may be used for sometime Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Sat Sep 1 22:32:35 2007 @@ -157,7 +157,7 @@ return set(ctx.packagedb.list_packages(repo = repo)) def list_upgradable(): - return filter(pisi.operations.helper.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys() + return filter(pisi.operations.upgrade.is_upgradable, ctx.installdb.list_installed()) # FIX:DB ctx.packagedb.get_replaces().keys() def package_graph(A, repo = pisi.db.installed, ignore_installed = False): """Construct a package relations graph. Modified: branches/pisi-db/pisi/operations/upgrade.py ================================================================= --- branches/pisi-db/pisi/operations/upgrade.py (original) +++ branches/pisi-db/pisi/operations/upgrade.py Sat Sep 1 22:32:35 2007 @@ -233,14 +233,16 @@ def is_upgradable(name, ignore_build = False): if not ctx.installdb.has_package(name): return False - (version, release, build) = ctx.installdb.get_version(name) + + info = ctx.installdb.get_info(name) + (version, release, build) = (info.version, info.release, info.build) try: - pkg = ctx.packagedb.get_package(name) + pkg = ctx.packagedb.get_package(name, ctx.packagedb.which_repo(name)) except KeyboardInterrupt: raise except Exception: #FIXME: what exception could we catch here, replace with that. return False - + if ignore_build or (not build) or (not pkg.build): return pisi.version.Version(release) < pisi.version.Version(pkg.release) else: From uludag-commits at pardus.org.tr Sun Sep 2 10:01:13 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 10:01:13 +0300 (EEST) Subject: [Uludag-commits] r15256 - in trunk/pijama: locale/tr/LC_MESSAGES templates Message-ID: <20070902070113.72CA47C0059@liste.uludag.org.tr> Author: oguzy Date: Sun Sep 2 10:01:13 2007 New Revision: 15256 Removed: trunk/pijama/locale/tr/LC_MESSAGES/django.mo trunk/pijama/templates/base.html~ trunk/pijama/templates/base_main.html~ trunk/pijama/templates/binary.html~ trunk/pijama/templates/binarypackagedetails.html~ trunk/pijama/templates/index.html~ trunk/pijama/templates/packagedetails.html~ trunk/pijama/templates/packagerdetails.html~ trunk/pijama/templates/packagers.html~ trunk/pijama/templates/search.html~ trunk/pijama/templates/search_result.html~ trunk/pijama/templates/source.html~ trunk/pijama/templates/stil.css~ Log: Removing files that are not necessary From uludag-commits at pardus.org.tr Sun Sep 2 13:24:51 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 13:24:51 +0300 (EEST) Subject: [Uludag-commits] r15258 - in branches/pisi-db/pisi: db operations Message-ID: <20070902102451.8B2027C00BF@liste.uludag.org.tr> Author: faik Date: Sun Sep 2 13:24:51 2007 New Revision: 15258 Modified: branches/pisi-db/pisi/db/installdb.py branches/pisi-db/pisi/db/packagedb.py branches/pisi-db/pisi/operations/upgrade.py Log: speed up list_upgradable "Premature optimization is the root of all evil." But this pissed me of: pisi.api.list_upgradable was taking around 7.2 seconds. Now it takes 0.5 seconds in my computer. The very good thing with this new filesystem-piksemel db shows us that, there is always a room for optimization. And this is good. Modified: branches/pisi-db/pisi/db/installdb.py ================================================================= --- branches/pisi-db/pisi/db/installdb.py (original) +++ branches/pisi-db/pisi/db/installdb.py Sun Sep 2 13:24:51 2007 @@ -18,6 +18,8 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import piksemel + # PiSi import pisi import pisi.context as ctx @@ -77,6 +79,16 @@ def has_package(self, package): return self.installed_pkgs.has_key(package) + def get_version(self, package): + metadata_xml = os.path.join(self.__package_path(package), ctx.const.metadata_xml) + meta_doc = piksemel.parse(metadata_xml) + history = meta_doc.getTag("Package").getTag("History") + build = meta_doc.getTag("Package").getTagData("Build") + version = history.getTag("Update").getTagData("Version") + release = history.getTag("Update").getAttribute("release") + del meta_doc + return version, release, build and int(build) + def get_files(self, package): files = pisi.files.Files() files_xml = os.path.join(self.__package_path(package), ctx.const.files_xml) Modified: branches/pisi-db/pisi/db/packagedb.py ================================================================= --- branches/pisi-db/pisi/db/packagedb.py (original) +++ branches/pisi-db/pisi/db/packagedb.py Sun Sep 2 13:24:51 2007 @@ -77,6 +77,18 @@ pkg, repo = self.get_package_repo(name, repo) return pkg + def get_version(self, name, repo): + if not self.has_package(name, repo): + raise Exception(_('Package %s not found.') % name) + + pkg_doc = piksemel.parseString(self.__package_nodes[repo][name]) + history = pkg_doc.getTag("History") + build = pkg_doc.getTagData("Build") + version = history.getTag("Update").getTagData("Version") + release = history.getTag("Update").getAttribute("release") + del pkg_doc + return version, release, build and int(build) + def get_package_repo(self, name, repo): if self.__package_nodes.has_key(repo): if self.__package_nodes[repo].has_key(name): Modified: branches/pisi-db/pisi/operations/upgrade.py ================================================================= --- branches/pisi-db/pisi/operations/upgrade.py (original) +++ branches/pisi-db/pisi/operations/upgrade.py Sun Sep 2 13:24:51 2007 @@ -234,16 +234,16 @@ if not ctx.installdb.has_package(name): return False - info = ctx.installdb.get_info(name) - (version, release, build) = (info.version, info.release, info.build) + (version, release, build) = ctx.installdb.get_version(name) + try: - pkg = ctx.packagedb.get_package(name, ctx.packagedb.which_repo(name)) + pkg_version, pkg_release, pkg_build = ctx.packagedb.get_version(name, ctx.packagedb.which_repo(name)) except KeyboardInterrupt: raise except Exception: #FIXME: what exception could we catch here, replace with that. return False - if ignore_build or (not build) or (not pkg.build): - return pisi.version.Version(release) < pisi.version.Version(pkg.release) + if ignore_build or (not build) or (not pkg_build): + return pisi.version.Version(release) < pisi.version.Version(pkg_release) else: - return build < pkg.build + return build < pkg_build From uludag-commits at pardus.org.tr Sun Sep 2 13:24:48 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 13:24:48 +0300 (EEST) Subject: [Uludag-commits] r15257 - branches/pisi-db/pisi/cli Message-ID: <20070902102448.4A3997C00BE@liste.uludag.org.tr> Author: faik Date: Sun Sep 2 13:24:48 2007 New Revision: 15257 Modified: branches/pisi-db/pisi/cli/info.py Log: add missing util import Modified: branches/pisi-db/pisi/cli/info.py ================================================================= --- branches/pisi-db/pisi/cli/info.py (original) +++ branches/pisi-db/pisi/cli/info.py Sun Sep 2 13:24:48 2007 @@ -18,6 +18,7 @@ import pisi.cli.command as command import pisi.context as ctx +import pisi.util as util import pisi.api class Info(command.Command): From uludag-commits at pardus.org.tr Sun Sep 2 13:27:07 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 13:27:07 +0300 (EEST) Subject: [Uludag-commits] r15259 - branches/pisi-db/pisi/db Message-ID: <20070902102707.85D8E7C00BE@liste.uludag.org.tr> Author: faik Date: Sun Sep 2 13:27:07 2007 New Revision: 15259 Modified: branches/pisi-db/pisi/db/installdb.py branches/pisi-db/pisi/db/packagedb.py Log: tidy code with spaces Modified: branches/pisi-db/pisi/db/installdb.py ================================================================= --- branches/pisi-db/pisi/db/installdb.py (original) +++ branches/pisi-db/pisi/db/installdb.py Sun Sep 2 13:27:07 2007 @@ -81,12 +81,14 @@ def get_version(self, package): metadata_xml = os.path.join(self.__package_path(package), ctx.const.metadata_xml) + meta_doc = piksemel.parse(metadata_xml) history = meta_doc.getTag("Package").getTag("History") build = meta_doc.getTag("Package").getTagData("Build") version = history.getTag("Update").getTagData("Version") release = history.getTag("Update").getAttribute("release") del meta_doc + return version, release, build and int(build) def get_files(self, package): Modified: branches/pisi-db/pisi/db/packagedb.py ================================================================= --- branches/pisi-db/pisi/db/packagedb.py (original) +++ branches/pisi-db/pisi/db/packagedb.py Sun Sep 2 13:27:07 2007 @@ -87,6 +87,7 @@ version = history.getTag("Update").getTagData("Version") release = history.getTag("Update").getAttribute("release") del pkg_doc + return version, release, build and int(build) def get_package_repo(self, name, repo): From uludag-commits at pardus.org.tr Sun Sep 2 21:51:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 21:51:34 +0300 (EEST) Subject: [Uludag-commits] r15260 - trunk/staj-projeleri/imzaci Message-ID: <20070902185134.4845C7C00FB@liste.uludag.org.tr> Author: dkurov Date: Sun Sep 2 21:51:33 2007 New Revision: 15260 Added: trunk/staj-projeleri/imzaci/ Log: Working parts : 1)Certification Chain or single cert. import 2)Certification validation,chain of trust verification 3)Signing with single cert 4)Producing the hashes of files in a given dir 5)Verification signed files (not finished). From uludag-commits at pardus.org.tr Sun Sep 2 21:54:33 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 2 Sep 2007 21:54:33 +0300 (EEST) Subject: [Uludag-commits] r15261 - in trunk/staj-projeleri/imzaci/src: . digest liteDb liteDb/chain liteDb/sert m2deneme sign sign/chain sign/sert Message-ID: <20070902185433.8CEC47C00FB@liste.uludag.org.tr> Author: dkurov Date: Sun Sep 2 21:54:33 2007 New Revision: 15261 Added: trunk/staj-projeleri/imzaci/src/ trunk/staj-projeleri/imzaci/src/digest/ trunk/staj-projeleri/imzaci/src/digest/Hasher.py trunk/staj-projeleri/imzaci/src/digest/__init__.py trunk/staj-projeleri/imzaci/src/digest/cryptUtility.py trunk/staj-projeleri/imzaci/src/digest/fileList.py trunk/staj-projeleri/imzaci/src/liteDb/ trunk/staj-projeleri/imzaci/src/liteDb/__init__.py trunk/staj-projeleri/imzaci/src/liteDb/butunluk_test.py trunk/staj-projeleri/imzaci/src/liteDb/chain/ trunk/staj-projeleri/imzaci/src/liteDb/chain/cacert.pem trunk/staj-projeleri/imzaci/src/liteDb/chain/cert1.pem trunk/staj-projeleri/imzaci/src/liteDb/chain/cert1.pem~ trunk/staj-projeleri/imzaci/src/liteDb/chain/cert2.pem trunk/staj-projeleri/imzaci/src/liteDb/chain/cert2.pem~ trunk/staj-projeleri/imzaci/src/liteDb/chain/scert.pem trunk/staj-projeleri/imzaci/src/liteDb/chain/scert.pem~ trunk/staj-projeleri/imzaci/src/liteDb/chain/test.pem trunk/staj-projeleri/imzaci/src/liteDb/chain/test.pem~ trunk/staj-projeleri/imzaci/src/liteDb/dbMain.py trunk/staj-projeleri/imzaci/src/liteDb/dbtest (contents, props changed) trunk/staj-projeleri/imzaci/src/liteDb/htmlTemplate.py trunk/staj-projeleri/imzaci/src/liteDb/imza (contents, props changed) trunk/staj-projeleri/imzaci/src/liteDb/initializer.py trunk/staj-projeleri/imzaci/src/liteDb/lister.py trunk/staj-projeleri/imzaci/src/liteDb/queryList.py trunk/staj-projeleri/imzaci/src/liteDb/sert/ trunk/staj-projeleri/imzaci/src/liteDb/sert/acildi.txt trunk/staj-projeleri/imzaci/src/liteDb/sert/acildi.txt~ trunk/staj-projeleri/imzaci/src/liteDb/sert/imzalandi.pem trunk/staj-projeleri/imzaci/src/liteDb/sert/newcert.pem trunk/staj-projeleri/imzaci/src/liteDb/sert/newkey.pem trunk/staj-projeleri/imzaci/src/liteDb/signature.sig trunk/staj-projeleri/imzaci/src/liteDb/sqlkodu.sql trunk/staj-projeleri/imzaci/src/liteDb/sqlkodu.sql~ trunk/staj-projeleri/imzaci/src/liteDb/test.cert trunk/staj-projeleri/imzaci/src/liteDb/test.html trunk/staj-projeleri/imzaci/src/liteDb/test1.py trunk/staj-projeleri/imzaci/src/liteDb/yeni (contents, props changed) trunk/staj-projeleri/imzaci/src/m2deneme/ trunk/staj-projeleri/imzaci/src/sign/ trunk/staj-projeleri/imzaci/src/sign/__init__.py trunk/staj-projeleri/imzaci/src/sign/cUtil.py trunk/staj-projeleri/imzaci/src/sign/cert.py trunk/staj-projeleri/imzaci/src/sign/chai_trust_test.py trunk/staj-projeleri/imzaci/src/sign/chain/ trunk/staj-projeleri/imzaci/src/sign/chain/cacert.pem trunk/staj-projeleri/imzaci/src/sign/chain/cert1.pem trunk/staj-projeleri/imzaci/src/sign/chain/cert1.pem~ trunk/staj-projeleri/imzaci/src/sign/chain/cert2.pem trunk/staj-projeleri/imzaci/src/sign/chain/cert2.pem~ trunk/staj-projeleri/imzaci/src/sign/chain/scert.pem trunk/staj-projeleri/imzaci/src/sign/chain/scert.pem~ trunk/staj-projeleri/imzaci/src/sign/chain/test.pem trunk/staj-projeleri/imzaci/src/sign/chain/test.pem~ trunk/staj-projeleri/imzaci/src/sign/chainManage.py trunk/staj-projeleri/imzaci/src/sign/imza trunk/staj-projeleri/imzaci/src/sign/sert/ trunk/staj-projeleri/imzaci/src/sign/sert/acildi.txt trunk/staj-projeleri/imzaci/src/sign/sert/acildi.txt~ trunk/staj-projeleri/imzaci/src/sign/sert/imzalandi.pem trunk/staj-projeleri/imzaci/src/sign/sert/newcert.pem trunk/staj-projeleri/imzaci/src/sign/sert/newkey.pem trunk/staj-projeleri/imzaci/src/sign/stacker.py trunk/staj-projeleri/imzaci/src/sign/tryOverride.py Log: Working parts : 1)Certification Chain or single cert. import 2)Certification validation,chain of trust verification 3)Signing with single cert 4)Producing the hashes of files in a given dir 5)Verification signed files (not finished). From uludag-commits at pardus.org.tr Mon Sep 3 09:05:02 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 09:05:02 +0300 (EEST) Subject: [Uludag-commits] r15262 - trunk/staj-projeleri/buildfarm/helpers Message-ID: <20070903060502.4CE177C010B@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Sep 3 09:05:02 2007 New Revision: 15262 Modified: trunk/staj-projeleri/buildfarm/helpers/qmanager.py Log: removed commented and unused snippets in qmanager.py Modified: trunk/staj-projeleri/buildfarm/helpers/qmanager.py ================================================================= --- trunk/staj-projeleri/buildfarm/helpers/qmanager.py (original) +++ trunk/staj-projeleri/buildfarm/helpers/qmanager.py Mon Sep 3 09:05:02 2007 @@ -168,12 +168,6 @@ root = os.path.normpath("%s/%s/%s" % (config.remoteWorkDir, username, dirname)) # Search the root hierarchy - for i in os.listdir(root): - if os.path.isdir(i): - getPspecList(i) - elif os.path.isfile(i) and - #print root - return False def extractArchive(filename, d): from subprocess import call @@ -193,59 +187,6 @@ return True - #def processQueue(self, queue, pspec): - # self.locks["waitQueue"].lock() - # self.locks["workQueue"].lock() - # - # packagename = os.path.basename(os.path.dirname(pspec)) - # build_output = open(os.path.join(config.outputDir, "%s.log" % packagename), "w") - # logger.info( - # _("Compiling source %s (%d of %d)") % - # ( - # packagename, - # int(queue.index(pspec) + 1), - # len(queue) - # ) - # ) - # logger.raw() - # - # pisi = pisiinterface.PisiApi(config.workDir) - # - # pisi.init(stdout = build_output, stderr = build_output) - # try: - # try: - # (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) - # except Exception, e: - # self.locks["waitQueue"].unlock() - # self.locks["workQueue"].unlock() - # self.transferToWaitQueue(pspec) - # errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) - # logger.error(errmsg) - # # mailer.error(errmsg, pspec) - # else: - # try: - # for p in newBinaryPackages: - # logger.info(_("Installing: %s" % os.path.join(config.workDir, p))) - # pisi.install(os.path.join(config.workDir, p)) - # except Exception, e: - # self.locks["waitQueue"].unlock() - # self.locks["workQueue"].unlock() - # self.transferToWaitQueue(pspec) - # errmsg = _("Error occured for '%s' in INSTALL process: %s") % (os.path.join(config.workDir, p), e) - # logger.error(errmsg) - # # mailer.error(errmsg, pspec) - # - # newBinaryPackages.remove(p) - # self.__removeBinaryPackageFromWorkDir__(p) - # else: - # self.locks["waitQueue"].unlock() - # self.locks["workQueue"].unlock() - # self.removeFromWorkQueue(pspec) - # self.__movePackages__(newBinaryPackages, oldBinaryPackages) - # finally: - # pisi.finalize() - - def buildPackages(self): sys.excepthook = self.__handle_exception__ From uludag-commits at pardus.org.tr Mon Sep 3 10:24:18 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 10:24:18 +0300 (EEST) Subject: [Uludag-commits] r15263 - trunk/staj-projeleri/buildfarm Message-ID: <20070903072418.7CE267C0107@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Sep 3 10:24:18 2007 New Revision: 15263 Modified: trunk/staj-projeleri/buildfarm/client.py Log: a nicer cli with the support of adding/removing/transferring multiple packages betweeen queues Modified: trunk/staj-projeleri/buildfarm/client.py ================================================================= --- trunk/staj-projeleri/buildfarm/client.py (original) +++ trunk/staj-projeleri/buildfarm/client.py Mon Sep 3 10:24:18 2007 @@ -96,9 +96,13 @@ $ %(program)s remove work all """ % subst) -def client(op, cmd=None, pspec=None): +def client(op, **kwargs): + # TODO : I can build a list of all formatted strings and select them + # with the return values provided by the server to minimize the code. funcString = None + cmd = kwargs.get('cmd', None) + pspecList = kwargs.get('pspec', None) # Get a connection handle remoteURI = "https://" + REMOTE_HOST + ":" + str(REMOTE_PORT) @@ -127,22 +131,15 @@ pass # 2 Parameters + elif op == "send": # pspec is a directory which can contain 1 or more packages - retval = sendDirectory(server, pspec, "ozan") + retval = sendDirectory(server, kwargs[pspec], "ozan") if retval: print _("Everything's OK") else: print _("There were problems during the process") - elif op == "add": - retval = server.appendToWorkQueue(pspec,True) - - if retval: - print _("%s successfully added to the work queue!" % pspec) - else: - print _("The package '%s' doesn't exist or is already in the work queue!" % pspec) - elif op == "list": funcString = "get" + cmd.capitalize() + "Queue" result = server.__getattr__(funcString)() @@ -164,28 +161,45 @@ print _("Queue finished with problems and those packages couldn't be compiled:\n\n%s\n")\ % "\n".join(server.getWaitQueue()) - # 3 Parameters + # 3 or more Parameters + elif op == "add": + for pspec in pspecList: + retval = server.appendToWorkQueue(pspec, True) + if retval == 0: + print _("%s successfully added to the work queue!" % pspec) + elif retval == -1: + print _("The package '%s' doesn't exist!" % pspec) + elif retval == 1: + print _("The package '%s' is already in the work queue!" % pspec) + elif op == "remove": funcString = "removeFrom" + cmd.capitalize() + "Queue" - print _("Removing '%s' from %s queue.." % (pspec, cmd)) - retval = server.__getattr__(funcString)(pspec) - if retval: - print _("Removed!") - else: - print _("Make sure that the packages are already in the %s queue!" % cmd) + for pspec in pspecList: + print _("Removing '%s' from %s queue.." % (pspec, cmd)), + retval = server.__getattr__(funcString)(pspec) + if retval: + print _("[Removed]") + else: + print _("[Doesn't exist]") elif op == "transfer": funcString = "transferTo" + cmd.capitalize() + "Queue" - retval = server.__getattr__(funcString)(pspec) - if retval: - print _("%s transferred to %s queue!" % (pspec, cmd)) - else: - print _("Make sure that the queue contains %s!" % pspec) - + for pspec in pspecList: + print _("Transferring '%s' to %s queue.." % (pspec, cmd)), + retval = server.__getattr__(funcString)(pspec) + if retval: + print _("[Transferred]") + else: + print _("[Doesn't exist]") + if __name__ == "__main__": args = sys.argv[1:] + # dummy trick to facilitate parsing of 'add' in the next blocks.. + if args[0] == "add": + args.insert(1, "work") + if args == []: usage() @@ -199,17 +213,18 @@ usage() elif len(args) == 2: - if args[0] in ("add","send"): + # doesn't work. + if args[0] in ("send"): client(args[0],pspec=args[1]) elif args[0] == "list" and args[1] in ("work","wait") or \ args[0] == "build" and args[1] in ("index","packages"): - client(args[0],args[1]) + client(args[0],cmd=args[1]) else: usage() - - elif len(args) == 3: - if args[0] in ("remove","transfer") and args[1] in ("work","wait"): - client(args[0],args[1],args[2]) + + elif len(args) >= 3: + if args[0] in ("add","remove","transfer") and args[1] in ("work","wait"): + client(args[0],cmd=args[1],pspec=args[2:]) else: usage() From uludag-commits at pardus.org.tr Mon Sep 3 10:58:01 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 10:58:01 +0300 (EEST) Subject: [Uludag-commits] r15264 - trunk/comar/mudur/bin Message-ID: <20070903075801.5E89D7C0109@liste.uludag.org.tr> Author: selda.kuruoglu Date: Mon Sep 3 10:58:01 2007 New Revision: 15264 Modified: trunk/comar/mudur/bin/network.py Log: format corrections + authentication operationsa Modified: trunk/comar/mudur/bin/network.py ================================================================= --- trunk/comar/mudur/bin/network.py (original) +++ trunk/comar/mudur/bin/network.py Mon Sep 3 10:58:01 2007 @@ -24,7 +24,7 @@ def input_number(max_no): """ Checks limits of read input from command line -any excess will cause warning- """ input = int(raw_input('->')) - while ( input > max_no or input <= 0 ) : + while ( input >= max_no or input <= 0 ) : print _("Limit excess, please enter a valid number: ( interval: 0 < entry < %s )") % max_no input = int(raw_input('->')) return input @@ -43,13 +43,13 @@ return [reply] class AuthenticationMode : + """ Authentication Mode : identifier: used when calling methods, type: specifies login options, name: readable name for users """ def __init__ (self,data): list = data.split(",") self.identifier = list[0] self.type = list[1] self.name = list[2] - class Link: """ Link class: possible attributes : name, modes, type, remote_name , auth""" def __init__(self, data): @@ -67,10 +67,10 @@ self.remote_name = value elif key == "auth_modes": self.parse(value) - def parse(self,data): #parser for authentication modes - """ """ - for line in data.split(";"): #related authentication mode objects are created and added to auth_modes list - mode = AuthenticationMode(line) + def parse(self,data): + """ Parser for reading avaible authentication modes for current Link """ + for line in data.split(";"): + mode = AuthenticationMode(line) #related authentication mode objects are created and added to auth_modes list self.auth_modes.append(mode) class Device: @@ -188,11 +188,10 @@ links[rep.script] = Link(rep.data) ################# TEST code for parsing operations of Link authentication properties ########################### - if (links[rep.script].auth_modes): - print "\nAuthentication mode properties for % s" % links[rep.script].name + print "\nAuthentication mode properties for % s \n" % links[rep.script].name for item in links[rep.script].auth_modes : - line = "identifier:" + item.identifier + "\t type: "+ item.type + "\t name: "+item.name + line = "identifier: " + item.identifier.ljust(15) + "type: "+ item.type + "\t name: "+item.name print line ################################################################################################################ print @@ -303,11 +302,7 @@ usage() return else: - name=args[0] - i = 1 - while ( i!= len(args)): # for profiles that has names having more than one word - name = name + " "+ args[i] - i += 1 + name=" ".join(args) com = comar.Link() #communicating with comar deamon com.localize() #set language for translated replies com.Net.Link.connectionInfo(name=name) #get connection info from comar deamon @@ -327,7 +322,7 @@ print _("Select connection type:") for i, link in enumerate(links.values()): print "%2d." % (i + 1), link.name - s = input_number(len(links.values())) + s = input_number(len(links.values())+1) link = links.values()[s-1] script = links.keys()[s-1] @@ -350,10 +345,12 @@ print _("Select connection device:") for i, dev in enumerate(devs): print "%2d." % (i + 1), dev.name - s = input_number(len(devs)) + s = input_number(len(devs)+1) device = devs[s-1] # Remote point + global selected_auth_type + selected_auth_type = None if "remote" in link.modes: print print link.remote_name @@ -365,7 +362,7 @@ if remotes: for i, remote in enumerate(remotes): print "%2d." % (i + 3), str(remote) - s = input_number(len(remotes)) + s = int( raw_input('->') ) if s == 1: remote = raw_input('%s -> ' % link.remote_name) break @@ -380,6 +377,7 @@ print link.remote_name else: remote = remotes[s-3].remote + selected_auth_type = remotes[s-3].encryption break else: remote = raw_input('-> ') @@ -392,7 +390,7 @@ if "auto" in link.modes: print " 1. %s" % _("Automatic query (DHCP)") print " 2. %s" % _("Manual configuration") - s = input_number(2) + s = input_number(3) if s == 1: is_auto = True if not is_auto: @@ -400,31 +398,28 @@ mask = raw_input('%s -> ' % _("Network mask")) gateway = raw_input('%s -> ' % _("Gateway")) - # Authentication - if (link.auth_modes): + # Authentication settings + if ( link.auth_modes ): + if ( selected_auth_type ): + chosen_mode = AuthenticationMode( selected_auth_type + ",pass,"+ selected_auth_type ) + else: + i = 1 + print _("Choose authentication type:") + for mode in link.auth_modes: + print "%s -> %s" % ( i,mode.name) + i += 1 + print "%s -> No authentication" % i + mode_no = input_number(i+1) + if (mode_no != i) : + chosen_mode = link.auth_modes [mode_no-1] + if (chosen_mode.type == "pass" ): + user_name = "" + password = raw_input('%s -> ' % _("Enter password ")) + elif (chosen_mode.type == "login") : + user_name = raw_input('%s -> ' % _("Enter user name ")) + password = raw_input('%s -> ' % _("Enter password ")) - i = 1 - print _("Choose authentication type:") - for mode in link.auth_modes: - print "%s -> %s" % ( i,mode.name) - i += 1 - - mode_no = raw_input("->") - mode_no = int(mode_no) - while ( mode_no > len (link.auth_modes) or mode_no < 0 ) : - print _("Please enter a valid authentication type id ") - mode_no = int (raw_input("-> ")) - - chosen_mode = link.auth_modes [mode_no-1] - - if (chosen_mode.type == "pass" ): - password = raw_input('%s -> ' % _("Enter password ")) - elif (chosen_mode.type == "login") : - user_name = raw_input('%s -> ' % _("Enter user name ")) - password = raw_input('%s -> ' % _("Enter password ")) - - ###script_object.setAuthentication(chosen_mode.identifier???, user_name, password, key??? ) ????????????????? - + script_object.setAuthentication(name= conn_name, authmode=chosen_mode.identifier, user=user_name, password=password) # Create profile script_object.setConnection(name=conn_name, device=device.uid) @@ -446,12 +441,7 @@ print _("Please enter a valid profile name ") profile_name = raw_input() else: - profile_name=args[0]## - i = 1 - while ( i!= len(args)): # for profiles that has names having more than one word - name = name + " "+ args[i] - i += 1 ### gecerli profil kontrolu burada da yaplmal.......### - + profile_name=" ".join(args) com = comar.Link() com.localize() com.Net.Link.connectionInfo(name=profile_name) @@ -465,15 +455,11 @@ if ( len(args) == 0 ): profile_name = raw_input('%s -> ' % _("Enter name of profile")) else: - profile_name=args[0] - i = 1 # for profiles that has names having more than one word - while ( i!= len(args)): - profile_name = profile_name + " "+ args[i] - i += 1 + profile_name=" ".join(args) com = comar.Link() com.localize() com.Net.Link.connectionInfo(name=profile_name) - deneme_link = Link() + global found found = False for reply in collect(com): @@ -481,10 +467,10 @@ found = True profile = Profile(reply.script, profile_name) profile.parse( reply.data ) + print profile.print_info() if ( not found ) : print _("No such profile") - def usage(args=None): """ Prints 'network' script usage """ @@ -521,4 +507,4 @@ if __name__ == "__main__": locale.setlocale(locale.LC_ALL, '') main(sys.argv[1:]) -#!/usr/bin/env python + From uludag-commits at pardus.org.tr Mon Sep 3 12:05:56 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 12:05:56 +0300 (EEST) Subject: [Uludag-commits] r15265 - in trunk/staj-projeleri: Packager Pakito Pakito-eski Pakito/gui Pakito/gui/pspecWgt Pakito/gui/pspecWgt/dialogs Pakito/uis Pakito/uis/dialogs Pakito/uis/dialogs/dependencyDialog Pakito/uis/dialogs/fileDialog Pakito/uis/dialogs/historyDialog Pakito/uis/dialogs/summaryDialog Pakito/uis/pspecWidget Message-ID: <20070903090556.D98B07C0109@liste.uludag.org.tr> Author: gokcen.eraslan Date: Mon Sep 3 12:05:56 2007 New Revision: 15265 Added: trunk/staj-projeleri/Pakito/ trunk/staj-projeleri/Pakito-eski/ - copied from r15264, trunk/staj-projeleri/Packager/ trunk/staj-projeleri/Pakito/.project trunk/staj-projeleri/Pakito/.pydevproject trunk/staj-projeleri/Pakito/actions-template.py trunk/staj-projeleri/Pakito/gui/ trunk/staj-projeleri/Pakito/gui/__init__.py trunk/staj-projeleri/Pakito/gui/actionsWidget.py trunk/staj-projeleri/Pakito/gui/editors.py trunk/staj-projeleri/Pakito/gui/mainwindow.py trunk/staj-projeleri/Pakito/gui/pspecWgt/ trunk/staj-projeleri/Pakito/gui/pspecWgt/__init__.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/__init__.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialog.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialogUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialog.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialogUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialog.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialogUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryWidgetUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidgetUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidget.py trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidgetUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidget.py trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py trunk/staj-projeleri/Pakito/gui/pspecWidget.py trunk/staj-projeleri/Pakito/pakito.py (contents, props changed) trunk/staj-projeleri/Pakito/pspec-template.xml trunk/staj-projeleri/Pakito/uis/ trunk/staj-projeleri/Pakito/uis/dialogs/ trunk/staj-projeleri/Pakito/uis/dialogs/dependencyDialog/ trunk/staj-projeleri/Pakito/uis/dialogs/dependencyDialog/dependencyDialogUI.ui trunk/staj-projeleri/Pakito/uis/dialogs/fileDialog/ trunk/staj-projeleri/Pakito/uis/dialogs/fileDialog/fileDialogUI.ui trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/ trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui trunk/staj-projeleri/Pakito/uis/dialogs/summaryDialog/ trunk/staj-projeleri/Pakito/uis/dialogs/summaryDialog/summaryDialogUI.ui trunk/staj-projeleri/Pakito/uis/dialogs/summaryDialog/summaryWidgetUI.ui trunk/staj-projeleri/Pakito/uis/pspecWidget/ trunk/staj-projeleri/Pakito/uis/pspecWidget/historyWidgetUI.ui trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui Removed: trunk/staj-projeleri/Packager/ Log: packager->pakito; new ui files and dialogs From uludag-commits at pardus.org.tr Mon Sep 3 13:42:41 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 13:42:41 +0300 (EEST) Subject: [Uludag-commits] r15266 - trunk/staj-projeleri/buildfarm Message-ID: <20070903104241.8E7577C0104@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Sep 3 13:42:40 2007 New Revision: 15266 Modified: trunk/staj-projeleri/buildfarm/client.py Log: more improvements over cli. added a dictionary of server return codes and their meanings. Modified: trunk/staj-projeleri/buildfarm/client.py ================================================================= --- trunk/staj-projeleri/buildfarm/client.py (original) +++ trunk/staj-projeleri/buildfarm/client.py Mon Sep 3 13:42:40 2007 @@ -98,6 +98,19 @@ def client(op, **kwargs): + # Used for identifying server return codes in a user friendly manner + returnStrings = {'build' : [_("Build process is successfully finished!"), + _("Buildfarm is busy!"), + _("Work Queue is empty!"), + _("Queue finished with problems :(")], + 'add' : [_("%s successfully added to the work queue!"), + _("The package '%s' doesn't exist!"), + _("The package '%s' is already in the work queue!")] + } + + + + # TODO : I can build a list of all formatted strings and select them # with the return values provided by the server to minimize the code. funcString = None @@ -127,9 +140,6 @@ else: print_("The repositories are already synchronized.") - elif op == "status": - pass - # 2 Parameters elif op == "send": @@ -153,24 +163,13 @@ funcString = "build" + cmd.capitalize() print _("Building %s..." % cmd) retval = server.__getattr__(funcString)() - if retval == 0: - print _("Packages are successfully builded!") - elif retval == 1: - print _("Work Queue is empty!") - elif retval == 2: - print _("Queue finished with problems and those packages couldn't be compiled:\n\n%s\n")\ - % "\n".join(server.getWaitQueue()) + print returnStrings['build'][retval] # 3 or more Parameters elif op == "add": for pspec in pspecList: retval = server.appendToWorkQueue(pspec, True) - if retval == 0: - print _("%s successfully added to the work queue!" % pspec) - elif retval == -1: - print _("The package '%s' doesn't exist!" % pspec) - elif retval == 1: - print _("The package '%s' is already in the work queue!" % pspec) + print (returnStrings['add'][retval] % pspec) elif op == "remove": funcString = "removeFrom" + cmd.capitalize() + "Queue" @@ -197,7 +196,7 @@ args = sys.argv[1:] # dummy trick to facilitate parsing of 'add' in the next blocks.. - if args[0] == "add": + if args.__contains__("add"): args.insert(1, "work") if args == []: @@ -207,7 +206,7 @@ usage() elif len(args) == 1: - if args[0] in ("update","sync","status"): + if args[0] in ("update","sync"): client(args[0]) else: usage() From uludag-commits at pardus.org.tr Mon Sep 3 13:45:12 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 13:45:12 +0300 (EEST) Subject: [Uludag-commits] r15267 - trunk/staj-projeleri/buildfarm Message-ID: <20070903104512.DA89D7C0104@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Sep 3 13:45:12 2007 New Revision: 15267 Modified: trunk/staj-projeleri/buildfarm/config.py Log: removed unnecessary config strings Modified: trunk/staj-projeleri/buildfarm/config.py ================================================================= --- trunk/staj-projeleri/buildfarm/config.py (original) +++ trunk/staj-projeleri/buildfarm/config.py Mon Sep 3 13:45:12 2007 @@ -21,12 +21,6 @@ localPspecRepo = "./exampleRepo" # must be an absolute path! logFile = "%s/buildfarm.log" % workDir -#Configuration info for remote building/installing process -remoteWorkDir = "%s/remote" % workDir -remoteOutputDir = "%s/buildlogs" % remoteWorkDir -remoteBinaryPath = "/var/cache/pisi/remote/packages" -logFile = "%s/buildfarm.log" % remoteWorkDir - #information for mailer module. mailFrom = "buildfarm at pardus.org.tr" ccList = [] From uludag-commits at pardus.org.tr Mon Sep 3 14:21:15 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 14:21:15 +0300 (EEST) Subject: [Uludag-commits] r15268 - trunk/staj-projeleri/buildfarm/helpers Message-ID: <20070903112115.6178C7C007B@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Sep 3 14:21:15 2007 New Revision: 15268 Modified: trunk/staj-projeleri/buildfarm/helpers/qmanager.py Log: changed the method of locking. removed unnecessary parts. added well-defined return values for some import functions Modified: trunk/staj-projeleri/buildfarm/helpers/qmanager.py ================================================================= --- trunk/staj-projeleri/buildfarm/helpers/qmanager.py (original) +++ trunk/staj-projeleri/buildfarm/helpers/qmanager.py Mon Sep 3 14:21:15 2007 @@ -17,8 +17,6 @@ from shutil import copy as shutilCopy from copy import copy as shallowCopy -from comar.utility import FileLock - """ BuildFarm Modules """ import config import dependency @@ -27,6 +25,7 @@ """ Helpers """ from helpers import pisiinterface +from comar.utility import FileLock """ Gettext Support """ import gettext @@ -38,7 +37,8 @@ def __init__(self): self.locks = {"waitQueue" : FileLock("%s/waitQueue.lock" % config.workDir), - "workQueue" : FileLock("%s/workQueue.lock" % config.workDir)} + "workQueue" : FileLock("%s/workQueue.lock" % config.workDir), + "build" : FileLock("%s/build.lock" % config.workDir)} self.workQueue = [] self.waitQueue = [] @@ -73,7 +73,7 @@ self.locks[fileName].unlock() def __deserialize__(self, queueName, fileName): - self.locks[fileName].lock(shared=True) + self.locks[fileName].lock() try: queue = open(os.path.join(config.workDir, fileName), "r") except IOError: @@ -104,11 +104,7 @@ def removeFromWaitQueue(self, pspec): self.__initWaitQueueFromFile__() - if pspec == "all" and self.waitQueue != []: - self.waitQueue = [] - self.__serialize__(self.waitQueue, "waitQueue") - return True - elif self.waitQueue.__contains__(pspec): + if self.waitQueue.__contains__(pspec): self.waitQueue.remove(pspec) self.__serialize__(self.waitQueue, "waitQueue") return True @@ -116,28 +112,26 @@ def removeFromWorkQueue(self, pspec): self.__initWorkQueueFromFile__() - if pspec == "all" and self.workQueue != []: - self.workQueue = [] - self.__serialize__(self.workQueue, "workQueue") - return True - elif self.workQueue.__contains__(pspec): + if self.workQueue.__contains__(pspec): self.workQueue.remove(pspec) - # serialize'da patliyor buildPackages() self.__serialize__(self.workQueue, "workQueue") return True return False def appendToWorkQueue(self, pspec, checkIfExists=False): + # 0: Successful + # 1: Package doesn't exist + # 2: Package is already in the queue if checkIfExists: if not os.path.isfile(os.path.join(config.localPspecRepo, pspec)): - return False + return 1 self.__initWorkQueueFromFile__() if not self.workQueue.__contains__(pspec): self.workQueue.append(pspec) self.__serialize__(self.workQueue, "workQueue") - return True - return False + return 0 + return 2 def appendToWaitQueue(self, pspec): self.__initWaitQueueFromFile__() @@ -155,6 +149,10 @@ return False def transferToWaitQueue(self, pspec): + f = sys._getframe(1) + methodName = f.f_code.co_name + print methodName + self.__initWorkQueueFromFile__() if self.workQueue.__contains__(pspec) and self.appendToWaitQueue(pspec): self.removeFromWorkQueue(pspec) @@ -163,12 +161,6 @@ def buildArchive(self, dirname, filename, d, username=""): - def getPspecList(dirname): - # Searchs the dirname and returns a list of pspec.xml's - root = os.path.normpath("%s/%s/%s" % (config.remoteWorkDir, username, dirname)) - - # Search the root hierarchy - def extractArchive(filename, d): from subprocess import call dir = os.path.join(config.remoteWorkDir, username) @@ -188,21 +180,29 @@ return True def buildPackages(self): - + # Return values are interpreted by the client + # 0: Successful + # 1: Buildfarm is busy + # 2: Empty work queue + # 3: Finished with errors + + try: + self.locks["build"].lock(timeout=0) + except: + return 1 + sys.excepthook = self.__handle_exception__ queue = shallowCopy(self.getWorkQueue()) if len(queue) == 0: logger.info(_("Work queue is empty...")) - return True - - self.locks["workQueue"].lock(shared=True) - self.locks["waitQueue"].lock(shared=True) + self.locks["build"].unlock() + return 2 logger.raw(_("QUEUE")) - logger.info(_("Work Queue: %s") % (self.getWorkQueue())) - sortedQueue = self.getWorkQueue()[:] + logger.info(_("Work Queue: %s") % (queue)) + sortedQueue = queue[:] sortedQueue.sort() # mailer.info(_("I'm starting to compile following packages:\n\n%s") % "\n".join(sortedQueue)) logger.raw() @@ -226,8 +226,6 @@ try: (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) except Exception, e: - self.locks["workQueue"].unlock() - self.locks["waitQueue"].unlock() self.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) logger.error(errmsg) @@ -238,8 +236,6 @@ logger.info(_("Installing: %s" % os.path.join(config.workDir, p))) pisi.install(os.path.join(config.workDir, p)) except Exception, e: - self.locks["workQueue"].unlock() - self.locks["waitQueue"].unlock() self.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in INSTALL process: %s") % (os.path.join(config.workDir, p), e) logger.error(errmsg) @@ -247,9 +243,6 @@ newBinaryPackages.remove(p) self.__removeBinaryPackageFromWorkDir__(p) else: - self.locks["workQueue"].unlock() - self.locks["waitQueue"].unlock() - print "hede" self.removeFromWorkQueue(pspec) self.__movePackages__(newBinaryPackages, oldBinaryPackages) finally: @@ -261,13 +254,25 @@ if self.getWaitQueue(): # mailer.info(_("Queue finished with problems and those packages couldn't be compiled:\n\n%s\n") % "\n".join(self.getWaitQueue())) - return self.getWaitQueue() + self.workQueue += self.waitQueue + self.waitQueue = [] + self.__del__() + self.locks["build"].unlock() + return 3 else: # mailer.info(_("Queue finished without a problem!...")) pass - return True + + self.locks["build"].unlock() + return 0 def buildIndex(self): + + try: + self.locks["build"].lock(timeout=0) + except: + return 1 + logger.raw() logger.info(_("Generating PiSi Index...")) @@ -286,7 +291,9 @@ os.chdir(current) # FIXME: handle indexing errors - return True + + self.locks["build"].unlock() + return 0 def __movePackages__(self, newBinaryPackages, oldBinaryPackages): # sanitaze input From uludag-commits at pardus.org.tr Mon Sep 3 15:03:06 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 15:03:06 +0300 (EEST) Subject: [Uludag-commits] r15269 - trunk/comar/mudur/bin Message-ID: <20070903120306.0E7777C0103@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Sep 3 15:03:05 2007 New Revision: 15269 Modified: trunk/comar/mudur/bin/network.py Log: kozmetik Modified: trunk/comar/mudur/bin/network.py ================================================================= --- trunk/comar/mudur/bin/network.py (original) +++ trunk/comar/mudur/bin/network.py Mon Sep 3 15:03:05 2007 @@ -23,10 +23,10 @@ def input_number(max_no): """ Checks limits of read input from command line -any excess will cause warning- """ - input = int(raw_input('->')) + input = int(raw_input('-> ')) while ( input >= max_no or input <= 0 ) : print _("Limit excess, please enter a valid number: ( interval: 0 < entry < %s )") % max_no - input = int(raw_input('->')) + input = int(raw_input('-> ')) return input def collect(c): @@ -171,11 +171,11 @@ self.encryption = value def __str__(self): - if self.encryption and self.encryption != "none": - txt = ">-~" - else: - txt = " " - txt += " %4s %s" % ("+" * (self.quality / 25), self.remote) + label = self.remote + quality = "+" * ((self.quality / 25) + 1) + txt = _("Found: %s [%s]") % (label.ljust(20), quality.ljust(5)) + if self.encryption and self.encryption != "none": + txt += " " + _("[encrypted]") return txt def queryLinks(com): @@ -362,7 +362,7 @@ if remotes: for i, remote in enumerate(remotes): print "%2d." % (i + 3), str(remote) - s = int( raw_input('->') ) + s = int( raw_input('-> ') ) if s == 1: remote = raw_input('%s -> ' % link.remote_name) break From uludag-commits at pardus.org.tr Mon Sep 3 16:14:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 16:14:31 +0300 (EEST) Subject: [Uludag-commits] r15270 - in trunk/staj-projeleri/Pakito: gui/pspecWgt gui/pspecWgt/dialogs uis/dialogs/historyDialog Message-ID: <20070903131431.58BC57C0102@liste.uludag.org.tr> Author: gokcen.eraslan Date: Mon Sep 3 16:14:31 2007 New Revision: 15270 Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui Log: history dialog Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py ================================================================= --- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py (original) +++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py Mon Sep 3 16:14:31 2007 @@ -5,12 +5,28 @@ from historyDialogUI import HistoryDialogUI class HistoryDialog(HistoryDialogUI): - def __init__(self, parent = None, release = None, name = None): + def __init__(self, parent = None, release = None, relValue = 1, name = None): HistoryDialogUI.__init__(self, parent, name) + self.dwDate.setDate(QDate.currentDate()) + self.niRelease.setValue(relValue) self.connect(self.btnOk, SIGNAL("clicked()"), self, SLOT("accept()")) self.connect(self.btnCancel, SIGNAL("clicked()"), self, SLOT("reject()")) if release: self.niRelease.setValue(int(release[0])) + self.dwDate.setDate(QDate.fromString(release[1], Qt.ISODate)) + self.leVersion.setText(release[2]) + self.cbType.setCurrentText(release[3]) + self.teComment.setText(release[4]) + self.leName.setText(release[5]) + self.leEmail.setText(release[6]) def getResult(self): - pass + res = [] + res.append(str(self.niRelease.value())) + res.append(str(self.dwDate.date().toString("yyyy-MM-dd"))) + res.append(str(self.leVersion.text())) + res.append(str(self.cbType.currentText())) + res.append(unicode(self.teComment.text())) + res.append(unicode(self.leName.text())) + res.append(str(self.leEmail.text())) + return res Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py ================================================================= --- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py (original) +++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py Mon Sep 3 16:14:31 2007 @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '../../../uis/dialogs/historyDialog/historyDialogUI.ui' # -# Created: Pzt Eyl 3 00:50:25 2007 +# Created: Pzt Eyl 3 16:14:10 2007 # by: The PyQt User Interface Compiler (pyuic) 3.17.3 # # WARNING! All changes made in this file will be lost! @@ -44,10 +44,6 @@ groupBox2Layout.addWidget(self.textLabel8,1,0) - self.leType = KLineEdit(self.groupBox2,"leType") - - groupBox2Layout.addWidget(self.leType,1,4) - layout22 = QVBoxLayout(None,0,6,"layout22") self.textLabel9 = QLabel(self.groupBox2,"textLabel9") @@ -61,27 +57,31 @@ groupBox2Layout.addWidget(self.leVersion,1,1) - self.niRelease = KIntNumInput(self.groupBox2,"niRelease") - self.niRelease.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.niRelease.sizePolicy().hasHeightForWidth())) - self.niRelease.setValue(1) - self.niRelease.setMinValue(1) - - groupBox2Layout.addWidget(self.niRelease,0,1) - self.dwDate = KDateWidget(self.groupBox2,"dwDate") self.dwDate.setDate(QDate(2006,1,1)) groupBox2Layout.addWidget(self.dwDate,0,4) - spacer19 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum) - groupBox2Layout.addItem(spacer19,0,2) self.teComment = KTextEdit(self.groupBox2,"teComment") groupBox2Layout.addMultiCellWidget(self.teComment,2,2,1,4) + self.cbType = KComboBox(0,self.groupBox2,"cbType") + + groupBox2Layout.addWidget(self.cbType,1,4) + self.textLabel6 = QLabel(self.groupBox2,"textLabel6") groupBox2Layout.addWidget(self.textLabel6,0,0) + + self.niRelease = KIntNumInput(self.groupBox2,"niRelease") + self.niRelease.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.niRelease.sizePolicy().hasHeightForWidth())) + self.niRelease.setValue(1) + self.niRelease.setMinValue(1) + + groupBox2Layout.addWidget(self.niRelease,0,1) + spacer19 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum) + groupBox2Layout.addItem(spacer19,0,2) HistoryDialogUILayout.addWidget(self.groupBox2) self.groupBox3 = QGroupBox(self,"groupBox3") @@ -105,7 +105,7 @@ self.leEmail = KLineEdit(self.groupBox3,"leEmail") groupBox3Layout.addWidget(self.leEmail) HistoryDialogUILayout.addWidget(self.groupBox3) - spacer25 = QSpacerItem(20,40,QSizePolicy.Minimum,QSizePolicy.Expanding) + spacer25 = QSpacerItem(20,10,QSizePolicy.Minimum,QSizePolicy.Fixed) HistoryDialogUILayout.addItem(spacer25) Layout1 = QHBoxLayout(None,0,6,"Layout1") @@ -128,12 +128,11 @@ self.languageChange() - self.resize(QSize(550,377).expandedTo(self.minimumSizeHint())) + self.resize(QSize(550,421).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) self.setTabOrder(self.niRelease,self.leVersion) - self.setTabOrder(self.leVersion,self.leType) - self.setTabOrder(self.leType,self.teComment) + self.setTabOrder(self.leVersion,self.teComment) self.setTabOrder(self.teComment,self.leName) self.setTabOrder(self.leName,self.leEmail) self.setTabOrder(self.leEmail,self.btnHelp) @@ -148,6 +147,10 @@ self.textLabel7.setText(self.__tr("Date:")) self.textLabel8.setText(self.__tr("Version:")) self.textLabel9.setText(self.__tr("Comment:")) + self.cbType.clear() + self.cbType.insertItem(QString.null) + self.cbType.insertItem(self.__tr("bug")) + self.cbType.insertItem(self.__tr("security")) self.textLabel6.setText(self.__tr("Release:")) self.groupBox3.setTitle(self.__tr("Updater")) self.textLabel10.setText(self.__tr("Name:")) Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py ================================================================= --- trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py (original) +++ trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py Mon Sep 3 16:14:31 2007 @@ -10,6 +10,7 @@ from pisi.replace import Replace from historyWidgetUI import HistoryWidgetUI +from dialogs.historyDialog import HistoryDialog class historyWidget(HistoryWidgetUI): def __init__(self, parent): @@ -30,20 +31,38 @@ rel.type = "" lvi = KListViewItem(self.lvHistory, rel.release, rel.date, rel.version, - rel.comment, rel.name, + unicode(rel.comment), rel.name, rel.email, rel.type) if reverse: lvi.moveItem(self.lvHistory.lastItem()) def slotAddHistory(self): - pass + dia = HistoryDialog(self, relValue = self.lvHistory.childCount() + 1) + if dia.exec_loop() == QDialog.Accepted: + res = dia.getResult() + lvi = QListViewItem(self.lvHistory, res[0], res[1], res[2], res[4], res[5], res[6], res[3]) def slotRemoveHistory(self): - pass + lvi = self.lvHistory.selectedItem() + if lvi: + self.lvHistory.takeItem(lvi) def slotBrowseHistory(self): - pass - + lvi = self.lvHistory.selectedItem() + if not lvi: + return + dia = HistoryDialog(self, [str(lvi.text(0)), str(lvi.text(1)), str(lvi.text(2)), str(lvi.text(6)), unicode(lvi.text(3)), unicode(lvi.text(4)), str(lvi.text(5))]) + if dia.exec_loop() == QDialog.Rejected: + return + res = dia.getResult() + lvi.setText(0, res[0]) + lvi.setText(1, res[1]) + lvi.setText(2, res[2]) + lvi.setText(3, res[4]) + lvi.setText(4, res[5]) + lvi.setText(5, res[6]) + lvi.setText(6, res[3]) + def fill(self, history): self.lvHistory.clear() for rel in history: Modified: trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui ================================================================= --- trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui (original) +++ trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui Mon Sep 3 16:14:31 2007 @@ -9,7 +9,7 @@ 0 0 550 - 377 + 421 @@ -71,11 +71,6 @@ Version: - - - leType - - layout22 @@ -116,6 +111,51 @@ leVersion + + + dwDate + + + + 2006 + 1 + 1 + + + + + + teComment + + + + + + + + + + + bug + + + + + security + + + + cbType + + + + + textLabel6 + + + Release: + + niRelease @@ -135,18 +175,6 @@ 1 - - - dwDate - - - - 2006 - 1 - 1 - - - spacer19 @@ -164,19 +192,6 @@ - - - teComment - - - - - textLabel6 - - - Release: - - @@ -243,12 +258,12 @@ Vertical - Expanding + Fixed 20 - 40 + 10 @@ -332,10 +347,11 @@ + + niRelease leVersion - leType teComment leName leEmail @@ -347,11 +363,11 @@ kdialog.h klineedit.h - klineedit.h - knuminput.h - knuminput.h kdatewidget.h ktextedit.h + kcombobox.h + knuminput.h + knuminput.h klineedit.h klineedit.h From uludag-commits at pardus.org.tr Mon Sep 3 16:29:01 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 16:29:01 +0300 (EEST) Subject: [Uludag-commits] r15271 - trunk/repository-scripts/xorg Message-ID: <20070903132901.AE2067C0102@liste.uludag.org.tr> Author: caglar Date: Mon Sep 3 16:29:01 2007 New Revision: 15271 Modified: trunk/repository-scripts/xorg/proto Log: bump Modified: trunk/repository-scripts/xorg/proto ================================================================= --- trunk/repository-scripts/xorg/proto (original) +++ trunk/repository-scripts/xorg/proto Mon Sep 3 16:29:01 2007 @@ -8,12 +8,12 @@ fontcacheproto-0.1.2.tar.bz2 fontsproto-2.0.2.tar.bz2 glproto-1.4.8.tar.bz2 -inputproto-1.4.2.tar.bz2 +inputproto-1.4.2.1.tar.bz2 kbproto-1.0.3.tar.bz2 printproto-1.0.3.tar.bz2 randrproto-1.2.1.tar.bz2 recordproto-1.13.2.tar.bz2 -renderproto-0.9.2.tar.bz2 +renderproto-0.9.3.tar.bz2 resourceproto-1.0.2.tar.bz2 scrnsaverproto-1.1.0.tar.bz2 trapproto-3.4.3.tar.bz2 From uludag-commits at pardus.org.tr Mon Sep 3 16:49:41 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Sep 2007 16:49:41 +0300 (EEST) Subject: [Uludag-commits] r15272 - trunk/tasma/network-manager Message-ID: <20070903134941.4D4497C0102@liste.uludag.org.tr> Author: isbaran