From f354a47d4a953ac2b759a4f0e5deefc2eab7bb99 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 12 Dec 2006 12:37:08 +0000 Subject: [PATCH 001/212] pisi-1.1 ======== - Missed "version" and "release" states in Dependency and Conflict classes fix - User warning message updates - Translation updates --- pisi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/__init__.py b/pisi/__init__.py index 95d9ef74..7c68b663 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,7 +12,7 @@ # PiSi version -__version__ = "1.1_rc10" +__version__ = "1.1" __dbversion__ = "1.1_rc7" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck From 44030128610f54d9a8845d676d816cf137feba70 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 17 Jan 2007 14:22:51 +0000 Subject: [PATCH 002/212] * pisi-1.1 maintanence branch. --- RefactorPlan | 72 -------------------------------- remove_unused_attributes.patch | 76 ---------------------------------- 2 files changed, 148 deletions(-) delete mode 100644 RefactorPlan delete mode 100644 remove_unused_attributes.patch diff --git a/RefactorPlan b/RefactorPlan deleted file mode 100644 index acfadacf..00000000 --- a/RefactorPlan +++ /dev/null @@ -1,72 +0,0 @@ - -Here we take notes of the strange stuff, so we can refactor them after -Pardus 2007 release. - - -==> Locale support -* bindtextdomain and textdomain calls are not necessary, because -gettext.translation() dont use them. - -* setlocale call is probably necessary for some stuff, but not for -message translation, it seems gettext.translation() api looks for -environment LC_ALL, LC_MESSAGES anyway. - -* pygettext.py shouldn't be needed at all. Plain xgettext works with -python source. - - -==> Utility functions -* sha1_file is suboptimal for binary files and sha1_data has some -exception confusion. These two functions should be a lot simpler. - -* get_file_hashes is overly complex and contains strange code like: -for r, d, f in os.walk(parent, topdown=False): pass - -* dir_size tries to calculate symlink lengths, this is probably not very -helpful, since in most cases, they fit in the inode, and wont take any -extra space at all. We can keep the number of file in the index though. -That way we can calculate package size + (nr of files * inode size of fs) -to give a more correct required disk size. - -* what the heck is unzip there? it is not even used at all and defined like: -def unzip(seq): - return zip(*seq) - - -==> code readability -* Public functions should contain doc strings. - -* Python builtins like file, list, etc should be avoided in variable names. -There is even a file.py module! - -* a,b,c,d,f,r,_i are equally bad. - -* some import'ed modules are not used inside the importer modules, cleanup needed. - -* Would be very good if we can avoid "from x import y" form, it makes it -harder to reload modules. - - -==> exceptions -* Current model is bad. Exception names should tell what is the error type. Instead -we have one Error exception in every module. If I call pisi.api.install("lala"), -I should get pisi.api.PackageNotFound or pisi.install.PackageNotFound or something -like that. For every kind of error, you get pisi.api.Error now, and only way to find -out exact error is try to parse error string (which is localized). - -* class Exception(Exception) is evil. - -* There shouldn't be a bare Except: clause in pisi modules. - - -==> database -* brr... - - -==> class attributes -* In some classes there are some attributes assigned but never -used. (see remove_unused_attributes.patch) - -* PiSi uses heavy classes and creates thousands of instances of them - (Package, Metadata, Dependency, ...). These classes should define - __slots__ to reduce the heap used. \ No newline at end of file diff --git a/remove_unused_attributes.patch b/remove_unused_attributes.patch deleted file mode 100644 index 887a0a94..00000000 --- a/remove_unused_attributes.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: pisi/atomicoperations.py -=================================================================== ---- pisi/atomicoperations.py (revision 11473) -+++ pisi/atomicoperations.py (working copy) -@@ -42,12 +42,8 @@ - - class AtomicOperation(object): - -- def __init__(self, ignore_dep = None): -- #self.package = package -- if ignore_dep==None: -- self.ignore_dep = ctx.config.get_option('ignore_dependency') -- else: -- self.ignore_dep = ignore_dep -+ def __init__(self): -+ pass - - def run(self, package): - "perform an atomic package operation" -@@ -58,7 +54,7 @@ - "Install class, provides install routines for pisi packages" - - @staticmethod -- def from_name(name, ignore_dep = None): -+ def from_name(name): - # download package and return an installer object - # find package in repository - repo = ctx.packagedb.which_repo(name) -@@ -77,13 +73,13 @@ - - ctx.ui.info(_("Package URI: %s") % pkg_path, verbose=True) - -- return Install(pkg_path, ignore_dep) -+ return Install(pkg_path) - else: - raise Error(_("Package %s not found in any active repository.") % name) - -- def __init__(self, package_fname, ignore_dep = None, ignore_file_conflicts = None): -+ def __init__(self, package_fname, ignore_file_conflicts = None): - "initialize from a file name" -- super(Install, self).__init__(ignore_dep) -+ super(Install, self).__init__() - if not ignore_file_conflicts: - ignore_file_conflicts = ctx.get_option('ignore_file_conflicts') - self.ignore_file_conflicts = ignore_file_conflicts -@@ -394,8 +390,8 @@ - - class Remove(AtomicOperation): - -- def __init__(self, package_name, ignore_dep = None): -- super(Remove, self).__init__(ignore_dep) -+ def __init__(self, package_name): -+ super(Remove, self).__init__() - self.package_name = package_name - self.package = ctx.packagedb.get_package(self.package_name, pisi.itembyrepodb.installed) - try: -Index: pisi/archive.py -=================================================================== ---- pisi/archive.py (revision 11473) -+++ pisi/archive.py (working copy) -@@ -42,12 +42,11 @@ - self.type = atype - - def unpack(self, target_dir, clean_dir = False): -- self.target_dir = target_dir - # first we check if we need to clean-up our working env. -- if os.path.exists(self.target_dir) and clean_dir: -- util.clean_dir(self.target_dir) -+ if os.path.exists(target_dir) and clean_dir: -+ util.clean_dir(target_dir) - -- os.makedirs(self.target_dir) -+ os.makedirs(target_dir) - - - class ArchiveBinary(ArchiveBase): From 970c23032dc16aeec8b735e0194dd6832aca13fc Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 17 Jan 2007 14:28:53 +0000 Subject: [PATCH 003/212] Strip only if its not a link.. (caglar) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DEBUG: /usr/i686-pc-linux-gnu/binutils-bin/2.17.50.0.9/ld [stripped] Sistem Hatası: Program Sonlandırıldı. exceptions.IOError: [Errno 2] Böyle bir dosya ya da dizin yok: '/var/pisi/binutils-2.17.50.0.9-7/install/usr/i686-pc-linux-gnu/lib/libbfd.la' Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/bin/pisi", line 89, in ? cli.run_command() File "/usr/lib/pardus/pisi/cli/pisicli.py", line 111, in run_command self.command.run() File "/usr/lib/pardus/pisi/cli/commands.py", line 491, in run pisi.api.build_until(x, ctx.get_option('until')) File "/usr/lib/pardus/pisi/build.py", line 992, in build_until __buildState_buildpackages(pb, last) File "/usr/lib/pardus/pisi/build.py", line 956, in __buildState_buildpackages pb.build_packages() File "/usr/lib/pardus/pisi/build.py", line 740, in build_packages self.strip_install_dir() File "/usr/lib/pardus/pisi/build.py", line 556, in strip_install_dir util.strip_directory(install_dir) File "/usr/lib/pardus/pisi/util.py", line 509, in strip_directory ladata = file(frpath).read() DEBUG: PiSi API finalized --- pisi/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/util.py b/pisi/util.py index 941a67c5..c851ddb2 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -505,7 +505,7 @@ def strip_directory(top, excludelist=[]): # entries sometimes triggers compile-time errors or linkage problems. # Instead of patching all these buggy sources and maintain these patches, # PiSi removes wrong paths... - if frpath.endswith(".la"): + if frpath.endswith(".la") and not os.path.islink(frpath): ladata = file(frpath).read() new_ladata = re.sub("-L%s/\S*" % ctx.config.tmp_dir(), "", ladata) new_ladata = re.sub("%s/\S*/install/" % ctx.config.tmp_dir(), "/", new_ladata) From afddb5676933e7c56a70ab0670182d590afa5abb Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 23 Jan 2007 08:39:56 +0000 Subject: [PATCH 004/212] [merge] index command should only take the latest versioned pisi packages. --- pisi/index.py | 9 +++++++-- pisi/util.py | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pisi/index.py b/pisi/index.py index fa801250..71872588 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -86,11 +86,12 @@ class Index(XmlFile): def index(self, repo_uri, skip_sources=False): self.repo_dir = repo_uri + + packages = [] for root, dirs, files in os.walk(repo_uri): for fn in files: if fn.endswith(ctx.const.package_suffix): - ctx.ui.info(_('Adding %s to package index') % fn) - self.add_package(os.path.join(root, fn), repo_uri) + packages.append(os.path.join(root, fn)) if fn == 'component.xml': ctx.ui.info(_('Adding %s to component index') % fn) self.add_component(os.path.join(root, fn)) @@ -99,6 +100,10 @@ class Index(XmlFile): if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) + for pkg in util.filter_latest_packages(packages): + ctx.ui.info(_('Adding %s to package index') % pkg) + self.add_package(pkg, repo_uri) + def update_db(self, repo, txn = None): # FIXME: updating db takes too much time. So a notify mechanism is used to inform the status # of the operation. diff --git a/pisi/util.py b/pisi/util.py index c851ddb2..d2709b31 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -632,3 +632,24 @@ def parse_package_name(package_name): version = package_name[len(name) + 1:] return (name, version) + +def filter_latest_packages(package_paths): + """ For a given pisi package paths list where there may also be multiple versions + of the same package, filters only the latest versioned ones """ + + from pisi.version import Version + + latest = {} + for path in package_paths: + + root = os.path.dirname(path) + name, version = parse_package_name(os.path.basename(path[:-len(".pisi")])) + + if latest.has_key(name): + if Version(latest[name][2]) < Version(version): + latest[name] = (root, name, version) + else: + if version: + latest[name] = (root, name, version) + + return map(lambda x:"%s/%s-%s.pisi" % x, latest.values()) From 370549e8f2d7c5518df6c06f85b0965d3c0d16a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Tue, 6 Feb 2007 02:30:57 +0000 Subject: [PATCH 005/212] =?UTF-8?q?burada=20da=20ol=20ki=20farm=20kullans?= =?UTF-8?q?=C4=B1n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mirrors.conf | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 mirrors.conf diff --git a/mirrors.conf b/mirrors.conf new file mode 100644 index 00000000..e3982f0c --- /dev/null +++ b/mirrors.conf @@ -0,0 +1,169 @@ +cpan http://www.perl.com/CPAN/ +cpan ftp://ftp.ncsu.edu/pub/mirror/CPAN/ +cpan ftp://ftp.duke.edu/pub/perl/ +cpan http://mirrors.jtlnet.com/CPAN/ +gnome ftp://ftp.gnome.org/pub/GNOME/sources +gnome http://ftp.rpmfind.net/linux/gnome.org/sources/ +gnome ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/ +gnome http://ftp.unina.it/pub/linux/GNOME/sources/ +gnome http://ftp.acc.umu.se/pub/GNOME/sources/ +gnome http://ftp.belnet.be/mirror/ftp.gnome.org/sources/ +gnu ftp://ftp.gnu.org/gnu/ +gnu http://ftp.club.cc.cmu.edu/pub/gnu/ +gnu http://mirrors.usc.edu/pub/gnu/ +gnu http://mirrors.kernel.org/gnu/ +gnu ftp://ftp.club.cc.cmu.edu/gnu/ +gnu ftp://aeneas.mit.edu/pub/gnu/ +gnu ftp://ftp.cse.ohio-state.edu/mirror/gnu/ +gnu ftp://ftp.cs.tu-berlin.de/pub/gnu/ +gnu ftp://mirrors.kernel.org/gnu/ +gnu ftp://ftp.cs.ubc.ca/pub/gnu/ +gnu ftp://ftp.math.uni-bremen.de/pub/gnu/ +gnu ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ +gnu ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ +gnu ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ +gnu ftp://sunsite.cnlab-switch.ch/mirror/gnu/ +gnu http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ +gnu ftp://ftp.stacken.kth.se/pub/gnu/ +gnu ftp://ftp.isy.liu.se/pub/gnu/ +gnu ftp://ftp.task.gda.pl/pub/gnu/ +gnu ftp://ftp.nluug.nl/pub/gnu/ +gnu ftp://ftp.funet.fi/pub/gnu/prep/ +gnu ftp://sunsite.icm.edu.pl/pub/gnu/ +gnu ftp://ftp.freenet.de/pub/mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ +gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ +gnu ftp://ftp.esat.net/pub/gnu/ +gnu ftp://ftp.mcc.ac.uk/pub/gnu/ +gnu ftp://ftp.cise.ufl.edu/pub/mirrors/GNU/ +gnu ftp://ftp.uninett.no/pub/gnu/ +gnu ftp://ftp.duth.gr/pub/gnu/ +gnu ftp://sunsite.dk/mirrors/gnu/ +gnu http://mirrors.sunsite.dk/gnu/ +gnu ftp://ftp.etsimo.uniovi.es/pub/gnu/ +gnu ftp://ftp.sunet.se/pub/gnu/ +gnu http://ftp.roedu.net/mirrors/gnu.org/ +gnu ftp://ftp.forthnet.gr/pub/gnu/ +gnu ftp://ftp.univie.ac.at/packages/gnu/ +gnu ftp://core.ring.gr.jp/pub/GNU/ +gnu ftp://ftp.cs.cuhk.edu.hk/pub/gnu/gnu/ +gnu ftp://tron.um.u-tokyo.ac.jp/pub/GNU/ +gnu http://ftp.azc.uam.mx/mirrors/gnu/ +gnu ftp://ftp.kaist.ac.kr/gnu/ +gnu ftp://ftp.chg.ru/pub/gnu/ +gnu ftp://ftp.inf.utfsm.cl/pub/gnu/ +gnu ftp://ftp.arnes.si/software/gnu/ +gnu ftp://gnu.cs.lewisu.edu/gnu/ +gnu http://ftp.wayne.edu/pub/gnu/ +gnu ftp://ftp.wayne.edu/pub/gnu/ +gnu http://kambing.vlsm.org/gnu/ +gnu http://gd.tuwien.ac.at/gnu/gnusrc/ +kde ftp://ftp.kde.org/pub/kde/ +kde http://chernabog.cc.vt.edu/pub/projects/kde/ +kde http://ftp.gtlib.cc.gatech.edu/pub/kde/ +kde ftp://chernabog.cc.vt.edu/pub/projects/kde/ +kde ftp://ftp.gtlib.cc.gatech.edu/pub/kde/ +kde ftp://carroll.aset.psu.edu/pub/kde/ +kde ftp://ftp.oregonstate.edu/pub/kde/ +kde ftp://ftp.ussg.iu.edu/pub/kde/ +kde http://mirrors.isc.org/pub/kde/ +kde http://ftp.belnet.be/packages/kde/ +kde http://ftp.fi.muni.cz/pub/kde/ +kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ +kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ +kde http://ftp.rhnet.is/pub/kde/ +kde http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/ +kde http://ftp.tiscali.nl/kde/ +kde http://mirrors.isc.org/pub/kde/ +kde http://sunsite.icm.edu.pl/pub/unix/kde/ +kde ftp://ftp.belnet.be/packages/kde/ +kde ftp://ftp.estpak.ee/pub/kde/ +kde ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/ +kde ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/ +kde http://ftp.du.se/pub/mirrors/kde/ +kde ftp://ftp.du.se/pub/mirrors/kde/ +kde ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ +kde ftp://ftp.mirrorservice.org/sites/ftp.kde.org/pub/kde/ +kde ftp://ftp.rhnet.is/pub/kde/ +kde ftp://ftp.sunet.se/pub/kde/ +kde ftp://ftp.tu-chemnitz.de/pub/X11/kde/ +kde ftp://ftp.tuniv.szczecin.pl/pub/kde/ +kde http://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/ +kde http://ftp.kde.org.yu/kde/ +kde http://ftp.ring.gr.jp/pub/X/kde/ +kde http://ftp.tuniv.szczecin.pl/pub/kde/ +kde http://ftp.unina.it/pub/Linux/kde/ +kde http://mi.mirror.garr.it/mirrors/KDE/ +kde http://mirrors.dotsrc.org/kde/ +kde ftp://ftp.duth.gr/pub/kde/ +kde ftp://ftp.kde.org.yu/kde/ +kde ftp://ftp.pbone.net/mirror/ftp.kde.org/pub/kde/ +kde ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/ +kde ftp://ftp.unina.it/pub/Linux/kde/ +kde ftp://mirrors.dotsrc.org/kde/ +kde ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/ +kde http://ftp.duth.gr/pub/kde/ +kde http://ftp.hol.gr/mirror/kde/ +kde http://ftp.sunet.se/pub/kde/ +kde http://ring.asahi-net.or.jp/pub/X/kde/ +kde ftp://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/ +kde ftp://ftp.no.kde.org/pub/kde/ +kde ftp://ftp.tiscali.nl/pub/mirrors/kde/ +kde http://ftp.heanet.ie/mirrors/ftp.kde.org/ +kde http://ftp.scarlet.be/pub/kde/ +kde ftp://ftp.solnet.ch/mirror/KDE/ +kde ftp://ftp.heanet.ie/mirrors/ftp.kde.org/ +kde ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/ +kde ftp://ftp.xcp.kiev.ua/ftp.kde.org/ +kde ftp://ring.asahi-net.or.jp/pub/X/kde/ +kde http://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/ +kde ftp://ftp.scarlet.be/pub/kde/ +kde ftp://sunsite.icm.edu.pl/pub/unix/kde/ +kde http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/ +kde ftp://ftp.hol.gr/pub/mirror/kde/ +kde http://gd.tuwien.ac.at/kde/ +kde ftp://ftp.ntua.gr/pub/X11/kde/ +kde http://ftp.ntua.gr/pub/X11/kde/ +kde ftp://ftp.fi.muni.cz/pub/kde/ +kde ftp://ftp.planetmirror.com/pub/kde/ +kde http://public.planetmirror.com/pub/kde/ +kde ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/ +kde ftp://ftp.ring.gr.jp/pub/X/kde/ +kde ftp://kde.paralax.org/kde/ +kde http://ftp.kddlabs.co.jp/pub/X11/kde/ +kde ftp://ftp.kddlabs.co.jp/pub/X11/kde/ +kde ftp://ftp.nectec.or.th/pub/linux-softwares/KDE/ +kde ftp://ftp.chg.ru/pub/kde/ +kde http://ftp.chg.ru/pub/kde/ +kde http://ftp.gwdg.de/pub/x11/kde/ +kde ftp://gd.tuwien.ac.at/kde/ +kde ftp://ftp.gwdg.de/pub/x11/kde/ +kde http://gd.tuwien.ac.at/kde/ +kde ftp://ftp.sayclub.com/pub/X/KDE/ +kde http://ftp.sayclub.com/pub/X/KDE/ +sourceforge http://superb-east.dl.sourceforge.net/sourceforge/ +sourceforge http://superb-west.dl.sourceforge.net/sourceforge/ +sourceforge http://easynews.dl.sourceforge.net/sourceforge/ +sourceforge http://unc.dl.sourceforge.net/sourceforge/ +sourceforge http://optusnet.dl.sourceforge.net/sourceforge/ +sourceforge http://aleron.dl.sourceforge.net/sourceforge/ +sourceforge http://jaist.dl.sourceforge.net/sourceforge/ +sourceforge http://switch.dl.sourceforge.net/sourceforge/ +sourceforge http://mesh.dl.sourceforge.net/sourceforge/ +sourceforge http://belnet.dl.sourceforge.net/sourceforge/ +sourceforge http://citkit.dl.sourceforge.net/sourceforge/ +sourceforge http://heanet.dl.sourceforge.net/sourceforge/ +sourceforge http://keihanna.dl.sourceforge.net/sourceforge/ +sourceforge http://kent.dl.sourceforge.net/sourceforge/ +sourceforge http://nchc.dl.sourceforge.net/sourceforge/ +sourceforge http://ovh.dl.sourceforge.net/sourceforge/ +sourceforge http://peterhost.dl.sourceforge.net/sourceforge/ +sourceforge http://puzzle.dl.sourceforge.net/sourceforge/ +sourceforge http://surfnet.dl.sourceforge.net/sourceforge/ +sourceforge http://ufpr.dl.sourceforge.net/sourceforge/ +sourceforge http://umn.dl.sourceforge.net/sourceforge/ +sourceforge http://internap.dl.sourceforge.net/sourceforge/ +xorg http://xorg.freedesktop.org/ +xorg http://ftp.x.org/pub/ +xorg http://mirror.sg.depaul.edu/pub/x.org/ +xorg http://x.paracoda.com/pub/ +xorg http://x.hostingzero.com/ From a9cdab3a6e2483713e0f069602854e3df7d3c960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 9 Feb 2007 09:56:57 +0000 Subject: [PATCH 006/212] sync with trunk --- scripts/repostats.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/repostats.py b/scripts/repostats.py index decf3952..eef240e7 100755 --- a/scripts/repostats.py +++ b/scripts/repostats.py @@ -405,8 +405,8 @@ class Package: dict = { "name": self.name, "source": source.name, - "version": source.version, - "release": source.release, + "version": self.source.spec.getSourceVersion(), + "release": self.source.spec.getSourceRelease(), "buildDeps": ", ".join(bDeps), "runtimeDeps": ", ".join(rDeps), "revBuildDeps": ", ".join(rbDeps), @@ -457,8 +457,8 @@ class Source: "name": self.name, "homepage": source.homepage, "license": ", ".join(source.license), - "version": source.version, - "release": source.release, + "version": self.spec.getSourceVersion(), + "release": self.spec.getSourceRelease(), "history": template_table("history", histdata), "packages": "
".join(paks), "summary": source.summary, From 4303f5a8841d1b14cb444f8cbd87be88eaa9672e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 9 Feb 2007 10:02:29 +0000 Subject: [PATCH 007/212] sync with trunk --- mirrors.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirrors.conf b/mirrors.conf index e3982f0c..55563c58 100644 --- a/mirrors.conf +++ b/mirrors.conf @@ -140,9 +140,9 @@ kde ftp://ftp.gwdg.de/pub/x11/kde/ kde http://gd.tuwien.ac.at/kde/ kde ftp://ftp.sayclub.com/pub/X/KDE/ kde http://ftp.sayclub.com/pub/X/KDE/ +sourceforge http://easynews.dl.sourceforge.net/sourceforge/ sourceforge http://superb-east.dl.sourceforge.net/sourceforge/ sourceforge http://superb-west.dl.sourceforge.net/sourceforge/ -sourceforge http://easynews.dl.sourceforge.net/sourceforge/ sourceforge http://unc.dl.sourceforge.net/sourceforge/ sourceforge http://optusnet.dl.sourceforge.net/sourceforge/ sourceforge http://aleron.dl.sourceforge.net/sourceforge/ From 2263f5e460639f0bfaaf52c677bbc9f56726a77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sat, 10 Feb 2007 11:47:34 +0000 Subject: [PATCH 008/212] sync with trunk --- scripts/repostats.py | 47 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/scripts/repostats.py b/scripts/repostats.py index eef240e7..6a2d4b5a 100755 --- a/scripts/repostats.py +++ b/scripts/repostats.py @@ -344,14 +344,14 @@ class Missing: self.revRuntimeDeps = [] def report_html(self): - bDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) - rDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) + bDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) + rDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) dict = { "name": self.name, "revBuildDeps": ", ".join(bDeps), "revRuntimeDeps": ", ".join(rDeps) } - template_write("paksite/package-%s.html" % self.name, "missing", dict) + template_write("paksite/binary/%s.html" % self.name, "missing", dict) class Package: @@ -396,12 +396,12 @@ class Package: def report_html(self): source = self.source.spec.source - bDeps = map(lambda x: "%s" % (x, x), + bDeps = map(lambda x: "%s" % (x, x), (map(lambda x: x.package, source.buildDependencies))) - rDeps = map(lambda x: "%s" % (x, x), + rDeps = map(lambda x: "%s" % (x, x), (map(lambda x: x.package, self.pakspec.packageDependencies))) - rbDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) - rrDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) + rbDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) + rrDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) dict = { "name": self.name, "source": source.name, @@ -412,7 +412,7 @@ class Package: "revBuildDeps": ", ".join(rbDeps), "revRuntimeDeps": ", ".join(rrDeps) } - template_write("paksite/package-%s.html" % self.name, "package", dict) + template_write("paksite/binary/%s.html" % self.name, "package", dict) class Source: @@ -448,7 +448,7 @@ class Source: def report_html(self): source = self.spec.source - paks = map(lambda x: "%s" % (x, x), + paks = map(lambda x: "%s" % (x, x), (map(lambda x: x.name, self.spec.packages))) histdata = map(lambda x: (x.release, x.date, x.name, x.name, x.comment), self.spec.history) ptch = map(lambda x: "%s" % (self.uri, @@ -465,7 +465,7 @@ class Source: "patches": "
".join(ptch), "uri": self.uri } - template_write("paksite/source-%s.html" % self.name, "source", dict) + template_write("paksite/source/%s.html" % self.name, "source", dict) class Packager: @@ -502,9 +502,9 @@ class Packager: Packager(spec, update) def report_html(self): - srcs = map(lambda x: "%s" % (x, x), self.sources) + srcs = map(lambda x: "%s" % (x, x), self.sources) srcs.sort() - upds = map(lambda x: "%s (%s)
%s
" % ( + upds = map(lambda x: "%s (%s)
%s
" % ( x[0], x[0], x[1], x[2]), self.updates) dict = { "name": self.name, @@ -512,7 +512,7 @@ class Packager: "sources": "
".join(srcs), "updates": " ".join(upds) } - template_write("paksite/%s.html" % self.name, "packager", dict) + template_write("paksite/packager/%s.html" % self.name, "packager", dict) class Repository: @@ -595,20 +595,20 @@ class Repository: self.processPisi(os.path.join(root, fn)) def report_html(self): - miss = map(lambda x: "%s" % (x, x), missing.keys()) + miss = map(lambda x: "%s" % (x, x), missing.keys()) upeople = [] for p in self.people.get_list(): - upeople.append(("%s" % (p[0], p[0]), p[1])) + upeople.append(("%s" % (p[0], p[0]), p[1])) if errors: e = "
".join(errors) else: e = "" upatch = [] for p in self.mostpatched.get_list(5): - upatch.append(("%s" % (p[0], p[0]), p[1])) + upatch.append(("%s" % (p[0], p[0]), p[1])) ulongpy = [] for p in self.longpy.get_list(5): - ulongpy.append(("%s" % (p[0], p[0]), p[1])) + ulongpy.append(("%s" % (p[0], p[0]), p[1])) if self.total_installed_size: items = self.installed_sizes.items() items.sort(valuesort) @@ -628,7 +628,7 @@ class Repository: "errors": e } template_write("paksite/index.html", "repo", dict) - srclist = map(lambda x: "%s" % (x, x), sources) + srclist = map(lambda x: "%s" % (x, x), sources) srclist.sort() dict = { "source_list": "
".join(srclist) @@ -683,10 +683,13 @@ if __name__ == "__main__": printu(" %s\n" % m) if do_web: - try: - os.mkdir("paksite") - except: - pass + if not os.path.exists("paksite/packager"): + os.makedirs("paksite/packager") + if not os.path.exists("paksite/binary"): + os.makedirs("paksite/binary") + if not os.path.exists("paksite/source"): + os.makedirs("paksite/source") + repo.report_html() for p in packagers.values(): p.report_html() From aa0b2a6659001f084bc299ad491ce67c2633d458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrer=20=C3=96zen?= Date: Sat, 10 Feb 2007 11:57:59 +0000 Subject: [PATCH 009/212] fix --- scripts/repostats.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repostats.py b/scripts/repostats.py index 6a2d4b5a..12cec5a0 100755 --- a/scripts/repostats.py +++ b/scripts/repostats.py @@ -120,7 +120,7 @@ def_package_html = u"""

İkili paket: %(name)s

Kaynak versiyon %(version)s, depo sürümü %(release)s

-

Kaynak paket %(source)s

+

Kaynak paket %(source)s

Derlemek için gerekenler:

%(buildDeps)s

@@ -140,7 +140,7 @@ def_package_html = u""" def_history_html= u"""
Sürüm %s

Tarih: %s
-Yapan: %s
+Yapan: %s
Açıklama: %s

""" From 66a25ad5028d8c028c8761cb62edf1a2f420a268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sat, 10 Feb 2007 22:16:35 +0000 Subject: [PATCH 010/212] merged from trunk --- pisi/component.py | 2 ++ pisi/index.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pisi/component.py b/pisi/component.py index 22778a5c..9b1ea73f 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -21,6 +21,7 @@ import pisi.pxml.autoxml as autoxml import pisi.lockeddbshelve as shelve from pisi.itembyrepodb import ItemByRepoDB import pisi.itembyrepodb as itembyrepodb +from pisi.conflict import Conflict class Error(pisi.Error): pass @@ -43,6 +44,7 @@ class Distribution(xmlfile.XmlFile): t_BinaryName = [autoxml.Text, autoxml.optional] # name of repository (binary distro) t_Architecture = [autoxml.Text, autoxml.optional] # architecture identifier + t_Conflicts = [ [Conflict], autoxml.optional, "Conflicts/Package"] class Component(xmlfile.XmlFile): "representation for component declarations" diff --git a/pisi/index.py b/pisi/index.py index 71872588..51a37fec 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -100,9 +100,13 @@ class Index(XmlFile): if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) + conflict_list = map(str, self.distribution.conflicts) + for pkg in util.filter_latest_packages(packages): - ctx.ui.info(_('Adding %s to package index') % pkg) - self.add_package(pkg, repo_uri) + pkg_name = util.parse_package_name(os.path.basename(pkg))[0] + if pkg_name not in conflicts_list: + ctx.ui.info(_('Adding %s to package index') % pkg) + self.add_package(pkg, repo_uri) def update_db(self, repo, txn = None): # FIXME: updating db takes too much time. So a notify mechanism is used to inform the status From 4bb21a1e34880a763b7d13c7605ac4412bcdfbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sat, 10 Feb 2007 22:20:58 +0000 Subject: [PATCH 011/212] typo --- pisi/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/index.py b/pisi/index.py index 51a37fec..b2ea05b5 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -100,7 +100,7 @@ class Index(XmlFile): if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) - conflict_list = map(str, self.distribution.conflicts) + conflicts_list = map(str, self.distribution.conflicts) for pkg in util.filter_latest_packages(packages): pkg_name = util.parse_package_name(os.path.basename(pkg))[0] From 32822c4d42b1b6791e5b48ee2d44f4096bdd5daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrer=20=C3=96zen?= Date: Sun, 11 Feb 2007 00:02:21 +0000 Subject: [PATCH 012/212] yeni hali --- scripts/repostats.py | 591 ++++++++++++++++++------------------------- 1 file changed, 244 insertions(+), 347 deletions(-) diff --git a/scripts/repostats.py b/scripts/repostats.py index 12cec5a0..9a65c205 100755 --- a/scripts/repostats.py +++ b/scripts/repostats.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005-2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -29,12 +29,76 @@ import pisi.metadata import pisi.files from pisi.cli import printu -# default html templates +# Main HTML template -def_table_html = u""" -%s%s +html_header = """ + + %(title)s + + + +
+
+ +
+Genel Bilgiler + | Kaynak Paketler + | İkili Paketler + | Paketçiler +
+ +

%(title)s

+ +
+%(content)s +
+ + """ +css_template = """ +body { + margin-left:0; + margin-top:0; + margin-right:0; + background-image:url('http://www.pardus.org.tr/styles/images/HeadTile.png'); + background-repeat:repeat-x; + background-color: #FFF; +} + +#header-bugzilla { + background-image:url('http://www.pardus.org.tr/styles/images/HeadLogo.png'); + background-repeat:no-repeat; + background-position: 0px 0px; + height:119px; + padding-bottom:5px; +} + +a { + color: #F55400; + text-decoration: none; +} + +a:hover { + color: #444; + background-color:#EEE; +} + +.menu { + padding-left: 1em; + padding-top: 3px; + padding-bottom: 3px; + border-bottom: 1px solid #CCC; + border-top: 1px solid #CCC; +} + +.content { + margin: 0.5em; +} +""" + +# default html templates (now obsolete) + def_repo_sizes_html = u"""

Boyutlar

Toplam kurulu boyut %(total)s

@@ -44,188 +108,6 @@ def_repo_sizes_html = u""" """ -def_repo_html = u""" - - Depo istatistikleri - - - -
-
-
-

-Depoda toplam %(nr_source)d -kaynak paket, ve bu paketlerden oluşturulacak -%(nr_packages)d ikili paket bulunmaktadır. Toplam %(nr_patches)d yama mevcuttur. -

- -

-%(errors)s -

- -

En fazla yamalanmış 5 kaynak paket:

-%(most_patched)s -

- -

En uzun actions.py betikli 5 kaynak paket:

-%(longpy)s -

- -

Eksik ikili paketler

-%(missing)s -

- -%(sizes)s - -

Paketçiler:

-%(packagers)s -

- -
- -""" - -def_packager_html = u""" - - Paketçi %(name)s - - - -
-
-
- -

%(name)s <%(email)s>

- -

Paketler:

-

%(sources)s

- -

Güncellemeler:

-

%(updates)s

-
- -""" - -def_package_html = u""" - - İkili paket %(name)s - - - - -
-
-
- -

İkili paket: %(name)s

-

Kaynak versiyon %(version)s, depo sürümü %(release)s

- -

Kaynak paket %(source)s

- -

Derlemek için gerekenler:

-

%(buildDeps)s

- -

Çalıştırmak için gerekenler:

-

%(runtimeDeps)s

- -

Bağımlı paketler (derlenmek için):

-

%(revBuildDeps)s

- -

Bağımlı paketler (çalışmak için):

-

%(revRuntimeDeps)s

-
- -""" - -def_history_html= u""" -
Sürüm %s

-Tarih: %s
-Yapan: %s
-Açıklama: %s -

-""" - -def_source_html = u""" - - Kaynak paket %(name)s - - - - -
-
-
- -

Kaynak paket: %(name)s

-

Kaynak versiyon %(version)s, depo sürümü %(release)s

-

%(homepage)s

- -

Açıklama

-

%(summary)s

- -

Lisanslar:

-

%(license)s

- -

İşlemler:

-

Paket dosyalarına bak

-

-Hata kayıtlarına bak

- -

Bu kaynaktan derlenen ikili paketler:

-

%(packages)s

- -

Tarihçe

-%(history)s - -

Yamalar

-%(patches)s -
- -""" - -def_sources_html = u""" - - Kaynak paketler listesi - - - - -
-
-
- -

Kaynak paketler listesi

-
- -

-%(source_list)s -

-
- -""" - -def_missing_html = u""" - - Eksik ikili paket %(name)s - - - - -
-
-
- -

Eksik ikili paket: %(name)s

- -

Bağımlı paketler (derlenmek için):

-

%(revBuildDeps)s

- -

Bağımlı paketler (çalışmak için):

-

%(revRuntimeDeps)s

-
- -""" - def svn_uri(path): # init @@ -240,28 +122,6 @@ def svn_uri(path): return uri -# FIXME: This check should be in specfile -valid_filetypes = [ - "executable", - "library", - "data", - "config", - "doc", - "man", - "info", - "localedata", - "header", - "all" -] - -def valuesort(x, y): - if x[1] > y[1]: - return -1 - elif x[1] == y[1]: - return 0 - else: - return 1 - def find_pspecs(folder): paks = [] for root, dirs, files in os.walk(folder): @@ -272,26 +132,41 @@ def find_pspecs(folder): dirs.remove(".svn") return paks -def template_get(tmpl_name): - try: - f = codecs.open(tmpl_name + ".html", "r", "utf-8") - data = f.read() - f.close() - return data - except: - return globals()["def_" + tmpl_name + "_html"] - -def template_write(filename, tmpl_name, dict): +def write_html(filename, title, content): f = codecs.open(filename, "w", "utf-8") - f.write(template_get(tmpl_name) % dict) + root = "./" + if len(filename.split("/")) > 2: + root = "../" + dict = { + "title": title, + "content": content, + "root": root, + } + f.write(html_header % dict) f.close() -def template_table(tmpl_name, list): - tmpl = template_get(tmpl_name) - data = "" - for item in list: - data += (tmpl % item) - return data +def make_table(elements, titles=None): + def make_row(element): + return "%s" % "".join(map(str, element)) + + title_html = "" + if titles: + title_html = """ + %s + """ % "".join(titles) + + html = """ + %s + %s +
+ """ % (title_html, "".join(map(make_row, elements))) + + return html + +def make_url(name, path="./"): + if not path.endswith("/"): + path += "/" + return "%s" % (path, name, name) def mangle_email(email): return re.sub("@", " [at] ", email) @@ -313,7 +188,7 @@ class Histogram: def get_list(self, max=0): items = self.list.items() - items.sort(valuesort) + items.sort(key=lambda x: x[1], reverse=True) if max != 0: return items[:max] else: @@ -342,16 +217,6 @@ class Missing: self.name = name self.revBuildDeps = [] self.revRuntimeDeps = [] - - def report_html(self): - bDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) - rDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) - dict = { - "name": self.name, - "revBuildDeps": ", ".join(bDeps), - "revRuntimeDeps": ", ".join(rDeps) - } - template_write("paksite/binary/%s.html" % self.name, "missing", dict) class Package: @@ -361,11 +226,6 @@ class Package: errors.append(_("Duplicate binary packages:\n%s\n%s\n") % ( source.name, packages[name].source.name)) return - for p in pakspec.files: - if p.fileType not in valid_filetypes: - e = _("Unknown file type '%s' in package '%s'") % ( - p.fileType, source.name) - errors.append(e) packages[name] = self self.name = name self.source = source @@ -402,17 +262,36 @@ class Package: (map(lambda x: x.package, self.pakspec.packageDependencies))) rbDeps = map(lambda x: "%s" % (x, x), self.revBuildDeps) rrDeps = map(lambda x: "%s" % (x, x), self.revRuntimeDeps) - dict = { - "name": self.name, - "source": source.name, - "version": self.source.spec.getSourceVersion(), - "release": self.source.spec.getSourceRelease(), - "buildDeps": ", ".join(bDeps), - "runtimeDeps": ", ".join(rDeps), - "revBuildDeps": ", ".join(rbDeps), - "revRuntimeDeps": ", ".join(rrDeps) - } - template_write("paksite/binary/%s.html" % self.name, "package", dict) + + html = """ +

İkili paket: %s

+

Kaynak versiyon %s, depo sürümü %s

+ +

Kaynak paket: %s

+ +

Derlemek için gerekenler:

+

%s

+ +

Çalıştırmak için gerekenler:

+

%s

+ +

Bağımlı paketler (derlenmek için):

+

%s

+ +

Bağımlı paketler (çalışmak için):

+

%s

+ """ % ( + self.name, + self.source.spec.getSourceVersion(), + self.source.spec.getSourceRelease(), + make_url(source.name, "../source/"), + ", ".join(bDeps), + ", ".join(rDeps), + ", ".join(rbDeps), + ", ".join(rrDeps), + ) + + write_html("paksite/binary/%s.html" % self.name, self.name, html) class Source: @@ -429,43 +308,54 @@ class Source: self.uri = svn_uri(path) for p in spec.packages: Package(self, p) - self.checkRelease() - - def validDate(self, date): - # yyyy-mm-dd - err = 0 - if len(date) != 10: - err = 1 - if date[4] != '-' or date[7] != '-': - err = 1 - if err: - e = _("Source package '%s' has wrong date format '%s'") % (self.name, date) - errors.append(e) - # more checks can be added, i.e. valid day month ranges, etc - - def checkRelease(self): - pass def report_html(self): source = self.spec.source paks = map(lambda x: "%s" % (x, x), (map(lambda x: x.name, self.spec.packages))) - histdata = map(lambda x: (x.release, x.date, x.name, x.name, x.comment), self.spec.history) + histdata = map(lambda x: (x.release, x.date, x.version, make_url(x.name, "../packager/"), x.comment), self.spec.history) ptch = map(lambda x: "%s" % (self.uri, x.filename, x.filename), source.patches) - dict = { - "name": self.name, - "homepage": source.homepage, - "license": ", ".join(source.license), - "version": self.spec.getSourceVersion(), - "release": self.spec.getSourceRelease(), - "history": template_table("history", histdata), - "packages": "
".join(paks), - "summary": source.summary, - "patches": "
".join(ptch), - "uri": self.uri - } - template_write("paksite/source/%s.html" % self.name, "source", dict) + + titles = "Sürüm", "Sürüm Tarihi", "Versiyon", "Güncelleyen", "Açıklama" + hist = make_table(histdata, titles) + + html = """ +

Kaynak paket: %s

+

Kaynak versiyon %s, depo sürümü %s

+

%s

+

Açıklama

+

%s

+

Lisanslar:

+

%s

+

İşlemler:

+

Paket dosyalarına bak

+

Hata kayıtlarına bak

+ +

Bu kaynaktan derlenen ikili paketler:

+

%s

+ +

Tarihçe

+ %s + +

Yamalar

+ %s + """ % ( + self.name, + self.spec.getSourceVersion(), + self.spec.getSourceRelease(), + source.homepage, + source.homepage, + source.summary, + ", ".join(source.license), + self.uri, + self.name, + "
".join(paks), + "".join(hist), + "
".join(ptch), + ) + + write_html("paksite/source/%s.html" % self.name, self.name, html) class Packager: @@ -502,17 +392,30 @@ class Packager: Packager(spec, update) def report_html(self): - srcs = map(lambda x: "%s" % (x, x), self.sources) + srcs = map(lambda x: ("%s" % (x, x), ), self.sources) srcs.sort() - upds = map(lambda x: "%s (%s)
%s
" % ( - x[0], x[0], x[1], x[2]), self.updates) - dict = { - "name": self.name, - "email": mangle_email(self.email), - "sources": "
".join(srcs), - "updates": " ".join(upds) - } - template_write("paksite/packager/%s.html" % self.name, "packager", dict) + upds = map(lambda x: (u"%s (%s)
%s
" % ( + x[0], x[0], x[1], x[2]), ), self.updates) + + html = """ +

Paketçi: %s (%s)

+ """ % (self.name, mangle_email(self.email)) + + html += """ +
+

Sahip olduğu paketler:

+ %s +

+ """ % make_table(srcs) + + html += """ +
+

Yaptığı güncellemeler:

+ %s +

+ """ % make_table(upds) + + write_html("paksite/packager/%s.html" % self.name, self.name, html) class Repository: @@ -595,45 +498,53 @@ class Repository: self.processPisi(os.path.join(root, fn)) def report_html(self): - miss = map(lambda x: "%s" % (x, x), missing.keys()) - upeople = [] - for p in self.people.get_list(): - upeople.append(("%s" % (p[0], p[0]), p[1])) - if errors: - e = "
".join(errors) - else: - e = "" - upatch = [] - for p in self.mostpatched.get_list(5): - upatch.append(("%s" % (p[0], p[0]), p[1])) - ulongpy = [] - for p in self.longpy.get_list(5): - ulongpy.append(("%s" % (p[0], p[0]), p[1])) - if self.total_installed_size: - items = self.installed_sizes.items() - items.sort(valuesort) - elts = "".join(map(lambda x: "%s%d" % (x[0], x[1]), items)) - sizes = template_get("repo_sizes") % { "total": self.total_installed_size, "sizes": elts } - else: - sizes = "" - dict = { - "nr_source": self.nr_sources, - "nr_packages": self.nr_packages, - "nr_patches": self.nr_patches, - "most_patched": template_table("table", upatch), - "longpy": template_table("table", ulongpy), - "packagers": template_table("table", upeople), - "missing": "\n".join(miss), - "sizes": sizes, - "errors": e - } - template_write("paksite/index.html", "repo", dict) - srclist = map(lambda x: "%s" % (x, x), sources) - srclist.sort() - dict = { - "source_list": "
".join(srclist) - } - template_write("paksite/sources.html", "sources", dict) + table = ( + ("Kaynak paket sayısı", self.nr_sources), + ("İkili paket sayısı", self.nr_packages), + ("Yama sayısı", self.nr_patches), + ("Paketçi sayısı", len(self.people.list)), + ) + html = make_table(table) + + html += """ +
+

En fazla yamalanmış beş kaynak paket:

+ %s +

+ """ % make_table(map(lambda x: (make_url(x[0], "./source/"), x[1]), self.mostpatched.get_list(5))) + + html += """ +
+

En uzun inşa betikli beş kaynak paket:

+ %s +

+ """ % make_table(map(lambda x: (make_url(x[0], "./source/"), x[1]), self.longpy.get_list(5))) + + write_html("paksite/index.html", "Genel Bilgiler", html) + + titles = ( + "Paketçi", + "Paket sayısı" + ) + + people = self.people.get_list() + people = map(lambda x: ("%s" % (x[0], x[0]), x[1]), people) + write_html("paksite/packagers.html", "Paketçiler (paket sayısına göre)", make_table(people, titles)) + + people.sort(key=lambda x: x[0]) + write_html("paksite/packagers_by_name.html", "Paketçiler (isme göre)", make_table(people, titles)) + + titles = "Paket adı", "Versiyon", "Açıklama" + + srclist = map(lambda x: (make_url(x.name, "source/"), x.spec.getSourceVersion(), x.spec.source.summary), sources.values()) + srclist.sort(key=lambda x: x[0]) + html = make_table(srclist, titles) + write_html("paksite/sources.html", "Kaynak Paketler", html) + + binlist = map(lambda x: (make_url(x.name, "binary/"), x.source.spec.getSourceVersion(), x.source.spec.source.summary), packages.values()) + binlist.sort(key=lambda x: x[0]) + html = make_table(binlist, titles) + write_html("paksite/binaries.html", "İkili Paketler", html) # command line driver @@ -668,20 +579,6 @@ if __name__ == "__main__": printu(_("Scanning binary packages...\n")) repo.scan_bins(args[1]) - if errors: - printu("***\n") - printu(_("Encountered %d errors! Fix them immediately!\n") % len(errors)) - for e in errors: - printu(e) - printu("\n") - printu("\n") - printu("***\n") - - if missing: - printu(_("These dependencies are not available in repository:\n")) - for m in missing.keys(): - printu(" %s\n" % m) - if do_web: if not os.path.exists("paksite/packager"): os.makedirs("paksite/packager") @@ -690,11 +587,11 @@ if __name__ == "__main__": if not os.path.exists("paksite/source"): os.makedirs("paksite/source") + file("paksite/stil.css", "w").write(css_template) + repo.report_html() for p in packagers.values(): p.report_html() - for p in missing.values(): - p.report_html() for p in packages.values(): p.report_html() for p in sources.values(): From 5a613a0c63e12d14274e0a1bfcd57b293384a9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 15 Feb 2007 12:08:33 +0000 Subject: [PATCH 013/212] =?UTF-8?q?pakete=20ta=C5=9F=C4=B1n=C4=B1yor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mirrors.conf | 169 --------------------------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 mirrors.conf diff --git a/mirrors.conf b/mirrors.conf deleted file mode 100644 index 55563c58..00000000 --- a/mirrors.conf +++ /dev/null @@ -1,169 +0,0 @@ -cpan http://www.perl.com/CPAN/ -cpan ftp://ftp.ncsu.edu/pub/mirror/CPAN/ -cpan ftp://ftp.duke.edu/pub/perl/ -cpan http://mirrors.jtlnet.com/CPAN/ -gnome ftp://ftp.gnome.org/pub/GNOME/sources -gnome http://ftp.rpmfind.net/linux/gnome.org/sources/ -gnome ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/ -gnome http://ftp.unina.it/pub/linux/GNOME/sources/ -gnome http://ftp.acc.umu.se/pub/GNOME/sources/ -gnome http://ftp.belnet.be/mirror/ftp.gnome.org/sources/ -gnu ftp://ftp.gnu.org/gnu/ -gnu http://ftp.club.cc.cmu.edu/pub/gnu/ -gnu http://mirrors.usc.edu/pub/gnu/ -gnu http://mirrors.kernel.org/gnu/ -gnu ftp://ftp.club.cc.cmu.edu/gnu/ -gnu ftp://aeneas.mit.edu/pub/gnu/ -gnu ftp://ftp.cse.ohio-state.edu/mirror/gnu/ -gnu ftp://ftp.cs.tu-berlin.de/pub/gnu/ -gnu ftp://mirrors.kernel.org/gnu/ -gnu ftp://ftp.cs.ubc.ca/pub/gnu/ -gnu ftp://ftp.math.uni-bremen.de/pub/gnu/ -gnu ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ -gnu ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ -gnu ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ -gnu ftp://sunsite.cnlab-switch.ch/mirror/gnu/ -gnu http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ -gnu ftp://ftp.stacken.kth.se/pub/gnu/ -gnu ftp://ftp.isy.liu.se/pub/gnu/ -gnu ftp://ftp.task.gda.pl/pub/gnu/ -gnu ftp://ftp.nluug.nl/pub/gnu/ -gnu ftp://ftp.funet.fi/pub/gnu/prep/ -gnu ftp://sunsite.icm.edu.pl/pub/gnu/ -gnu ftp://ftp.freenet.de/pub/mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ -gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ -gnu ftp://ftp.esat.net/pub/gnu/ -gnu ftp://ftp.mcc.ac.uk/pub/gnu/ -gnu ftp://ftp.cise.ufl.edu/pub/mirrors/GNU/ -gnu ftp://ftp.uninett.no/pub/gnu/ -gnu ftp://ftp.duth.gr/pub/gnu/ -gnu ftp://sunsite.dk/mirrors/gnu/ -gnu http://mirrors.sunsite.dk/gnu/ -gnu ftp://ftp.etsimo.uniovi.es/pub/gnu/ -gnu ftp://ftp.sunet.se/pub/gnu/ -gnu http://ftp.roedu.net/mirrors/gnu.org/ -gnu ftp://ftp.forthnet.gr/pub/gnu/ -gnu ftp://ftp.univie.ac.at/packages/gnu/ -gnu ftp://core.ring.gr.jp/pub/GNU/ -gnu ftp://ftp.cs.cuhk.edu.hk/pub/gnu/gnu/ -gnu ftp://tron.um.u-tokyo.ac.jp/pub/GNU/ -gnu http://ftp.azc.uam.mx/mirrors/gnu/ -gnu ftp://ftp.kaist.ac.kr/gnu/ -gnu ftp://ftp.chg.ru/pub/gnu/ -gnu ftp://ftp.inf.utfsm.cl/pub/gnu/ -gnu ftp://ftp.arnes.si/software/gnu/ -gnu ftp://gnu.cs.lewisu.edu/gnu/ -gnu http://ftp.wayne.edu/pub/gnu/ -gnu ftp://ftp.wayne.edu/pub/gnu/ -gnu http://kambing.vlsm.org/gnu/ -gnu http://gd.tuwien.ac.at/gnu/gnusrc/ -kde ftp://ftp.kde.org/pub/kde/ -kde http://chernabog.cc.vt.edu/pub/projects/kde/ -kde http://ftp.gtlib.cc.gatech.edu/pub/kde/ -kde ftp://chernabog.cc.vt.edu/pub/projects/kde/ -kde ftp://ftp.gtlib.cc.gatech.edu/pub/kde/ -kde ftp://carroll.aset.psu.edu/pub/kde/ -kde ftp://ftp.oregonstate.edu/pub/kde/ -kde ftp://ftp.ussg.iu.edu/pub/kde/ -kde http://mirrors.isc.org/pub/kde/ -kde http://ftp.belnet.be/packages/kde/ -kde http://ftp.fi.muni.cz/pub/kde/ -kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ -kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ -kde http://ftp.rhnet.is/pub/kde/ -kde http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/ -kde http://ftp.tiscali.nl/kde/ -kde http://mirrors.isc.org/pub/kde/ -kde http://sunsite.icm.edu.pl/pub/unix/kde/ -kde ftp://ftp.belnet.be/packages/kde/ -kde ftp://ftp.estpak.ee/pub/kde/ -kde ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/ -kde ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/ -kde http://ftp.du.se/pub/mirrors/kde/ -kde ftp://ftp.du.se/pub/mirrors/kde/ -kde ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ -kde ftp://ftp.mirrorservice.org/sites/ftp.kde.org/pub/kde/ -kde ftp://ftp.rhnet.is/pub/kde/ -kde ftp://ftp.sunet.se/pub/kde/ -kde ftp://ftp.tu-chemnitz.de/pub/X11/kde/ -kde ftp://ftp.tuniv.szczecin.pl/pub/kde/ -kde http://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/ -kde http://ftp.kde.org.yu/kde/ -kde http://ftp.ring.gr.jp/pub/X/kde/ -kde http://ftp.tuniv.szczecin.pl/pub/kde/ -kde http://ftp.unina.it/pub/Linux/kde/ -kde http://mi.mirror.garr.it/mirrors/KDE/ -kde http://mirrors.dotsrc.org/kde/ -kde ftp://ftp.duth.gr/pub/kde/ -kde ftp://ftp.kde.org.yu/kde/ -kde ftp://ftp.pbone.net/mirror/ftp.kde.org/pub/kde/ -kde ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/ -kde ftp://ftp.unina.it/pub/Linux/kde/ -kde ftp://mirrors.dotsrc.org/kde/ -kde ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/ -kde http://ftp.duth.gr/pub/kde/ -kde http://ftp.hol.gr/mirror/kde/ -kde http://ftp.sunet.se/pub/kde/ -kde http://ring.asahi-net.or.jp/pub/X/kde/ -kde ftp://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/ -kde ftp://ftp.no.kde.org/pub/kde/ -kde ftp://ftp.tiscali.nl/pub/mirrors/kde/ -kde http://ftp.heanet.ie/mirrors/ftp.kde.org/ -kde http://ftp.scarlet.be/pub/kde/ -kde ftp://ftp.solnet.ch/mirror/KDE/ -kde ftp://ftp.heanet.ie/mirrors/ftp.kde.org/ -kde ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/ -kde ftp://ftp.xcp.kiev.ua/ftp.kde.org/ -kde ftp://ring.asahi-net.or.jp/pub/X/kde/ -kde http://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/ -kde ftp://ftp.scarlet.be/pub/kde/ -kde ftp://sunsite.icm.edu.pl/pub/unix/kde/ -kde http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/ -kde ftp://ftp.hol.gr/pub/mirror/kde/ -kde http://gd.tuwien.ac.at/kde/ -kde ftp://ftp.ntua.gr/pub/X11/kde/ -kde http://ftp.ntua.gr/pub/X11/kde/ -kde ftp://ftp.fi.muni.cz/pub/kde/ -kde ftp://ftp.planetmirror.com/pub/kde/ -kde http://public.planetmirror.com/pub/kde/ -kde ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/ -kde ftp://ftp.ring.gr.jp/pub/X/kde/ -kde ftp://kde.paralax.org/kde/ -kde http://ftp.kddlabs.co.jp/pub/X11/kde/ -kde ftp://ftp.kddlabs.co.jp/pub/X11/kde/ -kde ftp://ftp.nectec.or.th/pub/linux-softwares/KDE/ -kde ftp://ftp.chg.ru/pub/kde/ -kde http://ftp.chg.ru/pub/kde/ -kde http://ftp.gwdg.de/pub/x11/kde/ -kde ftp://gd.tuwien.ac.at/kde/ -kde ftp://ftp.gwdg.de/pub/x11/kde/ -kde http://gd.tuwien.ac.at/kde/ -kde ftp://ftp.sayclub.com/pub/X/KDE/ -kde http://ftp.sayclub.com/pub/X/KDE/ -sourceforge http://easynews.dl.sourceforge.net/sourceforge/ -sourceforge http://superb-east.dl.sourceforge.net/sourceforge/ -sourceforge http://superb-west.dl.sourceforge.net/sourceforge/ -sourceforge http://unc.dl.sourceforge.net/sourceforge/ -sourceforge http://optusnet.dl.sourceforge.net/sourceforge/ -sourceforge http://aleron.dl.sourceforge.net/sourceforge/ -sourceforge http://jaist.dl.sourceforge.net/sourceforge/ -sourceforge http://switch.dl.sourceforge.net/sourceforge/ -sourceforge http://mesh.dl.sourceforge.net/sourceforge/ -sourceforge http://belnet.dl.sourceforge.net/sourceforge/ -sourceforge http://citkit.dl.sourceforge.net/sourceforge/ -sourceforge http://heanet.dl.sourceforge.net/sourceforge/ -sourceforge http://keihanna.dl.sourceforge.net/sourceforge/ -sourceforge http://kent.dl.sourceforge.net/sourceforge/ -sourceforge http://nchc.dl.sourceforge.net/sourceforge/ -sourceforge http://ovh.dl.sourceforge.net/sourceforge/ -sourceforge http://peterhost.dl.sourceforge.net/sourceforge/ -sourceforge http://puzzle.dl.sourceforge.net/sourceforge/ -sourceforge http://surfnet.dl.sourceforge.net/sourceforge/ -sourceforge http://ufpr.dl.sourceforge.net/sourceforge/ -sourceforge http://umn.dl.sourceforge.net/sourceforge/ -sourceforge http://internap.dl.sourceforge.net/sourceforge/ -xorg http://xorg.freedesktop.org/ -xorg http://ftp.x.org/pub/ -xorg http://mirror.sg.depaul.edu/pub/x.org/ -xorg http://x.paracoda.com/pub/ -xorg http://x.hostingzero.com/ From 746c687a13c9d81bf2293eb6eb9b74d5d045d28e Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 15 Feb 2007 12:35:39 +0000 Subject: [PATCH 014/212] * conflicts -> obsoletes --- pisi/component.py | 11 +++++++++-- pisi/index.py | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pisi/component.py b/pisi/component.py index 9b1ea73f..ceb96a2c 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -21,13 +21,20 @@ import pisi.pxml.autoxml as autoxml import pisi.lockeddbshelve as shelve from pisi.itembyrepodb import ItemByRepoDB import pisi.itembyrepodb as itembyrepodb -from pisi.conflict import Conflict class Error(pisi.Error): pass __metaclass__ = autoxml.autoxml +class Obsolete: + + __metaclass__ = autoxml.autoxml + + s_Package = [autoxml.String, autoxml.mandatory] + + def __str__(self): + return self.package class Distribution(xmlfile.XmlFile): @@ -44,7 +51,7 @@ class Distribution(xmlfile.XmlFile): t_BinaryName = [autoxml.Text, autoxml.optional] # name of repository (binary distro) t_Architecture = [autoxml.Text, autoxml.optional] # architecture identifier - t_Conflicts = [ [Conflict], autoxml.optional, "Conflicts/Package"] + t_Obsoletes = [ [Obsolete], autoxml.optional, "Obsoletes/Package"] class Component(xmlfile.XmlFile): "representation for component declarations" diff --git a/pisi/index.py b/pisi/index.py index b2ea05b5..7ac82a48 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -100,11 +100,11 @@ class Index(XmlFile): if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) - conflicts_list = map(str, self.distribution.conflicts) + obsoletes_list = map(str, self.distribution.obsoletes) for pkg in util.filter_latest_packages(packages): pkg_name = util.parse_package_name(os.path.basename(pkg))[0] - if pkg_name not in conflicts_list: + if pkg_name not in obsoletes_list: ctx.ui.info(_('Adding %s to package index') % pkg) self.add_package(pkg, repo_uri) From 6472bae8f003c70b58e6740d7921449ad67a954e Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 15 Feb 2007 13:23:32 +0000 Subject: [PATCH 015/212] merge from trunk. --- pisi/pxml/autoxml.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py index 30291fcb..84ae3b65 100644 --- a/pisi/pxml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -268,16 +268,22 @@ class autoxml(oo.autosuper, oo.autoprop): errorss = [] formatters = [] + # FIXME: What is this? Remove this crap and try to fix autoxml, if can not be fixed then + # really throw whole autoxml to junk. But not this. + # read declaration order from source # code contributed by bahadir kandemir - from inspect import getsourcelines - from itertools import ifilter - import re + try: + from inspect import getsourcelines + from itertools import ifilter + import re - fn = re.compile('\s*([tas]_[a-zA-Z]+).*').findall + fn = re.compile('\s*([tas]_[a-zA-Z]+).*').findall - lines = filter(fn, getsourcelines(cls)[0]) - decl_order = map(lambda x:x.split()[0], lines) + lines = filter(fn, getsourcelines(cls)[0]) + decl_order = map(lambda x:x.split()[0], lines) + except IOError: + decl_order = dict.keys() # there should be at most one str member, and it should be # the first to process From 66559aaf201a7194a29b62d6f245faf6bb348750 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 28 Feb 2007 17:58:31 +0000 Subject: [PATCH 016/212] * there was an error in cycle path printing... a fix by bahadir. --- pisi/graph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pisi/graph.py b/pisi/graph.py index d11a0dc6..1bffe0f1 100644 --- a/pisi/graph.py +++ b/pisi/graph.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -124,6 +124,8 @@ class Digraph(object): while self.p[u]: u = self.p[u] cycle.append(u) + if self.has_edge(cycle[0], u): + break cycle.reverse() raise CycleException(cycle) self.color[u] = 'b' # mark black (completed) From 20877b202008cf9a28fab340dfcd96fd9f623cdb Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 28 Feb 2007 18:01:55 +0000 Subject: [PATCH 017/212] * cmake support for actionsapi by meren --- pisi/actionsapi/cmaketools.py | 119 ++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 pisi/actionsapi/cmaketools.py diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py new file mode 100644 index 00000000..5d3c8bac --- /dev/null +++ b/pisi/actionsapi/cmaketools.py @@ -0,0 +1,119 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# Please read the COPYING file. + +# Standard Python Modules +import os + +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + +# Pisi Modules +import pisi.context as ctx +from pisi.util import join_path + +# ActionsAPI Modules +import pisi.actionsapi +import pisi.actionsapi.get as get +from pisi.actionsapi.shelltools import system +from pisi.actionsapi.shelltools import can_access_file +from pisi.actionsapi.shelltools import unlink + +class ConfigureError(pisi.actionsapi.Error): + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) + if can_access_file('config.log'): + ctx.ui.error(_('Please attach the config.log to your bug report:\n%s/config.log') % os.getcwd()) + +class MakeError(pisi.actionsapi.Error): + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) + +class InstallError(pisi.actionsapi.Error): + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) + +class RunTimeError(pisi.actionsapi.Error): + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) + +def configure(parameters = '', sourceDir = '.', installPrefix = '%s' % get.defaultprefixDIR()): + '''configure source with given cmake parameters = "-DCMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS ... "''' + if can_access_file(join_path(sourceDir, 'CMakeLists.txt')): + args = 'cmake \ + -DCMAKE_INSTALL_PREFIX=%s/%s \ + %s %s' % (get.installDIR(), + installPrefix, + parameters, + sourceDir) + + if system(args): + raise ConfigureError(_('Configure failed.')) + else: + raise ConfigureError(_('No configure script found for cmake.')) + +def make(parameters = ''): + '''build source with given parameters''' + if can_access_file('Makefile'): + if system('make %s %s' % (get.makeJOBS(), parameters)): + raise MakeError(_('Make failed.')) + else: + raise InstallError(_('No Makefile found.')) + +def fixInfoDir(): + infoDir = "%s/usr/share/info/dir" % get.installDIR() + if can_access_file(infoDir): + unlink(infoDir) + +def install(parameters = '', argument = 'install'): + '''install source into install directory with given parameters''' + if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'): + args = 'make prefix=%(prefix)s/%(defaultprefix)s \ + datadir=%(prefix)s/%(data)s \ + infodir=%(prefix)s/%(info)s \ + localstatedir=%(prefix)s/%(localstate)s \ + mandir=%(prefix)s/%(man)s \ + sysconfdir=%(prefix)s/%(conf)s \ + %(parameters)s \ + %(argument)s' % {'prefix': get.installDIR(), + 'defaultprefix': get.defaultprefixDIR(), + 'man': get.manDIR(), + 'info': get.infoDIR(), + 'localstate': get.localstateDIR(), + 'conf': get.confDIR(), + 'data': get.dataDIR(), + 'parameters': parameters, + 'argument':argument} + + if system(args): + raise InstallError(_('Install failed.')) + else: + raise InstallError(_('No Makefile found.')) + + fixInfoDir() + +def rawInstall(parameters = '', argument = 'install'): + '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' + if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'): + if system('make %s %s' % (parameters, argument)): + raise InstallError(_('Install failed.')) + else: + raise InstallError(_('No Makefile found.')) + + fixInfoDir() From f40517eb3f81aaa796ae8a74908fc9342a7cfe70 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 28 Feb 2007 18:49:45 +0000 Subject: [PATCH 018/212] * translations merged for 1.1.1 release... --- po/de.po | 188 ++++++++++++++++----------- po/es.po | 366 +++++++++++++++++++++++++--------------------------- po/nl.po | 281 ++++++++++++++++++---------------------- po/pisi.pot | 109 +++++++--------- po/tr.po | 123 +++++++++--------- 5 files changed, 522 insertions(+), 545 deletions(-) diff --git a/po/de.po b/po/de.po index 64e7d76e..a0e92322 100644 --- a/po/de.po +++ b/po/de.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: de\n" -"POT-Creation-Date: 2006-12-11 11:25+EET\n" +"POT-Creation-Date: 2007-02-28 20:09+EET\n" "PO-Revision-Date: 2006-12-11 21:59+0200\n" "Last-Translator: Mustafa M. Ölcerman \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -506,7 +507,7 @@ msgstr "Zurückfolge:" msgid "Use --debug to see a traceback." msgstr "Verwenden Sie --debug, um die Zurückfolge zu sehen." -#: pisi/actionsapi/autotools.py:36 +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" "Please attach the config.log to your bug report:\n" "%s/config.log" @@ -515,8 +516,8 @@ msgstr "" "%s/config.log" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/kde.py:65 pisi/actionsapi/perlmodules.py:54 -#: pisi/actionsapi/perlmodules.py:57 +#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Configure fehlgeschlagen." @@ -525,20 +526,23 @@ msgstr "Configure fehlgeschlagen." msgid "No configure script found." msgstr "Kein configure-Skript gefunden." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/kde.py:72 -#: pisi/actionsapi/perlmodules.py:63 pisi/actionsapi/perlmodules.py:72 -#: pisi/actionsapi/pythonmodules.py:49 pisi/actionsapi/scons.py:39 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 msgid "Make failed." msgstr "Make fehlgeschlagen." #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "Installation fehlgeschlagen." #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 +#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Keine Make-Datei gefunden." @@ -562,6 +566,11 @@ msgstr "Ausführen von automake fehlgeschlagen." msgid "Running autoheader failed." msgstr "Ausführen von autoheader fehlgeschlagen." +#: pisi/actionsapi/cmaketools.py:69 +#, fuzzy +msgid "No configure script found for cmake." +msgstr "Kein configure-Skript gefunden." + #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" msgstr "Dienstprogramm %s konnte nicht gefunden werden." @@ -810,6 +819,7 @@ msgstr "Installiere %s, Version %s, Release %s, Build %s" msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "Anhängigkeiten für %s nicht zufriedenstellent" +#: pisi/atomicoperations.py:165 msgid "/%s from %s package\n" msgstr "Paket /%s von %s\n" @@ -888,7 +898,8 @@ msgid "Not removing conflicted file : %s" msgstr "Konfliktierende Datei wird nicht entfernt: %s" #: pisi/atomicoperations.py:474 -msgid "Installed file %s is not exists on system [Probably you manually deleted]" +msgid "" +"Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Installierte Datei %s existiert nicht in dem System [ist wahrscheinlich per " "Hand gelöscht worden]" @@ -935,7 +946,8 @@ msgstr "PiSi Quell-Paket wird konstruiert: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." +msgstr "" +"IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." #: pisi/build.py:234 msgid "CCache detected..." @@ -1002,7 +1014,8 @@ msgid "unable to call function from actions: %s" msgstr "nicht in der Lage, die Funktion vom Vorgang aufzurufen: %s" #: pisi/build.py:433 -msgid "Safety switch: following extra packages in system.devel will be installed: " +msgid "" +"Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Sicherheitsschalter: Folgende extra Pakete in system.devel werden " "installiert: " @@ -1013,7 +1026,8 @@ msgstr "Sicherheitsschalter: system.devel ist bereits installiert" #: pisi/build.py:440 msgid "Safety switch: the component system.devel cannot be found" -msgstr "Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" +msgstr "" +"Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" #: pisi/build.py:449 msgid "Unsatisfied Build Dependencies:" @@ -1075,9 +1089,11 @@ msgstr "Es gibt Änderungen, erhöhe die Build-Nr auf %d" msgid "There is no change from previous build %d" msgstr "Es gibt keine Änderungen seit dem vorherigen Build %d" +#: pisi/build.py:795 msgid "No user named '%s' found on the system" msgstr "'%s' genannter Benutzer konnte auf diesem System nicht gefunden werden" +#: pisi/build.py:800 msgid "No group named '%s' found on the system" msgstr "%s genannte Gruppe konnte auf diesem System nicht gefunden werden" @@ -1111,7 +1127,8 @@ msgstr "Verlassene Dateien im Installationsverzeichnis (%s):" # gesammelt hört sich komisch an #: pisi/build.py:887 -msgid "All of the files under the install dir (%s) has been collected by package(s)" +msgid "" +"All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Alle Dateien unter Installationsierzeichnis (%s) wurden von den Paketen " "gesammelt" @@ -1393,7 +1410,8 @@ msgid "Create a static package with ar files" msgstr "Eine statisches Paket mit ar Dateien erstellen" #: pisi/cli/commands.py:450 -msgid "Do not install build dependencies, fail if a build dependency is present" +msgid "" +"Do not install build dependencies, fail if a build dependency is present" msgstr "" "Build - Abhängigkeiten nicht installieren, Fehler bei Anwesenheit einer " "Build-Abhängigkeit" @@ -1580,8 +1598,11 @@ msgstr "Nur sicherheitsrelevante Aktualisierungen" msgid "Do not update repositories" msgstr "Quellen nicht aktualisieren" +#: pisi/cli/commands.py:660 msgid "Upgrade component's and recursive components' packages" -msgstr "Upgrade für die Komponente durchführen und Pakete der Komponente rekursivieren" +msgstr "" +"Upgrade für die Komponente durchführen und Pakete der Komponente " +"rekursivieren" #: pisi/cli/commands.py:664 msgid "" @@ -1713,9 +1734,11 @@ msgstr "[repo] " msgid "Package found in repository:" msgstr "Paket im Depot gefunden:" +#: pisi/cli/commands.py:900 msgid "%s is not found in repositories" msgstr "%s wurde in den Depots nicht gefunden" +#: pisi/cli/commands.py:903 msgid "%s is not installed" msgstr "%s ist nicht installiert worden" @@ -1863,8 +1886,10 @@ msgid "Show detailed install info" msgstr "Detaillierte Installationsinfo anzeigen" #: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 -msgid "Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "Paketname |St| Version| Rel.| Build| Distro| Datum" +msgid "" +"Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "" +"Paketname |St| Version| Rel.| Build| Distro| Datum" #: pisi/cli/commands.py:1081 msgid "" @@ -2109,6 +2134,7 @@ msgstr "" "\n" "Listet Pakete die noch zu konfigurieren sind.\n" +#: pisi/cli/commands.py:1482 msgid "There are no packages waiting to be configured" msgstr "Es sind keine Pakete da, die auf die Konfiguration warten" @@ -2274,11 +2300,11 @@ msgstr "Vor-Entfernen Steuerungsprogramm wird aufgerufen" msgid "Unregistering comar scripts" msgstr "Comar-Skripte werden entfernt" -#: pisi/component.py:97 pisi/component.py:103 +#: pisi/component.py:106 pisi/component.py:112 msgid "Component %s not found" msgstr "Komponente %s nicht gefunden" -#: pisi/component.py:199 pisi/component.py:225 +#: pisi/component.py:208 pisi/component.py:234 msgid "Information for component %s not available" msgstr "Information fÑur Komponente %s nicht vorhanden" @@ -2298,6 +2324,7 @@ msgstr " Version >= " msgid " version <= " msgstr " Version <= " +#: pisi/conflict.py:43 pisi/dependency.py:44 msgid " version " msgstr " Version " @@ -2309,6 +2336,7 @@ msgstr " Release >= " msgid " release <= " msgstr " Release <= " +#: pisi/conflict.py:49 pisi/dependency.py:50 msgid " release " msgstr " Release " @@ -2320,6 +2348,7 @@ msgstr "Konstante kann nicht neu eingebunden werden: %s" msgid "Can't unbind constant: %s" msgstr "Konstene %s kann nicht geändert werden" +#: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "Abhängigkeit %s von %s ist nicht zufriedenstellend" @@ -2340,7 +2369,8 @@ msgid "Access denied to destination file: \"%s\"" msgstr "Zugriff verweigert für Zielddatei: \"%s\"" #: pisi/fetcher.py:100 -msgid "A problem occured. Please check the archive address and/or permissions again." +msgid "" +"A problem occured. Please check the archive address and/or permissions again." msgstr "" "Es ist ein Problem aufgetreten. Bitte die Adresse der Datei und/oder Rechte " "überprüfen." @@ -2361,8 +2391,11 @@ msgstr "%s konnte nicht abrufen; Wert-Fehler: %s" msgid "Cannot fetch %s; %s" msgstr "Konnte nicht abrufen %s;%s" +#: pisi/fetcher.py:194 msgid "Please check your network connections and try again. (%s)" -msgstr "Bitte überprüfen Sie Ihre Netzwerkverbindungen und versuchen Sie es noch einmal. (%s)" +msgstr "" +"Bitte überprüfen Sie Ihre Netzwerkverbindungen und versuchen Sie es noch " +"einmal. (%s)" #: pisi/fetcher.py:198 msgid "Cannot fetch %s; (%s): %s" @@ -2420,23 +2453,23 @@ msgstr "ERROR: gpg --detach-sig %s fehlgeschlagen" msgid "Encountered cycle %s" msgstr "Zusammengetroffener Zyklus %s" -#: pisi/index.py:92 -msgid "Adding %s to package index" -msgstr "%s wird zum Paket-Index hinzugefügt" - -#: pisi/index.py:95 +#: pisi/index.py:96 msgid "Adding %s to component index" msgstr "%s wird zum Komponente-Index hinzugefügt" -#: pisi/index.py:113 +#: pisi/index.py:108 +msgid "Adding %s to package index" +msgstr "%s wird zum Paket-Index hinzugefügt" + +#: pisi/index.py:122 msgid "Updating package database of %s" msgstr "Aktualisiere Paket-Datenbank von %s" -#: pisi/index.py:141 +#: pisi/index.py:150 msgid "Package %s: metadata corrupt, skipping..." msgstr "Paket %s: Metadata korrupt, wird übersprungen..." -#: pisi/index.py:169 +#: pisi/index.py:178 msgid "Adding %s to source index" msgstr "%s wird zu Quell-Index hinzugefügt" @@ -2491,7 +2524,8 @@ msgstr "" "rebuild-db aus." #: pisi/lockeddbshelve.py:51 -msgid "Database version for %s greater than PiSi version. You need a newer PiSi." +msgid "" +"Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Datenbankversion %s ist grösser als PiSi-Version. Sie benötigen ein neueres " "PiSi." @@ -2516,10 +2550,13 @@ msgstr "" msgid "Cannot attain read access to database environment" msgstr "Lese-Zugang zur Datenbank-Umgebung konnte nicht erreicht werden" +#: pisi/lockeddbshelve.py:95 msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." -msgstr "Schreib-Zugang zur PiSi-Datenbank konnte nicht erlangt werden. Sie müssen für diesen Vorgang der root sein." +msgstr "" +"Schreib-Zugang zur PiSi-Datenbank konnte nicht erlangt werden. Sie müssen " +"für diesen Vorgang der root sein." #: pisi/lockeddbshelve.py:113 msgid "Cannot attain read or write access to database %s" @@ -2528,7 +2565,8 @@ msgstr "" "werden" #: pisi/lockeddbshelve.py:139 -msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgid "" +"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Flagge sollte eine von 'r', 'w', 'c' oder 'n' sein oder die bsddb.db.DB_* " "Flaggen benutzen" @@ -2599,15 +2637,18 @@ msgstr "Folgende widersprüchliche Pakete entfernen ?" #: pisi/operations.py:305 msgid "Safety switch: Following packages in system.base will be installed: " -msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" +msgstr "" +"Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" #: pisi/operations.py:311 msgid "Safety switch: Following packages in system.base will be upgraded: " -msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" +msgstr "" +"Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" #: pisi/operations.py:317 pisi/operations.py:597 msgid "Safety switch: the component system.base cannot be found" -msgstr "Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" +msgstr "" +"Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" #: pisi/operations.py:334 msgid "" @@ -2768,64 +2809,64 @@ msgstr "" "Der Tag sollte mindestens die aktuelle Lokale haben, oder anderenfalls eine " "englische oder türkische Version" -#: pisi/pxml/autoxml.py:368 +#: pisi/pxml/autoxml.py:374 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' Fehler" -#: pisi/pxml/autoxml.py:423 pisi/pxml/autoxml.py:433 +#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: String '%s' hat Fehler" -#: pisi/pxml/autoxml.py:443 pisi/pxml/autoxml.py:453 +#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Datei '%s' hat Fehler" -#: pisi/pxml/autoxml.py:461 +#: pisi/pxml/autoxml.py:467 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: Objekt Validation ist fehlgeschlagen" -#: pisi/pxml/autoxml.py:469 +#: pisi/pxml/autoxml.py:475 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: Dateikodierung '%s' hat Fehler" -#: pisi/pxml/autoxml.py:519 +#: pisi/pxml/autoxml.py:525 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: unbekannter Tag Typ %s in Spec" -#: pisi/pxml/autoxml.py:567 pisi/pxml/autoxml.py:578 +#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 msgid "Mandatory variable %s not available" msgstr "obligatirische Variable %s nicht vorhanden" -#: pisi/pxml/autoxml.py:648 +#: pisi/pxml/autoxml.py:654 msgid "Type mismatch: read text cannot be decoded" msgstr "Falscher Typ: read text kann nicht dekodiert werden" -#: pisi/pxml/autoxml.py:652 pisi/pxml/autoxml.py:661 +#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 msgid "Mandatory token %s not available" msgstr "Zwingend erforderliches Zeichen %s ist nicht verfügbar" -#: pisi/pxml/autoxml.py:666 +#: pisi/pxml/autoxml.py:672 msgid "Type mismatch. Expected %s, got %s" msgstr "Falscher Typ. Erwartet %s, erhalten %s" -#: pisi/pxml/autoxml.py:696 pisi/pxml/autoxml.py:812 +#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 msgid "Type mismatch: DOM cannot be decoded" msgstr "Falscher Typ: DOM kann nicht dekodiert werden" -#: pisi/pxml/autoxml.py:699 pisi/pxml/autoxml.py:715 pisi/pxml/autoxml.py:725 -#: pisi/pxml/autoxml.py:815 pisi/pxml/autoxml.py:829 pisi/pxml/autoxml.py:839 +#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 +#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 msgid "Mandatory argument not available" msgstr "Obligatorisches Element nicht vorhanden" -#: pisi/pxml/autoxml.py:712 pisi/pxml/autoxml.py:826 +#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 msgid "Object cannot be encoded" msgstr "Objekt kann nicht kodiert werden" -#: pisi/pxml/autoxml.py:737 +#: pisi/pxml/autoxml.py:743 msgid "List type must contain only one element" msgstr "Listentyp darf nur ein Element enthalten" -#: pisi/pxml/autoxml.py:750 pisi/pxml/autoxml.py:771 +#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "Obligatirische Liste \"%s\" unter Knoten \"%s\" ist leer." @@ -2841,6 +2882,7 @@ msgstr "String '%s' hat ungültiges XML" msgid "File '%s' has invalid XML" msgstr "Datei '%s' hat ungültiges XML" +#: pisi/repodb.py:74 msgid "No repository named %s exists" msgstr "Es existiert kein %s genanntes Depot" @@ -2968,7 +3010,7 @@ msgstr "Befehl objcopy (add-debuglink) fehlgeschlagen für Datei '%s'!" msgid "Updating environment..." msgstr "Aktualisiere Umgebungsvariablen..." -#: scripts/repostats.py:361 +#: scripts/repostats.py:226 msgid "" "Duplicate binary packages:\n" "%s\n" @@ -2978,11 +3020,7 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:366 -msgid "Unknown file type '%s' in package '%s'" -msgstr "Unbekannter Datentyp '%s' in Paket '%s'" - -#: scripts/repostats.py:422 +#: scripts/repostats.py:301 msgid "" "Duplicate source packages:\n" "%s\n" @@ -2992,17 +3030,14 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:442 -msgid "Source package '%s' has wrong date format '%s'" -msgstr "Quellcode-Paket '%s' hat falsches Datumsformat '%s'" - -#: scripts/repostats.py:481 -msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" +#: scripts/repostats.py:371 +msgid "" +"Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" "Entwickler '%s <%s>' hat eina andere email adresse '%s' im Quelltext-Paket '%" "s'" -#: scripts/repostats.py:564 +#: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" @@ -3010,27 +3045,30 @@ msgstr "" "parsen von '%s' nicht möglich:\n" "%s\n" -#: scripts/repostats.py:642 +#: scripts/repostats.py:553 msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" msgstr "Gebrauch: repostats.py [OPTIONEN] quell-repo-pfad [binär-repo-pfad]\n" -#: scripts/repostats.py:643 +#: scripts/repostats.py:554 msgid "Dont generate the web site.\n" msgstr "Webseite nicht erzeugen.\n" -#: scripts/repostats.py:664 +#: scripts/repostats.py:575 msgid "Scanning source repository...\n" msgstr "Suche im Quellcode - Depot...\n" -#: scripts/repostats.py:668 +#: scripts/repostats.py:579 msgid "Scanning binary packages...\n" msgstr "Suche im Binär - Depot...\n" -#: scripts/repostats.py:673 -msgid "Encountered %d errors! Fix them immediately!\n" -msgstr "%d Fehler gefunden ! Bitte umgehend korrigieren !\n" +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Unbekannter Datentyp '%s' in Paket '%s'" -#: scripts/repostats.py:681 -msgid "These dependencies are not available in repository:\n" -msgstr "Folgende Abhängigkeiten sind nicht im Depot vorhanden:\n" +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Quellcode-Paket '%s' hat falsches Datumsformat '%s'" +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%d Fehler gefunden ! Bitte umgehend korrigieren !\n" + +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "Folgende Abhängigkeiten sind nicht im Depot vorhanden:\n" diff --git a/po/es.po b/po/es.po index ff9c201b..25675175 100644 --- a/po/es.po +++ b/po/es.po @@ -1,18 +1,19 @@ -# SOME DESCRIPTIVE TITLE. +# translation of es.po to spanish # Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. # +# Klemens Häckel , 2007. msgid "" msgstr "" -"Project-Id-Version: pisi\n" -"POT-Creation-Date: 2006-12-09 20:35+EET\n" -"PO-Revision-Date: 2006-12-01 00:18-0400\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: es \n" +"Project-Id-Version: es\n" +"POT-Creation-Date: 2007-02-28 20:09+EET\n" +"PO-Revision-Date: 2007-02-04 11:42+0200\n" +"Last-Translator: Klemens Häckel \n" +"Language-Team: spanish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" +"X-Generator: KBabel 1.11.4\n" #: /usr/lib/python2.4/optparse.py:1 msgid "" @@ -136,7 +137,7 @@ msgstr "complejo" #: /usr/lib/python2.4/optparse.py:365 msgid "option %s: invalid %s value: %r" -msgstr "opción %s: inválido %s valor: %r" +msgstr "opción %s: valor %s inválido: %r" #: /usr/lib/python2.4/optparse.py:373 msgid "option %s: invalid choice: %r (choose from %s)" @@ -348,11 +349,11 @@ msgstr "%s opción requiere un argumento" #: /usr/lib/python2.4/optparse.py:1378 /usr/lib/python2.4/optparse.py:1417 msgid "%s option requires %d arguments" -msgstr "%s opción require %d argumentos" +msgstr "opción %s require %d argumentos" #: /usr/lib/python2.4/optparse.py:1387 msgid "%s option does not take a value" -msgstr "%s opción no toma un valor" +msgstr "opción %s no toma un valor" #: /usr/lib/python2.4/optparse.py:1404 /usr/lib/python2.4/optparse.py:1558 msgid "no such option: %s" @@ -475,11 +476,11 @@ msgid "" "You have to run rebuild-db only when there is file corruption and database " "upgrades." msgstr "" -"Una operación de base de datos fue abortada. Deberías ejecutar pisi\n" -"de nuevo para el procedimiento de recuperación normal de DB. Aseguráte de \n" -"tener suficiente espacio libre en disco. Debes ejecutar rebuild-db " -"solemente\n" -"en caso de corripción de archivos y para actualización de base de datos" +"Una operación de base de datos fue abortada. Debería ejecutar pisi\n" +"de nuevo para el procedimiento de recuperación normal de DB. Asegurese de \n" +"tener suficiente espacio libre en disco.\n" +" Debe ejecutar rebuild-db solamente en caso de corrupción de archivos y para " +"actualización de base de datos" #: pisi-cli:57 msgid "" @@ -505,7 +506,7 @@ msgstr "Traceback:" msgid "Use --debug to see a traceback." msgstr "Use --debug para ver traceback." -#: pisi/actionsapi/autotools.py:36 +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" "Please attach the config.log to your bug report:\n" "%s/config.log" @@ -514,8 +515,8 @@ msgstr "" "%s/config.log" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/kde.py:65 pisi/actionsapi/perlmodules.py:54 -#: pisi/actionsapi/perlmodules.py:57 +#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Falló Configure." @@ -524,20 +525,23 @@ msgstr "Falló Configure." msgid "No configure script found." msgstr "Script de configuración no encontrado." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/kde.py:72 -#: pisi/actionsapi/perlmodules.py:63 pisi/actionsapi/perlmodules.py:72 -#: pisi/actionsapi/pythonmodules.py:49 pisi/actionsapi/scons.py:39 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 msgid "Make failed." msgstr "Falló Make." #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "Falló Install" #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 +#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Archivo para 'make' no encontrado." @@ -547,7 +551,7 @@ msgstr "Falló ejecución de aclocal." #: pisi/actionsapi/autotools.py:148 msgid "Running autoconf failed." -msgstr "Falló ejecución de autoconfl." +msgstr "Falló ejecución de autoconf." #: pisi/actionsapi/autotools.py:153 msgid "Running autoreconf failed." @@ -555,11 +559,16 @@ msgstr "Falló ejecución de autoreconf." #: pisi/actionsapi/autotools.py:158 msgid "Running automake failed." -msgstr "Falló ejecución de automakel." +msgstr "Falló ejecución de automake." #: pisi/actionsapi/autotools.py:163 msgid "Running autoheader failed." -msgstr "Falló ejecución de autoheaderl." +msgstr "Falló ejecución de autoheader." + +#: pisi/actionsapi/cmaketools.py:69 +#, fuzzy +msgid "No configure script found for cmake." +msgstr "Script de configuración no encontrado." #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" @@ -582,23 +591,23 @@ msgstr "" #: pisi/actionsapi/libtools.py:38 msgid "Running ldconfig failed." -msgstr "Falló ejecución de ldconfig" +msgstr "Falló ejecución de ldconfig." #: pisi/actionsapi/libtools.py:49 msgid "GNU Config Update Finished." -msgstr "Actualización de Configuración GNU terminado." +msgstr "GNU Config Update terminado." #: pisi/actionsapi/libtools.py:53 msgid "Running libtoolize failed." -msgstr "Falló ejecución de libtoolize " +msgstr "Falló ejecución de libtoolize." #: pisi/actionsapi/perlmodules.py:66 msgid "perl build failed." -msgstr "falló perl build" +msgstr "falló perl build." #: pisi/actionsapi/perlmodules.py:75 msgid "perl install failed." -msgstr "falló perl install" +msgstr "falló perl install." #: pisi/actionsapi/pisitools.py:126 msgid "ActionsAPI [doman]: Wrong man page file: %s" @@ -672,7 +681,7 @@ msgstr "ActionsAPI [unlinkDir]: Carpeta %s no existe." #: pisi/actionsapi/shelltools.py:120 msgid "ActionsAPI [move]: Permission denied: %s to %s" -msgstr "ActionsAPI [move]: Permiso denegado: %s to %s" +msgstr "ActionsAPI [move]: Permiso denegado: %s a %s" #: pisi/actionsapi/shelltools.py:122 msgid "ActionsAPI [move]: File %s doesn't exists." @@ -752,9 +761,9 @@ msgstr "* Actualizando repositorio: %s" #: pisi/api.py:432 msgid "No updates available for repository %s." -msgstr "No hay actualizaciones disponibles pararepositorio %s." +msgstr "No hay actualizaciones disponibles para repositorio %s." -# what do You mean here with "at any rate" ? +# what do You mean here with "at any rate" ? ok, got it, but will think of better spanish translation. it is not yet in here. #: pisi/api.py:434 msgid "Updating database at any rate as requested" msgstr "Actualizando base de datos según solicitado" @@ -777,7 +786,7 @@ msgstr "Error de Input/Output al leer %s: %s" #: pisi/api.py:525 msgid "Rebuilding package database" -msgstr "egenerando base de datos de paquetes" +msgstr "Regenerando base de datos de paquetes" #: pisi/archive.py:36 msgid "" @@ -805,14 +814,11 @@ msgstr "Paquete %s no encontrado en ningun repositorio activo." #: pisi/atomicoperations.py:101 msgid "Installing %s, version %s, release %s, build %s" -msgstr "Instando %s, versión %s, release %s, build %s" +msgstr "Instalando %s, versión %s, release %s, build %s" #: pisi/atomicoperations.py:146 -#, fuzzy msgid "%s package cannot be installed unless the dependencies are satisfied" -msgstr "" -"Se instalarán los siguientes paquetes en el orden indicado para satisfacer " -"las dependencias:\n" +msgstr "paquete %s no se puede instalar sin las dependencias" # check this ?? - probably ok, but see the context #: pisi/atomicoperations.py:165 @@ -824,7 +830,7 @@ msgid "" "File conflicts:\n" "%s" msgstr "" -"Archivo conflilcta:\n" +"Conflictos de archivo:\n" "%s" #: pisi/atomicoperations.py:201 @@ -841,7 +847,7 @@ msgstr "Actualizando a nueva versión upstream" #: pisi/atomicoperations.py:211 msgid "Upgrading to new distribution release" -msgstr "Actualización a nueva versión de distribución" +msgstr "Actualización a nueva release de distribución" #: pisi/atomicoperations.py:215 msgid "Upgrading to new distribution build" @@ -849,7 +855,7 @@ msgstr "Actualización a nuevo 'build' de distribución" #: pisi/atomicoperations.py:225 msgid "Downgrade to old distribution release?" -msgstr "Revertir hacia versión antigua de distribución ?" +msgstr "Revertir hacia release antigua de distribución ?" #: pisi/atomicoperations.py:227 msgid "Downgrade to old distribution build?" @@ -857,7 +863,7 @@ msgstr "Revertir hacia 'build' antiguo de distribución ?" #: pisi/atomicoperations.py:229 msgid "Package downgrade declined" -msgstr "Reversión (downgrade) de paquetes rechazado" +msgstr "Revertir (downgrade) de paquete rechazado" #: pisi/atomicoperations.py:253 msgid "%s configuration failed." @@ -905,7 +911,7 @@ msgstr "Metadata XML '%s' no se puede encontrar" #: pisi/atomicoperations.py:543 msgid "MetaData format wrong (%s)" -msgstr "Formato MetaData equivocado (%s)" +msgstr "Formato de MetaData incorrecto (%s)" #: pisi/atomicoperations.py:545 msgid "* Adding '%s' to db... " @@ -925,7 +931,7 @@ msgstr "OK." #: pisi/build.py:88 msgid "Path %s belongs in multiple packages" -msgstr "Ruta %s pertenece a paquetes múltiples" +msgstr "Ruta %s pertenece a múltiples paquetes" #: pisi/build.py:114 msgid "Source URI: %s" @@ -941,7 +947,8 @@ msgstr "Generando paquete fuente PiSi: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "IceCream detectado. Aseguráte que tu demónio está 'up and running'..." +msgstr "" +"IceCream detectado. Asegurese que el demónio está activo y funcionando..." #: pisi/build.py:234 msgid "CCache detected..." @@ -961,7 +968,7 @@ msgstr "Fuente es parte de componente %s " #: pisi/build.py:305 msgid "Fetching source from: %s" -msgstr "Tomando fuente de: %s" +msgstr "Trayendo fuente desde: %s" #: pisi/build.py:307 msgid "Source archive is stored: %s/%s" @@ -1005,39 +1012,40 @@ msgstr "Error de Sintax en archivo COMAR (%s): %s" #: pisi/build.py:417 msgid "unable to call function from actions: %s" -msgstr "no posible llamar funciones desde acciones: %s" +msgstr "no posible llamar función desde acciones: %s" # did I get "safety switch" right (in this context)? #: pisi/build.py:433 msgid "" "Safety switch: following extra packages in system.devel will be installed: " msgstr "" -"Cambio de Seguridad: Se instalarán los siguientes paquetes adicionales en " -"system.devel:" +"Verificación de seguridad: Se instalarán los siguientes paquetes adicionales " +"en system.devel:" #: pisi/build.py:438 msgid "Safety switch: system.devel is already installed" -msgstr "Cambio de Seguridad: system.devel ya está instalado" +msgstr "Verificación de seguridad: system.devel ya está instalado" #: pisi/build.py:440 msgid "Safety switch: the component system.devel cannot be found" -msgstr "Cambio de Seguridad: No posible encontrar el componente system.devel" +msgstr "" +"Verificación de seguridad: No posible encontrar el componente system.devel" #: pisi/build.py:449 msgid "Unsatisfied Build Dependencies:" -msgstr "Dependencias Build no satisfechos:" +msgstr "Dependencias Build no satisfechas:" #: pisi/build.py:453 msgid "Cannot build package due to unsatisfied build dependencies" -msgstr "No posible generar el paquete por dependencias no satisfechos" +msgstr "No posible generar el paquete por dependencias build no satisfechos" #: pisi/build.py:461 msgid "Build dependency %s cannot be satisfied" -msgstr "Build de dependiente %s no se puede cumplir" +msgstr "Dependencia build %s no se puede satisfacer" #: pisi/build.py:463 msgid "Do you want to install the unsatisfied build dependencies" -msgstr "Quiere instalar las dependencias build no satisfechas ?" +msgstr "Quiere instalar las dependencias build no satisfechas " #: pisi/build.py:464 msgid "Installing build dependencies." @@ -1065,7 +1073,7 @@ msgstr "(encontrado versión antigua %s)" #: pisi/build.py:658 msgid "Skipping %s with wrong pkg name " -msgstr "Saltando %s con nombre de pkg incorrecto" +msgstr "Omitiendo %s con nombre de pkg incorrecto" #: pisi/build.py:679 msgid "(no previous build found, setting build no to 1.)" @@ -1086,11 +1094,11 @@ msgstr "No hay cambios en relación al build anterior %d" #: pisi/build.py:795 msgid "No user named '%s' found on the system" -msgstr "" +msgstr "Nombre de usuario '%s' no encontrado en el sistema" #: pisi/build.py:800 msgid "No group named '%s' found on the system" -msgstr "" +msgstr "Nombre de grupo '%s' no encontrado en el sistema" #: pisi/build.py:803 msgid "** Building package %s" @@ -1133,7 +1141,7 @@ msgstr "Limpiando Carpeta Build..." #: pisi/build.py:894 msgid "Keeping Build Directory" -msgstr "Manteniendo Carpeta Build" +msgstr "Conservando Carpeta Build" #: pisi/cli/__init__.py:79 msgid "Warning: " @@ -1221,11 +1229,11 @@ msgstr "" #: pisi/cli/commands.py:181 msgid "Destination directory %s does not exist. Creating directory.\n" -msgstr "Destination directory %s does not exist. Creating directory.\n" +msgstr "Carpeta destino %s no existe. Creando carpeta.\n" #: pisi/cli/commands.py:203 msgid "Password: " -msgstr "Contraseña" +msgstr "Contraseña: " #: pisi/cli/commands.py:209 msgid "initialize PiSi components" @@ -1249,7 +1257,7 @@ msgstr "Comando terminado de manera anormal" #: pisi/cli/commands.py:249 msgid "Command lacks name" -msgstr "Comando no tiene nombre" +msgstr "Al comando le falta el nombre" #: pisi/cli/commands.py:253 msgid "Duplicate command %s" @@ -1263,7 +1271,7 @@ msgid "" "\n" "If run without parameters, it prints the general help." msgstr "" -"imprime ayuda para comandos\n" +"imprime ayuda para comando indicado\n" "\n" "Uso: help [ ... ]\n" "\n" @@ -1330,11 +1338,11 @@ msgstr "opciones del gráfico" #: pisi/cli/commands.py:357 msgid "Specify a particular repository" -msgstr "Especificar un repositorio en particular" +msgstr "Especificar un repositorio determinado" #: pisi/cli/commands.py:360 msgid "Graph of installed packages" -msgstr "Grafico de paquetes insgtalados" +msgstr "Gráfico de paquetes instalados" #: pisi/cli/commands.py:363 msgid "Do not show installed packages" @@ -1351,8 +1359,7 @@ msgstr "Ploteando paquetes de repositorio %s" #: pisi/cli/commands.py:383 msgid "Plotting a graph of relations among all repository packages" msgstr "" -"Ploteando un gráfico de relaciones entre los paquetes de todos los " -"repositorios" +"Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" #: pisi/cli/commands.py:390 msgid "Plotting a graph of relations among all installed packages" @@ -1360,11 +1367,11 @@ msgstr "Ploteando un gráfico de relaciones entre todos los paquetes instalados" #: pisi/cli/commands.py:402 msgid "Do not take build no into account." -msgstr "No atender número de build." +msgstr "No evaluar número de build." #: pisi/cli/commands.py:407 msgid "Do not take dependency information into account" -msgstr "No atender información de dependencias" +msgstr "No evaluar información de dependencias" #: pisi/cli/commands.py:411 msgid "" @@ -1398,12 +1405,12 @@ msgstr "Carpeta de salida para paquetes producidos" #: pisi/cli/commands.py:444 msgid "Bypass errors from ActionsAPI" -msgstr "Desviar errores del ActionsAPI" +msgstr "Omitir errores del ActionsAPI" # check? #: pisi/cli/commands.py:446 pisi/cli/commands.py:554 msgid "Bypass safety switch" -msgstr "Cambio de seguridad de Desvio" +msgstr "Omitir la verificación de seguridad" #: pisi/cli/commands.py:448 msgid "Create a static package with ar files" @@ -1488,7 +1495,7 @@ msgstr "" # no idea, i should know the context :( #: pisi/cli/commands.py:516 msgid "emerge options" -msgstr "" +msgstr "Opciones emerge" #: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 msgid "Ignore file conflicts" @@ -1500,7 +1507,7 @@ msgstr "Ignorar confllictos de paquetes" #: pisi/cli/commands.py:523 pisi/cli/commands.py:552 msgid "Bypass comar configuration agent" -msgstr "Saltar el agente de configuración comar" +msgstr "Omitir al agente de configuración comar" #: pisi/cli/commands.py:535 msgid "Outputting binary packages in the package cache." @@ -1512,7 +1519,7 @@ msgstr "Comando de operación de paquete abstracto" #: pisi/cli/commands.py:556 msgid "Do not perform any action, just show what would be done" -msgstr "no hacer nada, solamente mostrar lo que se haría" +msgstr "No hacer nada, solamente mostrar lo que se haría" #: pisi/cli/commands.py:567 msgid "" @@ -1607,9 +1614,8 @@ msgid "Do not update repositories" msgstr "No actualizar repositorios" #: pisi/cli/commands.py:660 -#, fuzzy msgid "Upgrade component's and recursive components' packages" -msgstr "Remover paquetes del componente y recursivamente de los subcomponentes" +msgstr "Actualizar componentes y recursivamente paquetes de componentes" #: pisi/cli/commands.py:664 msgid "" @@ -1746,19 +1752,17 @@ msgid "Package found in repository:" msgstr "Paquete encontrado en repositorio:" #: pisi/cli/commands.py:900 -#, fuzzy msgid "%s is not found in repositories" -msgstr "No se actuallizarán los repositorios" +msgstr "%s no encontrado en repositorios" #: pisi/cli/commands.py:903 -#, fuzzy msgid "%s is not installed" -msgstr "Paquete %s no está instalado." +msgstr "%s no está instalado" # "Reverse" ne demek ? is this = undo ? #: pisi/cli/commands.py:916 msgid "Reverse Dependencies:" -msgstr "" +msgstr "Dependencias reversas:" #: pisi/cli/commands.py:919 msgid "" @@ -2063,7 +2067,7 @@ msgstr "Listar paquetes disponibles bajo un componente dado" #: pisi/cli/commands.py:1282 msgid "Show uninstalled packages only" -msgstr "Solo muestra paquetes no instalados" +msgstr "Solo muestra paquetes desinstalados" #: pisi/cli/commands.py:1290 msgid "Installed packages are shown in this color" @@ -2148,12 +2152,8 @@ msgstr "" "Lista paquetes esperando la configuración.\n" #: pisi/cli/commands.py:1482 -#, fuzzy msgid "There are no packages waiting to be configured" -msgstr "" -"Lista de paquetes pendientes\n" -"\n" -"Lista paquetes esperando la configuración.\n" +msgstr "No hay paquetes esperando la configuración" #: pisi/cli/commands.py:1487 msgid "" @@ -2203,7 +2203,7 @@ msgstr "" #: pisi/cli/commands.py:1553 msgid "search-file options" -msgstr "opcioens search-file" +msgstr "opciones search-file" #: pisi/cli/commands.py:1557 msgid "Fuzzy search" @@ -2220,7 +2220,7 @@ msgstr "Paquete %s contiene archivo %s" #: pisi/cli/commands.py:1582 msgid "Type: %s, Hash: %s" -msgstr "Tpio: %s, Hash: %s" +msgstr "Tipo: %s, Hash: %s" #: pisi/cli/commands.py:1585 msgid "Path '%s' does not belong to an installed package" @@ -2273,7 +2273,7 @@ msgstr "No posible reiniciar comar" #: pisi/comariface.py:77 msgid "connection with comar unexpectedly closed" -msgstr "Pérdida de conexión con comar inesperada" +msgstr "Pérdida de conexión inesperada con comar " #: pisi/comariface.py:90 msgid "Configuration error: %s" @@ -2297,7 +2297,7 @@ msgstr "Registrando comar script %s " #: pisi/comariface.py:110 msgid "Calling post install handlers" -msgstr "Llamando actualdores de post-install" +msgstr "Llamando actuadores de post-install" #: pisi/comariface.py:115 msgid "Running package's post install script" @@ -2313,17 +2313,17 @@ msgstr "Ejecutando script previo de remover paquete" #: pisi/comariface.py:129 msgid "Calling pre remove handlers" -msgstr "Llamando actualores antes de remover" +msgstr "Llamando actuadores antes de remover" #: pisi/comariface.py:133 msgid "Unregistering comar scripts" -msgstr "Excluyendo scripts comar del registro" +msgstr "Eliminando scripts comar del registro" -#: pisi/component.py:97 pisi/component.py:103 +#: pisi/component.py:106 pisi/component.py:112 msgid "Component %s not found" msgstr "Componente %s no encontrado" -#: pisi/component.py:199 pisi/component.py:225 +#: pisi/component.py:208 pisi/component.py:234 msgid "Information for component %s not available" msgstr "Información para componente %s no disponible" @@ -2344,9 +2344,8 @@ msgid " version <= " msgstr " version <= " #: pisi/conflict.py:43 pisi/dependency.py:44 -#, fuzzy msgid " version " -msgstr " version <= " +msgstr " versión " #: pisi/conflict.py:45 pisi/dependency.py:46 msgid " release >= " @@ -2357,22 +2356,20 @@ msgid " release <= " msgstr " release <= " #: pisi/conflict.py:49 pisi/dependency.py:50 -#, fuzzy msgid " release " -msgstr " release <= " +msgstr " release " #: pisi/constants.py:30 msgid "Can't rebind constant: %s" -msgstr "" +msgstr "No posible rebind constant: %s" #: pisi/constants.py:36 msgid "Can't unbind constant: %s" -msgstr "" +msgstr "No posible unbind constant: %s" #: pisi/dependency.py:107 -#, fuzzy msgid "%s dependency of package %s is not satisfied" -msgstr "Dependencias para %s no se pueden cumplir" +msgstr "Dependencia %s de paquete %s no está satisfecha" #: pisi/dependency.py:120 msgid "Package %s is not present in the package database" @@ -2415,7 +2412,7 @@ msgstr "No posible traer %s; %s" #: pisi/fetcher.py:194 msgid "Please check your network connections and try again. (%s)" -msgstr "" +msgstr "Favor verifique su conexión de red y luego intente de nuevo. (%s)" #: pisi/fetcher.py:198 msgid "Cannot fetch %s; (%s): %s" @@ -2443,7 +2440,7 @@ msgstr "Trayendo %s" #: pisi/file.py:122 msgid "Copying %s to transfer dir" -msgstr "Copyiando %s a carpeta de transfer" +msgstr "Copiando %s a carpeta de transfer" #: pisi/file.py:127 msgid "File '%s' not found." @@ -2455,7 +2452,7 @@ msgstr "La integridad de %s acusa un problema." #: pisi/file.py:155 msgid "File mode must be either File.read or File.write" -msgstr "modo de archivo debe ser File.read o File.write" +msgstr "Modo de archivo debe ser File.read o File.write" #: pisi/file.py:160 msgid "Remote write not implemented" @@ -2473,24 +2470,24 @@ msgstr "ERROR: gpg --detach-sig %s falló" msgid "Encountered cycle %s" msgstr "Encontrado cycle %s" -#: pisi/index.py:92 -msgid "Adding %s to package index" -msgstr "Agregando %s al index de paquetes" - -#: pisi/index.py:95 +#: pisi/index.py:96 msgid "Adding %s to component index" msgstr "Agregando %s a index de componentes" -#: pisi/index.py:113 +#: pisi/index.py:108 +msgid "Adding %s to package index" +msgstr "Agregando %s al index de paquetes" + +#: pisi/index.py:122 msgid "Updating package database of %s" msgstr "Actualizando base de datos de paquetes %s" -#: pisi/index.py:141 +#: pisi/index.py:150 msgid "Package %s: metadata corrupt, skipping..." msgstr "Metadata de paquete %s: corrupto, omitiendo..." # here "source" means - like source code ? (not "base".. ) -#: pisi/index.py:169 +#: pisi/index.py:178 msgid "Adding %s to source index" msgstr "Agregando %s a index de fuentes" @@ -2517,7 +2514,7 @@ msgid "" "Version: %s, Release: %s, Build: %s\n" msgstr "" "Estado: %s\n" -"Version: %s, Release: %s, Build: %s\n" +"Versión: %s, Release: %s, Build: %s\n" #: pisi/installdb.py:67 msgid "Distribution: %s, Install Time: %s\n" @@ -2554,7 +2551,7 @@ msgstr "" #: pisi/lockeddbshelve.py:62 msgid "Cannot attain write access to database environment" -msgstr "No posible escribir en base de datos" +msgstr "No posible acceder base de datos para escritura" #: pisi/lockeddbshelve.py:64 msgid "Database version %s not present." @@ -2573,11 +2570,12 @@ msgid "Cannot attain read access to database environment" msgstr "No posible acceder base de datos para lectura" #: pisi/lockeddbshelve.py:95 -#, fuzzy msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." -msgstr "No posible escribir en base de datos" +msgstr "" +"No posible escribir en base de datos PiSi. Debe ejecutar esta operación como " +"usuario root." #: pisi/lockeddbshelve.py:113 msgid "Cannot attain read or write access to database %s" @@ -2660,25 +2658,28 @@ msgstr "Remover los siguientes paquetes conflictivos ?" # I don't know what to say for "Safety switch".. yet #: pisi/operations.py:305 msgid "Safety switch: Following packages in system.base will be installed: " -msgstr "Safety switch: Se instalarán los siguientes paquetes en system.base: " +msgstr "" +"Verificación de seguridad: Se instalarán los siguientes paquetes en system." +"base: " #: pisi/operations.py:311 msgid "Safety switch: Following packages in system.base will be upgraded: " msgstr "" -"Safety switch: Se actualizarán los siguientes paquetes en system.base: " +"Verificación de seguridad: Se actualizarán los siguientes paquetes en " +"system.base: " # should this say in english ? "Safety switch: the component cannot be found in system.base" ?? (i did in spanish like this) #: pisi/operations.py:317 pisi/operations.py:597 msgid "Safety switch: the component system.base cannot be found" -msgstr "Safety switch: No posible encontrar el componente en system.base: " +msgstr "" +"Verificación de seguridad: No posible encontrar el componente system.base: " #: pisi/operations.py:334 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" msgstr "" -"The following package(s) are already installed and are not going to be " -"installed again:\n" +"Los siguientes paquetes ya están instalados y no se instalarán de nuevo:\n" #: pisi/operations.py:355 msgid "" @@ -2699,7 +2700,7 @@ msgstr "" #: pisi/operations.py:432 msgid "Warning: package *name* ends with '.pisi'" -msgstr "Alterta: *name* de paquete termina con '.pisi'" +msgstr "Alerta: *name* de paquete termina con '.pisi'" #: pisi/operations.py:435 msgid "Package %s is not installed." @@ -2731,11 +2732,13 @@ msgstr "Actualización no posible." #: pisi/operations.py:568 msgid "Reverse dependency %s of %s cannot be satisfied" -msgstr "" +msgstr "Dependencia reversa %s de %s no puede ser satisfecha" #: pisi/operations.py:593 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "" +"Verificación de seguridad: no posible remover los paquetes siguientes en " +"system.base: " #: pisi/operations.py:604 msgid "Package %s does not exist. Cannot remove." @@ -2763,15 +2766,15 @@ msgstr "Paquete %s no está instalado. No posible remover." #: pisi/operations.py:683 msgid "No packages to emerge." -msgstr "" +msgstr "No hay paquetes para emerge" #: pisi/operations.py:698 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" msgstr "" -"The following minimal list of packages will be installed\n" -"from repository in the respective order to satisfy dependencies:\n" +"Se instalará la siguiente lista mínima de paquetes\n" +"del repositorio en el orden indicado para satisfacer dependencias:\n" #: pisi/operations.py:701 msgid "" @@ -2790,7 +2793,7 @@ msgid "" "There was a problem while fetching '%s'.\n" "The package may have been upgraded. Please try to upgrade the package." msgstr "" -"Ocurrió un problema al traer '%s'.\n" +"Ocurrió un problema durante descarga de '%s'.\n" "El paquete puede ya estar actualizado. Favor intente actualizar el paquete." #: pisi/package.py:60 pisi/sourcearchive.py:94 @@ -2825,65 +2828,65 @@ msgstr "" "El Tag debería tener al menos un locale actual, o si falla esto, una versión " "en inglés o turco" -#: pisi/pxml/autoxml.py:368 +#: pisi/pxml/autoxml.py:374 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' errores" -#: pisi/pxml/autoxml.py:423 pisi/pxml/autoxml.py:433 +#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: Cadena '%s' tiene errores" -#: pisi/pxml/autoxml.py:443 pisi/pxml/autoxml.py:453 +#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Archivo '%s' tiene errores" -#: pisi/pxml/autoxml.py:461 +#: pisi/pxml/autoxml.py:467 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: falló validación de objeto" -#: pisi/pxml/autoxml.py:469 +#: pisi/pxml/autoxml.py:475 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: codificación de archivo '%s' tiene errores" -#: pisi/pxml/autoxml.py:519 +#: pisi/pxml/autoxml.py:525 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: tipo de tag desconocido %s en spec" -#: pisi/pxml/autoxml.py:567 pisi/pxml/autoxml.py:578 +#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 msgid "Mandatory variable %s not available" msgstr "Variable obligatoria %s no disponible" -#: pisi/pxml/autoxml.py:648 +#: pisi/pxml/autoxml.py:654 msgid "Type mismatch: read text cannot be decoded" msgstr "Error de tipo de datos: no posible decodificar cadena de entrada" # anything better for "token"? -#: pisi/pxml/autoxml.py:652 pisi/pxml/autoxml.py:661 +#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 msgid "Mandatory token %s not available" msgstr "Token obligatorio %s no disponible" -#: pisi/pxml/autoxml.py:666 +#: pisi/pxml/autoxml.py:672 msgid "Type mismatch. Expected %s, got %s" msgstr "Error de tipo de datos. Esperado %s, recibido %s" -#: pisi/pxml/autoxml.py:696 pisi/pxml/autoxml.py:812 +#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 msgid "Type mismatch: DOM cannot be decoded" msgstr "Error de tipo de datos: no posible decodificar DOM " -#: pisi/pxml/autoxml.py:699 pisi/pxml/autoxml.py:715 pisi/pxml/autoxml.py:725 -#: pisi/pxml/autoxml.py:815 pisi/pxml/autoxml.py:829 pisi/pxml/autoxml.py:839 +#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 +#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 msgid "Mandatory argument not available" msgstr "Argumento obligatorio no disponible" -#: pisi/pxml/autoxml.py:712 pisi/pxml/autoxml.py:826 +#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 msgid "Object cannot be encoded" msgstr "No posible codificar objeto" -#: pisi/pxml/autoxml.py:737 +#: pisi/pxml/autoxml.py:743 msgid "List type must contain only one element" -msgstr "Tipo de lilsta debe contener un solo elemento" +msgstr "Tipo de lista debe contener un solo elemento" -#: pisi/pxml/autoxml.py:750 pisi/pxml/autoxml.py:771 +#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "Lista obligatoria \"%s\" bajo nodo \"%s\" está vacía." @@ -2900,9 +2903,8 @@ msgid "File '%s' has invalid XML" msgstr "Archivo '%s' contiene XML inválido" #: pisi/repodb.py:74 -#, fuzzy msgid "No repository named %s exists" -msgstr "No se encontró repositorio con nombre %s." +msgstr "No existe repositorio con nombre %s" #: pisi/repodb.py:83 msgid "Repository %s already exists" @@ -2926,7 +2928,7 @@ msgstr "Repo no contiene paquete con nombre %s." #: pisi/sourcearchive.py:63 msgid "Trying fallback address: %s" -msgstr "Intentando dirección de auxilio: %s" +msgstr "Intentando dirección de respaldo: %s" #: pisi/sourcearchive.py:74 msgid "%s mirrors are not defined." @@ -3028,81 +3030,65 @@ msgstr "comando objcopy (add-debuglink) falló para archivo '%s'!" msgid "Updating environment..." msgstr "Actualizando entorno..." -#: scripts/repostats.py:361 +#: scripts/repostats.py:226 msgid "" "Duplicate binary packages:\n" "%s\n" "%s\n" msgstr "" -"Duplicar paquetes binarios:\n" +"Paquetes binarios duplicados:\n" "%s\n" "%s\n" -#: scripts/repostats.py:366 -msgid "Unknown file type '%s' in package '%s'" -msgstr "Tipo de archivo '%s' en paquete '%s' desconocido" - -#: scripts/repostats.py:422 +#: scripts/repostats.py:301 msgid "" "Duplicate source packages:\n" "%s\n" "%s\n" msgstr "" -"Duplicar paquetes de fuentes:\n" +"Paquetes de fuentes duplicados:\n" "%s\n" "%s\n" -#: scripts/repostats.py:442 -msgid "Source package '%s' has wrong date format '%s'" -msgstr "Paeuete de fuente '%s' tiene formato de fecha incorrecto '%s'" - -#: scripts/repostats.py:481 +#: scripts/repostats.py:371 msgid "" "Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" "Desarollador '%s <%s>' tiene otra dirección email '%s' en archivo fuente '%s'" -#: scripts/repostats.py:564 +#: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" msgstr "" +"No posible parsear '%s':\n" +"%s\n" -#: scripts/repostats.py:642 +#: scripts/repostats.py:553 msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" msgstr "Uso: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" -#: scripts/repostats.py:643 +#: scripts/repostats.py:554 msgid "Dont generate the web site.\n" msgstr "No generar sitio web.\n" -#: scripts/repostats.py:664 +#: scripts/repostats.py:575 msgid "Scanning source repository...\n" -msgstr "Escaneando repositorio fuente...\n" +msgstr "Buscando en repositorio fuente...\n" -#: scripts/repostats.py:668 +#: scripts/repostats.py:579 msgid "Scanning binary packages...\n" -msgstr "Escaneando paquetes binarios...\n" +msgstr "Buscando en paquetes binarios...\n" -#: scripts/repostats.py:673 -msgid "Encountered %d errors! Fix them immediately!\n" -msgstr "%d errores encontrados! Corrígalos de inmediato!\n" +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Tipo de archivo '%s' en paquete '%s' desconocido" -#: scripts/repostats.py:681 -msgid "These dependencies are not available in repository:\n" -msgstr "Las siguientes dependencias no están disponibles en el repositorio:\n" +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Paquete de fuente '%s' tiene formato de fecha incorrecto '%s'" -#~ msgid "Package not installable" -#~ msgstr "No posible instalar paquete" +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%d errores encontrados! Corrígalos de inmediato!\n" -#~ msgid "Package %s does not satisfy dependency %s" -#~ msgstr "Paquete %s no satiface dependencia %s" - -#~ msgid "Cannot write to PiSi database." -#~ msgstr "No posible escribir en base de datos PiSi" - -#~ msgid "%s section should have a '%s' tag" -#~ msgstr "Sección %s debería tener un tag '%s'" - -#~ msgid "Removing lock %s" -#~ msgstr "Removiendo candado %s" +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "" +#~ "Las siguientes dependencias no están disponibles en el repositorio:\n" diff --git a/po/nl.po b/po/nl.po index 9910c6b9..37633d1c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,14 +1,14 @@ # translation of nl.po to Nederlands # Andre van der Lubben , 2006. -# Willem Gielen , 2006. +# Willem Gielen , 2006, 2007. # Rinse de Vries , 2006. # W.P.M.H.I.A. Gielen , 2006. -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. msgid "" msgstr "" "Project-Id-Version: nl\n" -"POT-Creation-Date: 2006-12-09 20:35+EET\n" -"PO-Revision-Date: 2006-12-05 22:33+0200\n" +"POT-Creation-Date: 2007-02-28 20:09+EET\n" +"PO-Revision-Date: 2007-02-18 03:02+0200\n" "Last-Translator: Willem Gielen \n" "Language-Team: Nederlands \n" "MIME-Version: 1.0\n" @@ -488,7 +488,7 @@ msgstr "Terugloop:" msgid "Use --debug to see a traceback." msgstr "Gebruik --debug voor een terugloop." -#: pisi/actionsapi/autotools.py:36 +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" "Please attach the config.log to your bug report:\n" "%s/config.log" @@ -498,8 +498,8 @@ msgstr "" # pisi/actionsapi/autotools.py:75 :85 #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/kde.py:65 pisi/actionsapi/perlmodules.py:54 -#: pisi/actionsapi/perlmodules.py:57 +#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Configuratie is mislukt." @@ -509,14 +509,16 @@ msgstr "Configuratie is mislukt." msgid "No configure script found." msgstr "Geen configuratiescript gevonden." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/kde.py:72 -#: pisi/actionsapi/perlmodules.py:63 pisi/actionsapi/perlmodules.py:72 -#: pisi/actionsapi/pythonmodules.py:49 pisi/actionsapi/scons.py:39 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 msgid "Make failed." msgstr "Make mislukt." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." @@ -524,7 +526,8 @@ msgstr "Installatie mislukt." # pisi/actionsapi/autotools.py:121 :129 #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 +#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Geen Makefile-bestand gevonden." @@ -550,6 +553,12 @@ msgstr "Uitvoeren automake mislukt." msgid "Running autoheader failed." msgstr "Uitvoeren autoheader mislukt." +# pisi/actionsapi/autotools.py:77 :87 +#: pisi/actionsapi/cmaketools.py:69 +#, fuzzy +msgid "No configure script found for cmake." +msgstr "Geen configuratiescript gevonden." + #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" msgstr "Hulpprogramma %s niet gevonden" @@ -583,7 +592,7 @@ msgstr "Uitvoeren libtoolize mislukt." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/perlmodules.py:66 msgid "perl build failed." -msgstr "perl compileren mislukt." +msgstr "perl bouwen mislukt." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/perlmodules.py:75 @@ -663,7 +672,7 @@ msgstr "ActionsAPI [unlinkDir]: map %s bestaat niet." #: pisi/actionsapi/shelltools.py:120 msgid "ActionsAPI [move]: Permission denied: %s to %s" -msgstr "ActionsAPI [move]: toegang geweigerd: %s -> %s" +msgstr "ActionsAPI [move]: toegang geweigerd: %s naar %s" #: pisi/actionsapi/shelltools.py:122 msgid "ActionsAPI [move]: File %s doesn't exists." @@ -671,7 +680,7 @@ msgstr "ActionsAPI [move]: bestand %s bestaat niet." #: pisi/actionsapi/shelltools.py:132 msgid "ActionsAPI [copy]: Permission denied: %s to %s" -msgstr "ActionsAPI [copy]: toegang geweigerd: %s -> %s" +msgstr "ActionsAPI [copy]: toegang geweigerd: %s naar %s" #: pisi/actionsapi/shelltools.py:148 msgid "ActionsAPI [copy]: File %s does not exist." @@ -743,7 +752,7 @@ msgstr "* Bijwerken repository: %s " #: pisi/api.py:432 msgid "No updates available for repository %s." -msgstr "Geen bijgewerkte bestanden beschikbaar op repository %s." +msgstr "Geen bijgewerkte pakketten op repository %s." #: pisi/api.py:434 msgid "Updating database at any rate as requested" @@ -759,7 +768,7 @@ msgstr "Geen repository met de naam %s gevonden." #: pisi/api.py:455 msgid "* Rebuilding '%s' named repo... " -msgstr "* 'Opnieuw opbouwen %s' repo... " +msgstr "* 'Opnieuw opbouwen '%s' repo... " #: pisi/api.py:468 msgid "Input/Output error while reading %s: %s" @@ -795,18 +804,17 @@ msgstr "Pakket %s niet gevonden in de actieve repositories." #: pisi/atomicoperations.py:101 msgid "Installing %s, version %s, release %s, build %s" -msgstr "Installatie %s, versie %s, uitgave %s, compilatie %s" +msgstr "Installatie %s, versie %s, uitgave %s, bouw %s" #: pisi/atomicoperations.py:146 -#, fuzzy msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" -"De volgende pakketten zullen geïnstalleerd worden in de respectievelijke " -"volgorde voor de afhankelijkheden:\n" +"%s pakket kan niet geïnstalleerd worden als er niet aan de afhankelijkheden " +"is voldaan" #: pisi/atomicoperations.py:165 msgid "/%s from %s package\n" -msgstr "%s van %s pakket\n" +msgstr "/%s van %s pakket\n" #: pisi/atomicoperations.py:166 msgid "" @@ -834,7 +842,7 @@ msgstr "Opwaarderen naar nieuwe distributie-uitgave" #: pisi/atomicoperations.py:215 msgid "Upgrading to new distribution build" -msgstr "Opwaarderen naar nieuwe distributie compilatie" +msgstr "Opwaarderen naar nieuwe distributie bouw" #: pisi/atomicoperations.py:225 msgid "Downgrade to old distribution release?" @@ -842,11 +850,11 @@ msgstr "Terugwaarderen naar oude distributie uitgave?" #: pisi/atomicoperations.py:227 msgid "Downgrade to old distribution build?" -msgstr "Terugwaarderen naar oude distributie compilatie?" +msgstr "Terugwaarderen naar oude distributie bouw?" #: pisi/atomicoperations.py:229 msgid "Package downgrade declined" -msgstr "Terugwaarderen van pakket geweigerd" +msgstr "Pakket terugwaarderen geweigerd" # pisi/actionsapi/autotools.py:75 :85 #: pisi/atomicoperations.py:253 @@ -887,7 +895,7 @@ msgstr "Niet verwijderen conflicterend bestand: %s" msgid "" "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" -"Genïstalleerd bestand %s bestaat niet op systeem [mogelijk met de hand " +"Geïnstalleerd bestand %s bestaat niet op systeem [mogelijk met de hand " "verwijderd]" #: pisi/atomicoperations.py:535 @@ -928,7 +936,7 @@ msgstr "Bron %s niet gevonden in actieve repositories." #: pisi/build.py:183 msgid "Building PiSi source package: %s" -msgstr "Compileren PiSi-bronpakket: %s " +msgstr "Bouwen PiSi-bronpakket: %s " #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." @@ -940,7 +948,7 @@ msgstr "Ccache gevonden..." #: pisi/build.py:287 msgid "PartOf tag not defined, looking for component" -msgstr "PartOf' tag is niet omschreven, zoeken naar component" +msgstr "PartOf tag is niet omschreven, zoeken naar component" #: pisi/build.py:297 msgid "Cannot find component.xml in upper directory" @@ -972,7 +980,7 @@ msgstr "Instellen bron..." #: pisi/build.py:323 msgid "Building source..." -msgstr "Compileren bron..." +msgstr "Bouwen bron..." #: pisi/build.py:328 msgid "Installing..." @@ -992,7 +1000,7 @@ msgstr "Kan COMAR script niet lezen (%s): %s" #: pisi/build.py:391 msgid "SyntaxError in COMAR file (%s): %s" -msgstr "Syntaxfout in COMARbestand (%s): %s" +msgstr "Syntaxfout in COMAR bestand (%s): %s" #: pisi/build.py:417 msgid "unable to call function from actions: %s" @@ -1015,28 +1023,27 @@ msgstr "Veiligheidsprocedure: het component system.devel niet gevonden" #: pisi/build.py:449 msgid "Unsatisfied Build Dependencies:" -msgstr "Niet-opgeloste compileerafhankelijkheden:" +msgstr "Niet-opgeloste bouwafhankelijkheden:" #: pisi/build.py:453 msgid "Cannot build package due to unsatisfied build dependencies" -msgstr "" -"Kan pakket niet compileren wegens niet-opgeloste compileerafhankelijkheden" +msgstr "Kan pakket niet bouwen wegens niet-opgeloste compileerafhankelijkheden" #: pisi/build.py:461 msgid "Build dependency %s cannot be satisfied" -msgstr "Compileerafhankelijkheid %s niet opgelost." +msgstr "Bouwafhankelijkheid %s niet opgelost." #: pisi/build.py:463 msgid "Do you want to install the unsatisfied build dependencies" -msgstr "Wilt u de niet-opgeloste compileerafhankelijkheden installeren?" +msgstr "Wilt u de niet-opgeloste bouwafhankelijkheden installeren?" #: pisi/build.py:464 msgid "Installing build dependencies." -msgstr "Installeren compileerafhankelijkheden." +msgstr "Installeren bouwafhankelijkheden." #: pisi/build.py:469 msgid "Ignoring build dependencies." -msgstr "Negeren compileerafhankelijkheden." +msgstr "Negeren bouwafhankelijkheden." #: pisi/build.py:479 msgid "Patch file is missing: %s\n" @@ -1044,7 +1051,7 @@ msgstr "Patch-bestand ontbreekt: %s\n" #: pisi/build.py:492 msgid "* Applying patch: %s" -msgstr "* Patch toepassen: %s" +msgstr "* Toepassen patch: %s" #: pisi/build.py:550 msgid "Stripping files.." @@ -1060,31 +1067,31 @@ msgstr "Overslaan %s met onjuiste pakketnaam" #: pisi/build.py:679 msgid "(no previous build found, setting build no to 1.)" -msgstr "(geen eerdere compilatie gevonden, zet compilatienummer op 1.)" +msgstr "(geen eerdere bouw gevonden, zet compilatienummer op 1.)" #: pisi/build.py:724 msgid "(old package lacks a build no, setting build no to 1.)" -msgstr "(oud pakket heeft geen compilatienummer, zet compilatienummer op 1.)" +msgstr "(oud pakket heeft geen bouwnummer, zet compilatienummer op 1.)" #: pisi/build.py:727 msgid "There are changes, incrementing build no to %d" -msgstr "Er zijn wijzigingen, zet compilatienummer op %d " +msgstr "Er zijn wijzigingen, zet bouwnummer op %d " #: pisi/build.py:730 msgid "There is no change from previous build %d" -msgstr "Er zijn geen wijzigingen sinds vorige compilatie %d" +msgstr "Er zijn geen wijzigingen sinds vorige bouw %d" #: pisi/build.py:795 msgid "No user named '%s' found on the system" -msgstr "" +msgstr "Geen gebruiker met de naam '%s' gevonden op het systeem" #: pisi/build.py:800 msgid "No group named '%s' found on the system" -msgstr "" +msgstr "Geen groep met de naam '%s' gevonden op het systeem" #: pisi/build.py:803 msgid "** Building package %s" -msgstr "** compileren pakket %s" +msgstr "** bouwen pakket %s" # pisi/build.py:503 :506 #: pisi/build.py:805 pisi/build.py:808 @@ -1096,8 +1103,8 @@ msgid "" "Build number is not available. For repo builds you must enable buildno in " "pisi.conf." msgstr "" -"Compilatienummer is niet aanwezig. Bij repo-compilaties moet u buildno " -"inschakelen in pisi.conf." +"Bouwnummer is niet aanwezig. Bij repo-compilaties moet u buildno inschakelen " +"in pisi.conf." #: pisi/build.py:832 msgid "Creating PiSi package %s." @@ -1119,11 +1126,11 @@ msgstr "" #: pisi/build.py:891 msgid "Cleaning Build Directory..." -msgstr "Opschonen compilatiemap..." +msgstr "Opschonen bouwmap..." #: pisi/build.py:894 msgid "Keeping Build Directory" -msgstr "Behouden compilatiemap" +msgstr "Behouden bouwmap" #: pisi/cli/__init__.py:79 msgid "Warning: " @@ -1345,7 +1352,7 @@ msgstr "Plot een grafiek van de relaties tussen alle geïnstalleerde pakketten" #: pisi/cli/commands.py:402 msgid "Do not take build no into account." -msgstr "Compileernummer niet meerekenen." +msgstr "Bouwnummer niet meerekenen." #: pisi/cli/commands.py:407 msgid "Do not take dependency information into account" @@ -1363,7 +1370,7 @@ msgid "" "Alternatively, you can give the name of a source package\n" "to be downloaded from a repository containing sources.\n" msgstr "" -"Compileer PiSi-pakket\n" +"Bouw PiSi-pakket\n" "\n" "Gebruik: build [ | ] ...\n" "\n" @@ -1375,7 +1382,7 @@ msgstr "" #: pisi/cli/commands.py:433 msgid "build options" -msgstr "compilatie opties" +msgstr "bouw opties" #: pisi/cli/commands.py:441 msgid "Output directory for produced packages" @@ -1397,7 +1404,7 @@ msgstr "Maak een statisch pakket met ar-bestanden aan" msgid "" "Do not install build dependencies, fail if a build dependency is present" msgstr "" -"Installeer geen compileerafhankelijkheden, stoppen als zich een " +"Installeer geen bouwafhankelijkheden, stoppen als zich een " "compileerafhankelijkheid voordoet" #: pisi/cli/commands.py:452 @@ -1406,31 +1413,31 @@ msgstr "PiSi binaire pakket formaten: '1.0', '1.1' (standaard)" #: pisi/cli/commands.py:455 msgid "build steps" -msgstr "compilatie stappen" +msgstr "bouw stappen" #: pisi/cli/commands.py:457 msgid "Break build after fetching the source archive" -msgstr "Breek Compilatie af na ophalen bron archief" +msgstr "Breek bouwen af na ophalen bron archief" #: pisi/cli/commands.py:459 msgid "" "Break build after unpacking the source archive, checking sha1sum and " "applying patches" msgstr "" -"Breek compilatie af na uitpakken van het bron archief, controlleert sha1sum " -"en herstelt" +"Breek bouwen af na uitpakken van het bron archief, controleert sha1sum en " +"herstelt" #: pisi/cli/commands.py:461 msgid "Break build after running configure step" -msgstr "Breek compilatie af na uitvoeren van de configuratie stap" +msgstr "Breek bouwen af na uitvoeren van de configuratie stap" #: pisi/cli/commands.py:463 msgid "Break build after running compile step" -msgstr "Breek compilatie af na uitvoeren van de compilatie stap" +msgstr "Breek bouwen af na uitvoeren van de compilatie stap" #: pisi/cli/commands.py:465 msgid "Break build after running install step" -msgstr "Breek compilatie af na uitvoeren van de installatie stap" +msgstr "Breek bouwen af na uitvoeren van de installatie stap" #: pisi/cli/commands.py:467 msgid "create PiSi package" @@ -1459,7 +1466,7 @@ msgid "" "\n" "You can also give the name of a component.\n" msgstr "" -"Compileer en installleer PiSi pakketten vanaf de repository\n" +"Bouw en installleer PiSi pakketten vanaf de repository\n" "\n" "Gebruik: emerge ...\n" "\n" @@ -1586,9 +1593,8 @@ msgid "Do not update repositories" msgstr "Repositories niet bijwerken" #: pisi/cli/commands.py:660 -#, fuzzy msgid "Upgrade component's and recursive components' packages" -msgstr "Verwijder componenten en de pakketten van recursieve componenten" +msgstr "Opwaarderen componenten en recursieve componenten pakketten" #: pisi/cli/commands.py:664 msgid "" @@ -1722,14 +1728,12 @@ msgid "Package found in repository:" msgstr "Pakket gevonden in repository:" #: pisi/cli/commands.py:900 -#, fuzzy msgid "%s is not found in repositories" -msgstr "Zal repositories niet bijwerken" +msgstr "%s niet gevonden in de repositories" #: pisi/cli/commands.py:903 -#, fuzzy msgid "%s is not installed" -msgstr "Pakket %s is niet geïnstalleerd." +msgstr "%s is niet geïnstalleerd." #: pisi/cli/commands.py:916 msgid "Reverse Dependencies:" @@ -1876,8 +1880,7 @@ msgstr "Toon gedetailleerde installatie-informatie" #: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 msgid "" "Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "" -"Pakketnaam |St| Versie| Rel.| Compilatie| Distro| Datum" +msgstr "Pakketnaam |St| Versie| Rel.| Bouw | Distro| Datum" #: pisi/cli/commands.py:1081 msgid "" @@ -2124,12 +2127,8 @@ msgstr "" "Toont pakketten wachtend op configuratie\n" #: pisi/cli/commands.py:1482 -#, fuzzy msgid "There are no packages waiting to be configured" -msgstr "" -"Toon wachtende pakketten\n" -"\n" -"Toont pakketten wachtend op configuratie\n" +msgstr "Er zijn geen pakketten die wachten op configuratie" #: pisi/cli/commands.py:1487 msgid "" @@ -2294,11 +2293,11 @@ msgstr "Aanroepen pre-verwijder afhandelingen" msgid "Unregistering comar scripts" msgstr "Deregistreren comar-scripts" -#: pisi/component.py:97 pisi/component.py:103 +#: pisi/component.py:106 pisi/component.py:112 msgid "Component %s not found" msgstr "Component %s niet gevonden" -#: pisi/component.py:199 pisi/component.py:225 +#: pisi/component.py:208 pisi/component.py:234 msgid "Information for component %s not available" msgstr "Informatie voor component %s niet beschikbaar" @@ -2319,9 +2318,8 @@ msgid " version <= " msgstr " versie <= " #: pisi/conflict.py:43 pisi/dependency.py:44 -#, fuzzy msgid " version " -msgstr " versie <= " +msgstr " versie " #: pisi/conflict.py:45 pisi/dependency.py:46 msgid " release >= " @@ -2332,9 +2330,8 @@ msgid " release <= " msgstr " uitgave <= " #: pisi/conflict.py:49 pisi/dependency.py:50 -#, fuzzy msgid " release " -msgstr " uitgave <= " +msgstr " uitgave " #: pisi/constants.py:30 msgid "Can't rebind constant: %s" @@ -2345,9 +2342,8 @@ msgid "Can't unbind constant: %s" msgstr "Kan niet ontkoppelen van contante: %s" #: pisi/dependency.py:107 -#, fuzzy msgid "%s dependency of package %s is not satisfied" -msgstr "Omgekeerde afhankelijkheid %s van %s kan niet worden voldaan" +msgstr "%s afhankelijkheid van pakket %s is niet bevredigend" #: pisi/dependency.py:120 msgid "Package %s is not present in the package database" @@ -2390,7 +2386,7 @@ msgstr "Kan niet ophalen %s; %s" #: pisi/fetcher.py:194 msgid "Please check your network connections and try again. (%s)" -msgstr "" +msgstr "Controleer uw netwerk verbindingen en probeer opnieuw. (%s)" #: pisi/fetcher.py:198 msgid "Cannot fetch %s; (%s): %s" @@ -2448,23 +2444,23 @@ msgstr "FOUT: gpg --detach-sig %s is mislukt" msgid "Encountered cycle %s" msgstr "Ondekt cyclus %s" -#: pisi/index.py:92 -msgid "Adding %s to package index" -msgstr "Toevoegen %s aan pakketindex" - -#: pisi/index.py:95 +#: pisi/index.py:96 msgid "Adding %s to component index" msgstr "Toevoegen %s aan componentindex" -#: pisi/index.py:113 +#: pisi/index.py:108 +msgid "Adding %s to package index" +msgstr "Toevoegen %s aan pakketindex" + +#: pisi/index.py:122 msgid "Updating package database of %s" msgstr "Bijwerken pakketdatabase van %s" -#: pisi/index.py:141 +#: pisi/index.py:150 msgid "Package %s: metadata corrupt, skipping..." msgstr "Pakket %s: metadata is corrupt, wordt overgeslagen..." -#: pisi/index.py:169 +#: pisi/index.py:178 msgid "Adding %s to source index" msgstr "Toevoegen %s aan bronindex" @@ -2490,7 +2486,7 @@ msgid "" "Version: %s, Release: %s, Build: %s\n" msgstr "" "Status: %s\n" -"Versie: %s, uitgave: %s, compilatie: %s\n" +"Versie: %s, uitgave: %s, bouw: %s\n" #: pisi/installdb.py:67 msgid "Distribution: %s, Install Time: %s\n" @@ -2546,11 +2542,12 @@ msgid "Cannot attain read access to database environment" msgstr "Kan geen leestoegang tot de databaseomgeving krijgen" #: pisi/lockeddbshelve.py:95 -#, fuzzy msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." -msgstr "Kan geen schrijftoegang tot de databaseomgeving krijgen" +msgstr "" +"Kan geen schrijftoegang tot de PiSi database krijgen. U dient root te zijn " +"voor deze handeling." #: pisi/lockeddbshelve.py:113 msgid "Cannot attain read or write access to database %s" @@ -2686,7 +2683,7 @@ msgstr "Pakket %s is al de laatste uitgave %s" #: pisi/operations.py:459 msgid "Package %s is already at the latest build %s." -msgstr "Pakket %s is al de laatste compilatie %s." +msgstr "Pakket %s is al de laatste bouw %s." #: pisi/operations.py:486 msgid "The following packages will be upgraded: " @@ -2800,68 +2797,68 @@ msgstr "" "De tag dient tenminste de huidige locale bevatten, of anders een Engelse, " "Nederlandse of Turkse versie" -#: pisi/pxml/autoxml.py:368 +#: pisi/pxml/autoxml.py:374 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' fouten" -#: pisi/pxml/autoxml.py:423 pisi/pxml/autoxml.py:433 +#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: lijn '%s' bevat fouten" -#: pisi/pxml/autoxml.py:443 pisi/pxml/autoxml.py:453 +#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: bestand '%s' bevat fouten" -#: pisi/pxml/autoxml.py:461 +#: pisi/pxml/autoxml.py:467 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: objectvalidatie is mislukt" -#: pisi/pxml/autoxml.py:469 +#: pisi/pxml/autoxml.py:475 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: bestandscodering '%s' bevat fouten" -#: pisi/pxml/autoxml.py:519 +#: pisi/pxml/autoxml.py:525 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: onherkenbare tag %s in spec" -#: pisi/pxml/autoxml.py:567 pisi/pxml/autoxml.py:578 +#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 msgid "Mandatory variable %s not available" msgstr "Verplichte variabele %s niet beschikbaar" -#: pisi/pxml/autoxml.py:648 +#: pisi/pxml/autoxml.py:654 msgid "Type mismatch: read text cannot be decoded" msgstr "Ongeldig type: leestekst kan niet ontcijferd worden" -#: pisi/pxml/autoxml.py:652 pisi/pxml/autoxml.py:661 +#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 msgid "Mandatory token %s not available" msgstr "Verplichte teken %s niet beschikbaar" -#: pisi/pxml/autoxml.py:666 +#: pisi/pxml/autoxml.py:672 msgid "Type mismatch. Expected %s, got %s" msgstr "Ongeldig type: %s werd verwacht, %s is gekregen" # pisi/xmlfile.py:420 :521 -#: pisi/pxml/autoxml.py:696 pisi/pxml/autoxml.py:812 +#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 msgid "Type mismatch: DOM cannot be decoded" msgstr "Ongeldig type: DOM kan niet ontcijferd worden" # pisi/xmlfile.py:392 :423 :439 :446 :524 :538 :545 -#: pisi/pxml/autoxml.py:699 pisi/pxml/autoxml.py:715 pisi/pxml/autoxml.py:725 -#: pisi/pxml/autoxml.py:815 pisi/pxml/autoxml.py:829 pisi/pxml/autoxml.py:839 +#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 +#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 msgid "Mandatory argument not available" msgstr "Verplicht argument niet beschikbaar" # pisi/xmlfile.py:436 :535 -#: pisi/pxml/autoxml.py:712 pisi/pxml/autoxml.py:826 +#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 msgid "Object cannot be encoded" msgstr "Object kan niet gecodeerd worden" -#: pisi/pxml/autoxml.py:737 +#: pisi/pxml/autoxml.py:743 msgid "List type must contain only one element" msgstr "Lijsttype mag maar één element bevatten" # pisi/xmlfile.py:470 :485 -#: pisi/pxml/autoxml.py:750 pisi/pxml/autoxml.py:771 +#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "De verplichte lijst \"%s\" onder de \"%s\" nodus is leeg." @@ -2878,9 +2875,8 @@ msgid "File '%s' has invalid XML" msgstr "Bestand '%s' bevat ongeldige XML" #: pisi/repodb.py:74 -#, fuzzy msgid "No repository named %s exists" -msgstr "Geen repository met de naam %s gevonden." +msgstr "Er bestaat geen repository met de naam %s" #: pisi/repodb.py:83 msgid "Repository %s already exists" @@ -2892,7 +2888,7 @@ msgstr "Kan geen repository toevoegen op de positie %s" #: pisi/scenarioapi/package.py:67 msgid "No pisi package: %s* found." -msgstr "Geen pisi pakket %s gevonden." +msgstr "Geen pisi pakket %s* gevonden." #: pisi/scenarioapi/repoops.py:28 msgid "Repo already has package named %s." @@ -2932,7 +2928,7 @@ msgstr "URI: %s, type: %s, sha1sum: %s" #: pisi/specfile.py:208 msgid "Name: %s, version: %s, release: %s, build %s\n" -msgstr "Naam: %s, versie %s, uitgave %s, compilatie %s\n" +msgstr "Naam: %s, versie %s, uitgave %s, bouw %s\n" #: pisi/specfile.py:210 msgid "Summary: %s\n" @@ -3006,7 +3002,7 @@ msgstr "Commando 'objcopy' (add-debuglink) mislukte voor bestand '%s'!" msgid "Updating environment..." msgstr "Omgeving bijwerken..." -#: scripts/repostats.py:361 +#: scripts/repostats.py:226 msgid "" "Duplicate binary packages:\n" "%s\n" @@ -3016,11 +3012,7 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:366 -msgid "Unknown file type '%s' in package '%s'" -msgstr "Onbekend bestandstype '%s' in pakket '%s'" - -#: scripts/repostats.py:422 +#: scripts/repostats.py:301 msgid "" "Duplicate source packages:\n" "%s\n" @@ -3030,17 +3022,13 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:442 -msgid "Source package '%s' has wrong date format '%s'" -msgstr "Bronpakket '%s' heeft een onjuiste datumopmaak: '%s'" - -#: scripts/repostats.py:481 +#: scripts/repostats.py:371 msgid "" "Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" "Ontwikkelaar '%s <%s>' heeft een ander e-mailadres '%s' in bronpakket '%s'" -#: scripts/repostats.py:564 +#: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" @@ -3048,47 +3036,30 @@ msgstr "" "Kan '%s' niet ontleden:\n" "'%s'\n" -#: scripts/repostats.py:642 +#: scripts/repostats.py:553 msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" msgstr "Gebruik: repostats.py [Opties] source-repo-path [binair-repo-adres]\n" -#: scripts/repostats.py:643 +#: scripts/repostats.py:554 msgid "Dont generate the web site.\n" msgstr "Website niet genereren.\n" -#: scripts/repostats.py:664 +#: scripts/repostats.py:575 msgid "Scanning source repository...\n" msgstr "Scannen bron-repository...\n" -#: scripts/repostats.py:668 +#: scripts/repostats.py:579 msgid "Scanning binary packages...\n" msgstr "Scannen binaire pakketten...\n" -#: scripts/repostats.py:673 -msgid "Encountered %d errors! Fix them immediately!\n" -msgstr "%d problemen gevonden! Repareer ze onmiddellijk!\n" +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Onbekend bestandstype '%s' in pakket '%s'" -#: scripts/repostats.py:681 -msgid "These dependencies are not available in repository:\n" -msgstr "Deze afhankelijkheden zijn niet beschikbaar in de repository:\n" +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Bronpakket '%s' heeft een onjuiste datumopmaak: '%s'" -#~ msgid "Dependencies for %s not satisfied" -#~ msgstr "Afhankelijkheden voor %s niet opgelost" +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%d problemen gevonden! Repareer ze onmiddellijk!\n" -#~ msgid "Package not installable" -#~ msgstr "Pakket niet installeerbaar" - -#~ msgid "Package %s does not satisfy dependency %s" -#~ msgstr "Pakket %s voldoet niet aan afhankelijkheid %s" - -#~ msgid "eager upgrades" -#~ msgstr "belangrijke opwaarderingen" - -#~ msgid "Cannot write to PiSi database." -#~ msgstr "Kan niet naar de PiSi-database schrijven." - -#~ msgid "%s section should have a '%s' tag" -#~ msgstr "'%s' sectie zou een '%s' tag moeten hebben" - -#~ msgid "Removing lock %s" -#~ msgstr "Vergrendeling %s verwijderen" +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "Deze afhankelijkheden zijn niet beschikbaar in de repository:\n" diff --git a/po/pisi.pot b/po/pisi.pot index 9f3ec02c..7c24b3d0 100644 --- a/po/pisi.pot +++ b/po/pisi.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-12-11 11:30+EET\n" +"POT-Creation-Date: 2007-02-28 20:09+EET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -359,15 +359,15 @@ msgstr "" msgid "Use --debug to see a traceback." msgstr "" -#: pisi/actionsapi/autotools.py:36 +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" "Please attach the config.log to your bug report:\n" "%s/config.log" msgstr "" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/kde.py:65 pisi/actionsapi/perlmodules.py:54 -#: pisi/actionsapi/perlmodules.py:57 +#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "" @@ -376,20 +376,23 @@ msgstr "" msgid "No configure script found." msgstr "" -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/kde.py:72 -#: pisi/actionsapi/perlmodules.py:63 pisi/actionsapi/perlmodules.py:72 -#: pisi/actionsapi/pythonmodules.py:49 pisi/actionsapi/scons.py:39 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 msgid "Make failed." msgstr "" #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "" #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 +#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "" @@ -413,6 +416,10 @@ msgstr "" msgid "Running autoheader failed." msgstr "" +#: pisi/actionsapi/cmaketools.py:69 +msgid "No configure script found for cmake." +msgstr "" + #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" msgstr "" @@ -1930,11 +1937,11 @@ msgstr "" msgid "Unregistering comar scripts" msgstr "" -#: pisi/component.py:97 pisi/component.py:103 +#: pisi/component.py:106 pisi/component.py:112 msgid "Component %s not found" msgstr "" -#: pisi/component.py:199 pisi/component.py:225 +#: pisi/component.py:208 pisi/component.py:234 msgid "Information for component %s not available" msgstr "" @@ -2078,23 +2085,23 @@ msgstr "" msgid "Encountered cycle %s" msgstr "" -#: pisi/index.py:92 -msgid "Adding %s to package index" -msgstr "" - -#: pisi/index.py:95 +#: pisi/index.py:96 msgid "Adding %s to component index" msgstr "" -#: pisi/index.py:113 +#: pisi/index.py:108 +msgid "Adding %s to package index" +msgstr "" + +#: pisi/index.py:122 msgid "Updating package database of %s" msgstr "" -#: pisi/index.py:141 +#: pisi/index.py:150 msgid "Package %s: metadata corrupt, skipping..." msgstr "" -#: pisi/index.py:169 +#: pisi/index.py:178 msgid "Adding %s to source index" msgstr "" @@ -2385,64 +2392,64 @@ msgstr "" msgid "Tag should have at least the current locale, or failing that an English or Turkish version" msgstr "" -#: pisi/pxml/autoxml.py:368 +#: pisi/pxml/autoxml.py:374 msgid "autoxml.check: '%s' errors" msgstr "" -#: pisi/pxml/autoxml.py:423 pisi/pxml/autoxml.py:433 +#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 msgid "autoxml.parse: String '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:443 pisi/pxml/autoxml.py:453 +#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 msgid "autoxml.read: File '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:461 +#: pisi/pxml/autoxml.py:467 msgid "autoxml.write: object validation has failed" msgstr "" -#: pisi/pxml/autoxml.py:469 +#: pisi/pxml/autoxml.py:475 msgid "autoxml.write: File encoding '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:519 +#: pisi/pxml/autoxml.py:525 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "" -#: pisi/pxml/autoxml.py:567 pisi/pxml/autoxml.py:578 +#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 msgid "Mandatory variable %s not available" msgstr "" -#: pisi/pxml/autoxml.py:648 +#: pisi/pxml/autoxml.py:654 msgid "Type mismatch: read text cannot be decoded" msgstr "" -#: pisi/pxml/autoxml.py:652 pisi/pxml/autoxml.py:661 +#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 msgid "Mandatory token %s not available" msgstr "" -#: pisi/pxml/autoxml.py:666 +#: pisi/pxml/autoxml.py:672 msgid "Type mismatch. Expected %s, got %s" msgstr "" -#: pisi/pxml/autoxml.py:696 pisi/pxml/autoxml.py:812 +#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 msgid "Type mismatch: DOM cannot be decoded" msgstr "" -#: pisi/pxml/autoxml.py:699 pisi/pxml/autoxml.py:715 pisi/pxml/autoxml.py:725 -#: pisi/pxml/autoxml.py:815 pisi/pxml/autoxml.py:829 pisi/pxml/autoxml.py:839 +#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 +#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 msgid "Mandatory argument not available" msgstr "" -#: pisi/pxml/autoxml.py:712 pisi/pxml/autoxml.py:826 +#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 msgid "Object cannot be encoded" msgstr "" -#: pisi/pxml/autoxml.py:737 +#: pisi/pxml/autoxml.py:743 msgid "List type must contain only one element" msgstr "" -#: pisi/pxml/autoxml.py:750 pisi/pxml/autoxml.py:771 +#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "" @@ -2590,65 +2597,47 @@ msgstr "" msgid "Updating environment..." msgstr "" -#: scripts/repostats.py:361 +#: scripts/repostats.py:226 msgid "" "Duplicate binary packages:\n" "%s\n" "%s\n" msgstr "" -#: scripts/repostats.py:366 -msgid "Unknown file type '%s' in package '%s'" -msgstr "" - -#: scripts/repostats.py:422 +#: scripts/repostats.py:301 msgid "" "Duplicate source packages:\n" "%s\n" "%s\n" msgstr "" -#: scripts/repostats.py:442 -msgid "Source package '%s' has wrong date format '%s'" -msgstr "" - -#: scripts/repostats.py:481 +#: scripts/repostats.py:371 msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" -#: scripts/repostats.py:564 +#: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" msgstr "" -#: scripts/repostats.py:642 +#: scripts/repostats.py:553 msgid "" "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" msgstr "" -#: scripts/repostats.py:643 +#: scripts/repostats.py:554 msgid "" "Dont generate the web site.\n" msgstr "" -#: scripts/repostats.py:664 +#: scripts/repostats.py:575 msgid "" "Scanning source repository...\n" msgstr "" -#: scripts/repostats.py:668 +#: scripts/repostats.py:579 msgid "" "Scanning binary packages...\n" msgstr "" -#: scripts/repostats.py:673 -msgid "" -"Encountered %d errors! Fix them immediately!\n" -msgstr "" - -#: scripts/repostats.py:681 -msgid "" -"These dependencies are not available in repository:\n" -msgstr "" - diff --git a/po/tr.po b/po/tr.po index 7c783e9c..241e26f7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,14 +1,15 @@ # translation of tr.po to # Eray Ozkural , 2005,2006. # Furkan Duman , 2006. -# Faik Uygur , 2006. +# Faik Uygur , 2006, 2007. +# Ahmet AYGÜN , 2006. # PiSi Translation -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. msgid "" msgstr "" "Project-Id-Version: tr\n" -"POT-Creation-Date: 2006-12-09 20:35+EET\n" -"PO-Revision-Date: 2006-12-09 20:40+0200\n" +"POT-Creation-Date: 2007-02-28 20:09+EET\n" +"PO-Revision-Date: 2007-02-28 20:11+0200\n" "Last-Translator: Faik Uygur \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -350,7 +351,7 @@ msgstr "Geri-iz:" msgid "Use --debug to see a traceback." msgstr "Bir geri-iz (traceback) görmek için lütfen --debug seçeneğini kullanın." -#: pisi/actionsapi/autotools.py:36 +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" "Please attach the config.log to your bug report:\n" "%s/config.log" @@ -360,8 +361,8 @@ msgstr "" # pisi/actionsapi/autotools.py:75 :85 #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/kde.py:65 pisi/actionsapi/perlmodules.py:54 -#: pisi/actionsapi/perlmodules.py:57 +#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Yapılandırma başarısızlığa uğradı." @@ -371,14 +372,16 @@ msgstr "Yapılandırma başarısızlığa uğradı." msgid "No configure script found." msgstr "Yapılandırma betiği bulunamadı." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/kde.py:72 -#: pisi/actionsapi/perlmodules.py:63 pisi/actionsapi/perlmodules.py:72 -#: pisi/actionsapi/pythonmodules.py:49 pisi/actionsapi/scons.py:39 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 msgid "Make failed." msgstr "İnşa başarısızlığa uğradı." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." @@ -386,7 +389,8 @@ msgstr "Kurulum başarısızlığa uğradı." # pisi/actionsapi/autotools.py:121 :129 #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 +#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Makefile bulunamadı." @@ -412,6 +416,11 @@ msgstr "automake çalıştırılamadı." msgid "Running autoheader failed." msgstr "autoheader çalıştırılamadı." +# pisi/actionsapi/autotools.py:77 :87 +#: pisi/actionsapi/cmaketools.py:69 +msgid "No configure script found for cmake." +msgstr "cmake için yapılandırma betiği bulunamadı." + #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" msgstr "Araç %s bulunamıyor" @@ -689,11 +698,11 @@ msgstr "Yeni orijinal versiyona yükseltiliyor" #: pisi/atomicoperations.py:211 msgid "Upgrading to new distribution release" -msgstr "Yeni dağıtım sürümüne yukseltiliyor" +msgstr "Yeni dağıtım sürümüne yükseltiliyor" #: pisi/atomicoperations.py:215 msgid "Upgrading to new distribution build" -msgstr "Yeni dağıtım inşasına yukseltiliyor" +msgstr "Yeni dağıtım inşasına yükseltiliyor" #: pisi/atomicoperations.py:225 msgid "Downgrade to old distribution release?" @@ -1331,7 +1340,7 @@ msgstr "Çomar yapılandırma aygıtını kullanma" #: pisi/cli/commands.py:535 msgid "Outputting binary packages in the package cache." -msgstr "İkili paketler paket cebine yazılıyor." +msgstr "İkili paketler paket önbelleğine yazılıyor." #: pisi/cli/commands.py:543 msgid "Abstract package operation command" @@ -2106,11 +2115,11 @@ msgstr "Kaldırma öncesi betikleri çağrılıyor" msgid "Unregistering comar scripts" msgstr "comar betikleri siliniyor" -#: pisi/component.py:97 pisi/component.py:103 +#: pisi/component.py:106 pisi/component.py:112 msgid "Component %s not found" msgstr "%s bileşeni bulunamadı" -#: pisi/component.py:199 pisi/component.py:225 +#: pisi/component.py:208 pisi/component.py:234 msgid "Information for component %s not available" msgstr "Bileşen %s için bilgi bulunamadı" @@ -2256,23 +2265,23 @@ msgstr "HATA: gpg --detach-sig %s çalışmadı" msgid "Encountered cycle %s" msgstr "Çember ile karşılaşıldı: %s" -#: pisi/index.py:92 -msgid "Adding %s to package index" -msgstr "%s paket indeksine ekleniyor" - -#: pisi/index.py:95 +#: pisi/index.py:96 msgid "Adding %s to component index" msgstr "%s bileşen indeksine ekleniyor" -#: pisi/index.py:113 +#: pisi/index.py:108 +msgid "Adding %s to package index" +msgstr "%s paket indeksine ekleniyor" + +#: pisi/index.py:122 msgid "Updating package database of %s" msgstr "%s paket veritabanı güncelleniyor" -#: pisi/index.py:141 +#: pisi/index.py:150 msgid "Package %s: metadata corrupt, skipping..." msgstr "Paket %s: metadata bozuk, atlanıyor..." -#: pisi/index.py:169 +#: pisi/index.py:178 msgid "Adding %s to source index" msgstr "%s kaynak indeksine ekleniyor" @@ -2487,7 +2496,7 @@ msgstr "Bu paketler yükseltilecektir: " #: pisi/operations.py:552 msgid "Dependency %s of %s cannot be satisfied" -msgstr "İnşa bağımlılığı %s, %s paketi için sağlanamadı" +msgstr "%s bağımlılığı, %s paketi için sağlanamadı" #: pisi/operations.py:553 msgid "Upgrade is not possible." @@ -2587,68 +2596,68 @@ msgstr "" "Etiket en azından şu andaki yerelleştirme seçenekleri (locale) için bir " "girdiye, o olmazsa bir Türkçe ya da İngilizce versiyona sahip olmalı" -#: pisi/pxml/autoxml.py:368 +#: pisi/pxml/autoxml.py:374 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' hatalar" -#: pisi/pxml/autoxml.py:423 pisi/pxml/autoxml.py:433 +#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.read: Dosya '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:443 pisi/pxml/autoxml.py:453 +#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Dosya '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:461 +#: pisi/pxml/autoxml.py:467 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: nesne doğrulaması başarısızlığa uğradı" -#: pisi/pxml/autoxml.py:469 +#: pisi/pxml/autoxml.py:475 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: Dosya biçimlendirmesi '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:519 +#: pisi/pxml/autoxml.py:525 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: tanınmayan im tipi %s" -#: pisi/pxml/autoxml.py:567 pisi/pxml/autoxml.py:578 +#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 msgid "Mandatory variable %s not available" msgstr "Gerekli değişken %s bulunamadı" -#: pisi/pxml/autoxml.py:648 +#: pisi/pxml/autoxml.py:654 msgid "Type mismatch: read text cannot be decoded" msgstr "Tip uyumsuzluğu: okunan metin çözülemedi" -#: pisi/pxml/autoxml.py:652 pisi/pxml/autoxml.py:661 +#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 msgid "Mandatory token %s not available" msgstr "Gerekli im %s bulunamadı" -#: pisi/pxml/autoxml.py:666 +#: pisi/pxml/autoxml.py:672 msgid "Type mismatch. Expected %s, got %s" msgstr "Tip uyumsuzluğu. %s beklerken, %s bulundu" # pisi/xmlfile.py:420 :521 -#: pisi/pxml/autoxml.py:696 pisi/pxml/autoxml.py:812 +#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 msgid "Type mismatch: DOM cannot be decoded" msgstr "Tip uyumsuzluğu: DOM okunamıyor" # pisi/xmlfile.py:392 :423 :439 :446 :524 :538 :545 -#: pisi/pxml/autoxml.py:699 pisi/pxml/autoxml.py:715 pisi/pxml/autoxml.py:725 -#: pisi/pxml/autoxml.py:815 pisi/pxml/autoxml.py:829 pisi/pxml/autoxml.py:839 +#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 +#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 msgid "Mandatory argument not available" msgstr "Gerekli argüman bulunamadı" # pisi/xmlfile.py:436 :535 -#: pisi/pxml/autoxml.py:712 pisi/pxml/autoxml.py:826 +#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 msgid "Object cannot be encoded" msgstr "Nesne kodlanamadı" -#: pisi/pxml/autoxml.py:737 +#: pisi/pxml/autoxml.py:743 msgid "List type must contain only one element" msgstr "List tipi sadece bir eleman içermeli" # pisi/xmlfile.py:470 :485 -#: pisi/pxml/autoxml.py:750 pisi/pxml/autoxml.py:771 +#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "Zorunlu \"%s\" listesi \"%s\" içinde yok." @@ -2792,7 +2801,7 @@ msgstr "objcopy (add-debuglink) komutu '%s' dosyası için çalışmadı!" msgid "Updating environment..." msgstr "Çevre güncelleniyor..." -#: scripts/repostats.py:361 +#: scripts/repostats.py:226 msgid "" "Duplicate binary packages:\n" "%s\n" @@ -2802,11 +2811,7 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:366 -msgid "Unknown file type '%s' in package '%s'" -msgstr "Bilinmeyen dosya tipi '%s', '%s' paketi içinde bulundu. " - -#: scripts/repostats.py:422 +#: scripts/repostats.py:301 msgid "" "Duplicate source packages:\n" "%s\n" @@ -2816,15 +2821,11 @@ msgstr "" "%s\n" "%s\n" -#: scripts/repostats.py:442 -msgid "Source package '%s' has wrong date format '%s'" -msgstr "Kaynak paketi '%s' yanlış tarih biçimlendirmesine sahip: '%s'" - -#: scripts/repostats.py:481 +#: scripts/repostats.py:371 msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" -#: scripts/repostats.py:564 +#: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" @@ -2832,27 +2833,19 @@ msgstr "" "'%s' ayrıştırılamıyor:\n" "'%s'\n" -#: scripts/repostats.py:642 +#: scripts/repostats.py:553 msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" msgstr "Kullanım: repostats.py [SEÇENEKLER] source-repo-path [ikili-depo-adresi]\n" -#: scripts/repostats.py:643 +#: scripts/repostats.py:554 msgid "Dont generate the web site.\n" msgstr "Web sayfasını oluşturma.\n" -#: scripts/repostats.py:664 +#: scripts/repostats.py:575 msgid "Scanning source repository...\n" msgstr "Kaynak deposu taranıyor...\n" -#: scripts/repostats.py:668 +#: scripts/repostats.py:579 msgid "Scanning binary packages...\n" msgstr "İkili dosyalar taranıyor...\n" -#: scripts/repostats.py:673 -msgid "Encountered %d errors! Fix them immediately!\n" -msgstr "%d hata ile karşılaşıldı. Lütfen bunları en kısa zamanda düzeltin.\n" - -#: scripts/repostats.py:681 -msgid "These dependencies are not available in repository:\n" -msgstr "Bağımlılığa neden olan bu paketler depoda bulunmuyor:\n" - From b508b05f55a14b7e5ca816b6dc2b72353175cf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 1 Mar 2007 11:52:24 +0000 Subject: [PATCH 019/212] sync --- pisi/actionsapi/cmaketools.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py index 5d3c8bac..2867d969 100644 --- a/pisi/actionsapi/cmaketools.py +++ b/pisi/actionsapi/cmaketools.py @@ -53,15 +53,10 @@ class RunTimeError(pisi.actionsapi.Error): self.value = value ctx.ui.error(value) -def configure(parameters = '', sourceDir = '.', installPrefix = '%s' % get.defaultprefixDIR()): +def configure(parameters = '', installPrefix = '/%s' % get.defaultprefixDIR(), sourceDir = '.'): '''configure source with given cmake parameters = "-DCMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS ... "''' if can_access_file(join_path(sourceDir, 'CMakeLists.txt')): - args = 'cmake \ - -DCMAKE_INSTALL_PREFIX=%s/%s \ - %s %s' % (get.installDIR(), - installPrefix, - parameters, - sourceDir) + args = 'cmake -DCMAKE_INSTALL_PREFIX=%s %s %s' % (installPrefix, parameters, sourceDir) if system(args): raise ConfigureError(_('Configure failed.')) From c08d07d658f9fae697e822c66edaf42c61fd0549 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 1 Mar 2007 21:13:37 +0000 Subject: [PATCH 020/212] * merge search db and code removal from trunk.. - update_db operation is now %40+ faster... - also search operations are faster... --- pisi/api.py | 41 +++++++----------- pisi/cli/commands.py | 10 +---- pisi/packagedb.py | 34 ++------------- pisi/search/__init__.py | 62 --------------------------- pisi/search/invertedindex.py | 83 ------------------------------------ pisi/search/preprocess.py | 30 ------------- pisi/search/tokenize.py | 32 -------------- 7 files changed, 20 insertions(+), 272 deletions(-) delete mode 100644 pisi/search/__init__.py delete mode 100644 pisi/search/invertedindex.py delete mode 100644 pisi/search/preprocess.py delete mode 100644 pisi/search/tokenize.py diff --git a/pisi/api.py b/pisi/api.py index 1a6b77d7..9bc3a31c 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -43,7 +43,6 @@ from pisi.atomicoperations import resurrect_package, build from pisi.metadata import MetaData from pisi.files import Files from pisi.file import File -import pisi.search import pisi.lockeddbshelve as shelve from pisi.version import Version @@ -113,7 +112,6 @@ def init(database = True, write = True, ctx.componentdb = pisi.component.ComponentDB() ctx.packagedb = packagedb.init_db() ctx.sourcedb = pisi.sourcedb.init() - pisi.search.init(['terms'], ['en', 'tr']) else: ctx.repodb = None ctx.installdb = None @@ -146,7 +144,6 @@ def finalize(): if ctx.sourcedb: pisi.sourcedb.finalize() ctx.sourcedb = None - pisi.search.finalize() if ctx.dbenv: ctx.dbenv.close() ctx.dbenv_lock.close() @@ -341,30 +338,22 @@ def info_name(package_name, installed=False): files = None return metadata, files -def search_package_names(query): - r = set() - packages = ctx.packagedb.list_packages() - for pkgname in packages: - if query in pkgname: - r.add(pkgname) - return r +def search_package_terms(terms, repo = pisi.itembyrepodb.all): -def search_package_terms(terms, lang = None, search_names = True, repo = pisi.itembyrepodb.all): - if not lang: - lang = pisi.pxml.autoxml.LocalText.get_lang() - r = pisi.search.query_terms('terms', lang, terms, repo = repo) - if search_names: - for term in terms: - r |= search_package_names(term) - return r + def search(package, term): + term = unicode(term).lower() + if term in unicode(package.name).lower() or \ + term in unicode(package.summary).lower() or \ + term in unicode(package.description).lower(): + return True -def search_package(query, lang = None, search_names = True, repo = pisi.itembyrepodb.all): - if not lang: - lang = pisi.pxml.autoxml.LocalText.get_lang() - r = pisi.search.query('terms', lang, query, repo = repo) - if search_names: - r |= search_package_names(query) - return r + found = [] + for name in ctx.packagedb.list_packages(repo): + pkg = ctx.packagedb.get_package(name, repo) + if terms == filter(lambda x:search(pkg, x), terms): + found.append(name) + + return found def check(package): md, files = info(package, True) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 53374e56..c25db05d 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1510,14 +1510,6 @@ in summary, description, and package name fields. default=False, help=_("Show details")) self.parser.add_option_group(group) - def get_lang(self): - lang = ctx.get_option('language') - if not lang: - lang = pisi.pxml.autoxml.LocalText.get_lang() - if not lang in ['en', 'tr']: - lang = 'en' - return lang - def run(self): self.init(database = True, write = False) @@ -1526,7 +1518,7 @@ in summary, description, and package name fields. self.help() return - r = pisi.api.search_package_terms(self.args, self.get_lang()) + r = pisi.api.search_package_terms(self.args) ctx.ui.info(_('%s packages found') % len(r)) ctx.config.options.short = not ctx.config.options.long diff --git a/pisi/packagedb.py b/pisi/packagedb.py index 736f6d5b..abc569fd 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -103,21 +103,7 @@ class PackageDB(object): self.dr.add_item(dep_name, [ (name, dep) ], repo, txn) # add component ctx.componentdb.add_package(package_info.partOf, package_info.name, repo, txn) - # index summary and description - search_keys = {} - for (lang, doc) in package_info.summary.iteritems(): - text = search_keys.get(lang, "") - text += " %s" % doc - search_keys[lang] = text - for (lang, doc) in package_info.description.iteritems(): - text = search_keys.get(lang, "") - text += " %s" % doc - search_keys[lang] = text - for lang in search_keys: - text = search_keys[lang] - # FIXME: other languages should be searchable too - if lang in ('en', 'tr'): - pisi.search.add_doc('terms', lang, package_info.name, doc, repo=repo, txn=txn) + ctx.txn_proc(proc, txn) def clear(self, txn = None): @@ -144,21 +130,9 @@ class PackageDB(object): # all the list members are removed. self.dr.remove_item(dep_name, repo, txn=txn) + # remove from component ctx.componentdb.remove_package(package_info.partOf, package_info.name, repo, txn) - search_keys = {} - for (lang, doc) in package_info.summary.iteritems(): - text = search_keys.get(lang, "") - text += " %s" % doc - search_keys[lang] = text - for (lang, doc) in package_info.description.iteritems(): - text = search_keys.get(lang, "") - text += " %s" % doc - search_keys[lang] = text - for lang in search_keys: - text = search_keys[lang] - # FIXME: other languages should be searchable too - if lang in ('en', 'tr'): - pisi.search.remove_doc('terms', lang, package_info.name, doc, repo=repo, txn=txn) + self.d.txn_proc(proc, txn) def remove_repo(self, repo, txn = None): diff --git a/pisi/search/__init__.py b/pisi/search/__init__.py deleted file mode 100644 index cf5a099b..00000000 --- a/pisi/search/__init__.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2005-2006, TUBITAK/UEKAE -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# Please read the COPYING file. -# - -import pisi -import pisi.context as ctx - -class Error(pisi.Error): - pass - -class Exception(pisi.Exception): - pass - -# API - -from invertedindex import InvertedIndex -import preprocess as p - -def init(ids, langs): - "initialize databases" - - assert type(ids)==type([]) - assert type(langs)==type([]) - - ctx.invidx = {} - for id in ids: - ctx.invidx[id] = {} - for lang in langs: - ctx.invidx[id][lang] = InvertedIndex(id, lang) - -def finalize(): - import pisi.context as ctx - - if ctx.invidx: - for id in ctx.invidx.iterkeys(): - for lang in ctx.invidx[id].iterkeys(): - ctx.invidx[id][lang].close() - ctx.invidx = {} - -def add_doc(id, lang, docid, str, repo = None, txn = None): - terms = p.preprocess(lang, str) - ctx.invidx[id][lang].add_doc(docid, terms, repo=repo, txn=txn) - -def remove_doc(id, lang, docid, str, repo = None, txn = None): - terms = p.preprocess(lang, str) - ctx.invidx[id][lang].remove_doc(docid, terms, repo = repo, txn = txn) - -def query_terms(id, lang, terms, repo = None, txn = None): - terms = p.normalize(lang, terms) - return ctx.invidx[id][lang].query(terms, repo = repo, txn = txn) - -def query(id, lang, str, repo = None, txn = None): - terms = p.preprocess(lang, str) - return query_terms(id, lang, terms, repo = repo, txn = txn) diff --git a/pisi/search/invertedindex.py b/pisi/search/invertedindex.py deleted file mode 100644 index b98158ec..00000000 --- a/pisi/search/invertedindex.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2005, TUBITAK/UEKAE -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# Please read the COPYING file. -# - -import types - -import pisi.lockeddbshelve as shelve -from pisi.itembyrepodb import ItemByRepoDB -import pisi.itembyrepodb as itembyrepodb - -class InvertedIndex(object): - """a database of term -> set of documents""" - - def __init__(self, id, lang): - self.d = ItemByRepoDB('ii-%s-%s' % (id, lang)) - - def close(self): - self.d.close() - - def has_term(self, term, repo = None, txn = None): - return self.d.has_key(shelve.LockedDBShelf.encodekey(term), repo=repo,txn=txn) - - def get_term(self, term, repo = None, txn = None): - """get set of doc ids given term""" - term = shelve.LockedDBShelf.encodekey(term) - def proc(txn): - if not self.has_term(term, repo=repo, txn=txn): - return set() - return self.d.get_item(term, repo=repo, txn=txn) - return self.d.txn_proc(proc, txn) - - def get_union_term(self, name, txn = None, repo = itembyrepodb.repos ): - """get a union of all repository terms, not just the first repo in order. - get only basic repo info from the first repo""" - name = shelve.LockedDBShelf.encodekey(name) - def proc(txn): - terms= set() - if self.d.d.has_key(name): - s = self.d.d.get(name, txn=txn) - for repostr in self.d.order(repo = repo): - if s.has_key(repostr): - terms |= s[repostr] - return terms - return self.d.txn_proc(proc, txn) - - def query(self, terms, repo = None, txn = None): - def proc(txn): - docs = [ self.get_union_term(x, repo=repo, txn=txn) for x in terms ] - if docs: - return reduce(lambda x,y: x.intersection(y), docs) - else: - return set() - return self.d.txn_proc(proc, txn) - - def list_terms(self, repo = None, txn= None): - return self.d.list(f, repo=repo, txn=txn) - - def add_doc(self, doc, terms, repo = None, txn = None): - def f(txn): - for term_i in terms: - term_i = shelve.LockedDBShelf.encodekey(term_i) - term_i_docs = self.get_term(term_i, repo=repo, txn=txn) - term_i_docs.add(doc) - self.d.add_item(term_i, term_i_docs, repo=repo, txn=txn) # update - return self.d.txn_proc(f, txn) - - def remove_doc(self, doc, terms,repo=None, txn=None): - def f(txn): - for term_i in terms: - term_i = shelve.LockedDBShelf.encodekey(term_i) - term_i_docs = self.get_term(term_i,repo=repo, txn=txn) - if doc in term_i_docs: - term_i_docs.remove(doc) - self.d.add_item(term_i, term_i_docs, repo=repo, txn=txn) # update - return self.d.txn_proc(f, txn) diff --git a/pisi/search/preprocess.py b/pisi/search/preprocess.py deleted file mode 100644 index 97964091..00000000 --- a/pisi/search/preprocess.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2005-2006, TUBITAK/UEKAE -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# Please read the COPYING file. -# - -import tokenize -import locale - -def normalize(lang, terms): - if lang == "tr": - old_locale = locale.setlocale(locale.LC_CTYPE) - locale.setlocale(locale.LC_CTYPE, "tr_TR.UTF-8") - terms = map(lambda x: unicode(x).lower(), terms) - if lang == "tr": - locale.setlocale(locale.LC_CTYPE, old_locale) - unique_terms = set() - for term in terms: - unique_terms.add(unicode(term)) - return list(unique_terms) - -def preprocess(lang, str): - terms = tokenize.tokenize(lang, str) - return normalize(lang, terms) diff --git a/pisi/search/tokenize.py b/pisi/search/tokenize.py deleted file mode 100644 index 0023e45a..00000000 --- a/pisi/search/tokenize.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2005-2006, TUBITAK/UEKAE -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# Please read the COPYING file. -# - -import string - -def tokenize(lang, str): - if type(str) != type(unicode()): - str = unicode(str) - sepchars = string.whitespace + string.punctuation - tokens = [] - token = unicode() - for x in str: - if x in sepchars: - if len(token) > 0: - tokens.append(token) - token = unicode() - else: - token += x - - if token: - tokens.append(token) - - return tokens From eb21a6076abb711c10919a7f637d844906f20faf Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 1 Mar 2007 21:23:14 +0000 Subject: [PATCH 021/212] * missed again.. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ec23d5dc..33512653 100755 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ setup(name="pisi", author_email="pisi@pardus.org.tr", url="http://www.pardus.org.tr/eng/pisi/", package_dir = {'': ''}, - packages = ['pisi', 'pisi.cli', 'pisi.actionsapi', 'pisi.pxml', 'pisi.search', 'pisi.scenarioapi'], + packages = ['pisi', 'pisi.cli', 'pisi.actionsapi', 'pisi.pxml', 'pisi.scenarioapi'], scripts = ['pisi-cli', 'scripts/lspisi', 'scripts/unpisi', 'scripts/check-newconfigs.py', 'scripts/revdep-rebuild'], cmdclass = {'install' : Install} ) From e12a59e6feb24033650c73ec58822336ddfb77af Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 13:42:29 +0000 Subject: [PATCH 022/212] * build operation was not using comar, so installed operations to satisfy build dependencies was not registering comar scripts. a report by erdinc and a fix by caglar.. --- pisi/cli/commands.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index c25db05d..88e1f249 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -422,6 +422,7 @@ to be downloaded from a repository containing sources. def __init__(self, args): super(Build, self).__init__(args) + self.comar = True name = ("build", "bi") From 42d5dd7c0e618e23b553159ada83c826799a6857 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 14:05:59 +0000 Subject: [PATCH 023/212] * translations merge --- po/de.po | 373 +++++++++++++++++++++++--------------------------- po/es.po | 388 ++++++++++++++++++++++++---------------------------- po/nl.po | 361 +++++++++++++++++++++++------------------------- po/pisi.pot | 304 ++++++++++++++++++++-------------------- po/tr.po | 308 ++++++++++++++++++++--------------------- 5 files changed, 827 insertions(+), 907 deletions(-) diff --git a/po/de.po b/po/de.po index a0e92322..e1ea3cfa 100644 --- a/po/de.po +++ b/po/de.po @@ -1,15 +1,15 @@ -# translation of de.po to Deutsch +# translation of de.po to # Copyright (C) YEAR ORGANIZATION # # Mustafa M. Ölcerman , 2006. +# Faik Uygur , 2007. msgid "" msgstr "" "Project-Id-Version: de\n" -"POT-Creation-Date: 2007-02-28 20:09+EET\n" -"PO-Revision-Date: 2006-12-11 21:59+0200\n" -"Last-Translator: Mustafa M. Ölcerman \n" -"Language-Team: Deutsch \n" +"POT-Creation-Date: 2007-03-02 16:01+EET\n" +"PO-Revision-Date: 2007-03-02 16:05+0200\n" +"Last-Translator: Faik Uygur \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -516,7 +516,7 @@ msgstr "" "%s/config.log" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Configure fehlgeschlagen." @@ -526,7 +526,7 @@ msgstr "Configure fehlgeschlagen." msgid "No configure script found." msgstr "Kein configure-Skript gefunden." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 #: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 #: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 #: pisi/actionsapi/scons.py:39 @@ -534,15 +534,15 @@ msgid "Make failed." msgstr "Make fehlgeschlagen." #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 -#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "Installation fehlgeschlagen." #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 -#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Keine Make-Datei gefunden." @@ -566,10 +566,9 @@ msgstr "Ausführen von automake fehlgeschlagen." msgid "Running autoheader failed." msgstr "Ausführen von autoheader fehlgeschlagen." -#: pisi/actionsapi/cmaketools.py:69 -#, fuzzy +#: pisi/actionsapi/cmaketools.py:64 msgid "No configure script found for cmake." -msgstr "Kein configure-Skript gefunden." +msgstr "Kein cmake configure-Skript gefunden." #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" @@ -707,19 +706,19 @@ msgstr "ActionsAPI [copytree]: Verzeichnis %s existiert nicht." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Zugriff verweigert: %s" -#: pisi/api.py:302 pisi/comariface.py:30 +#: pisi/api.py:299 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "Comar-Paket wurde nicht vollständig installiert" -#: pisi/api.py:314 +#: pisi/api.py:311 msgid "File %s not found" msgstr "Datei %s nicht gefunden" -#: pisi/api.py:375 +#: pisi/api.py:364 msgid "Checking /%s " msgstr "/%s wird überprüft" -#: pisi/api.py:379 +#: pisi/api.py:368 msgid "" "\n" "Corrupt file: %s" @@ -727,63 +726,63 @@ msgstr "" "\n" "Datei korrupt: %s" -#: pisi/api.py:381 pisi/cli/commands.py:966 +#: pisi/api.py:370 pisi/cli/commands.py:967 msgid "OK" msgstr "OK" -#: pisi/api.py:394 +#: pisi/api.py:383 msgid "* Building index of PiSi files under %s" msgstr "* Index von PiSi-Dateien unteeer %s werden konstruiert" -#: pisi/api.py:401 +#: pisi/api.py:390 msgid "* Index file written" msgstr "* Index-Datei geschrieben" -#: pisi/api.py:405 +#: pisi/api.py:394 msgid "Repo %s already present." msgstr "Depo %s bereits vorhanden" -#: pisi/api.py:409 +#: pisi/api.py:398 msgid "Repo %s added to system." msgstr "Depo %s in das System hinzugefügt" -#: pisi/api.py:415 +#: pisi/api.py:404 msgid "Repo %s removed from system." msgstr "Depo %s vom System entfernt." -#: pisi/api.py:417 +#: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." msgstr "Depot %s existiert nicht. Kann nicht entfernt werden." -#: pisi/api.py:424 +#: pisi/api.py:413 msgid "* Updating repository: %s" msgstr "* Depot wird aktualisiert: %s" -#: pisi/api.py:432 +#: pisi/api.py:421 msgid "No updates available for repository %s." msgstr "Es sind keine Updates für das Depot %s verfügbar" -#: pisi/api.py:434 +#: pisi/api.py:423 msgid "Updating database at any rate as requested" msgstr "Datenbank wird wunschgemäss auf jeden Fall aktualisiert" -#: pisi/api.py:445 +#: pisi/api.py:434 msgid "* Package database updated." msgstr "* Paket-Datenbank aktualisiert." -#: pisi/api.py:447 pisi/api.py:472 +#: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." msgstr "Kein %s genanntes Depot gefunden." -#: pisi/api.py:455 +#: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " msgstr "* '%s' genanntes Depo wird erneuert... " -#: pisi/api.py:468 +#: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" msgstr "Ein-/Ausgabe Fehler während des Lesen's %s: %s" -#: pisi/api.py:525 +#: pisi/api.py:514 msgid "Rebuilding package database" msgstr "Paket-Datenbank wird erneut eingerichtet" @@ -898,8 +897,7 @@ msgid "Not removing conflicted file : %s" msgstr "Konfliktierende Datei wird nicht entfernt: %s" #: pisi/atomicoperations.py:474 -msgid "" -"Installed file %s is not exists on system [Probably you manually deleted]" +msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Installierte Datei %s existiert nicht in dem System [ist wahrscheinlich per " "Hand gelöscht worden]" @@ -946,8 +944,7 @@ msgstr "PiSi Quell-Paket wird konstruiert: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "" -"IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." +msgstr "IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." #: pisi/build.py:234 msgid "CCache detected..." @@ -1014,8 +1011,7 @@ msgid "unable to call function from actions: %s" msgstr "nicht in der Lage, die Funktion vom Vorgang aufzurufen: %s" #: pisi/build.py:433 -msgid "" -"Safety switch: following extra packages in system.devel will be installed: " +msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Sicherheitsschalter: Folgende extra Pakete in system.devel werden " "installiert: " @@ -1026,8 +1022,7 @@ msgstr "Sicherheitsschalter: system.devel ist bereits installiert" #: pisi/build.py:440 msgid "Safety switch: the component system.devel cannot be found" -msgstr "" -"Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" +msgstr "Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" #: pisi/build.py:449 msgid "Unsatisfied Build Dependencies:" @@ -1127,8 +1122,7 @@ msgstr "Verlassene Dateien im Installationsverzeichnis (%s):" # gesammelt hört sich komisch an #: pisi/build.py:887 -msgid "" -"All of the files under the install dir (%s) has been collected by package(s)" +msgid "All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Alle Dateien unter Installationsierzeichnis (%s) wurden von den Paketen " "gesammelt" @@ -1389,46 +1383,45 @@ msgstr "" "Eine andere Möglichkeit ist die Angabe des Namens eines Quellpaketes\n" "aus einem Depot, welches Quellcode enthält.\n" -#: pisi/cli/commands.py:433 +#: pisi/cli/commands.py:434 msgid "build options" msgstr "Build-Optionen" -#: pisi/cli/commands.py:441 +#: pisi/cli/commands.py:442 msgid "Output directory for produced packages" msgstr "Zielverzeichnis für erzeugte Pakete" -#: pisi/cli/commands.py:444 +#: pisi/cli/commands.py:445 msgid "Bypass errors from ActionsAPI" msgstr "Fehler von ActionsAPI umgehen" -#: pisi/cli/commands.py:446 pisi/cli/commands.py:554 +#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 msgid "Bypass safety switch" msgstr "Sicherheitsschalter umgehen" -#: pisi/cli/commands.py:448 +#: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Eine statisches Paket mit ar Dateien erstellen" -#: pisi/cli/commands.py:450 -msgid "" -"Do not install build dependencies, fail if a build dependency is present" +#: pisi/cli/commands.py:451 +msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "" "Build - Abhängigkeiten nicht installieren, Fehler bei Anwesenheit einer " "Build-Abhängigkeit" -#: pisi/cli/commands.py:452 +#: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" msgstr "PiSi binäre Paket-Formate: '1.0'; '1.1' (Standard)" -#: pisi/cli/commands.py:455 +#: pisi/cli/commands.py:456 msgid "build steps" msgstr "konstruier Steps" -#: pisi/cli/commands.py:457 +#: pisi/cli/commands.py:458 msgid "Break build after fetching the source archive" msgstr "Build abbrechen, nach Kopie des Quellverzeichnisses" -#: pisi/cli/commands.py:459 +#: pisi/cli/commands.py:460 msgid "" "Break build after unpacking the source archive, checking sha1sum and " "applying patches" @@ -1436,35 +1429,35 @@ msgstr "" "Build abbrechen, nach entpacken der Quelldatei, prüfen der sha1sum und " "anwenden der Patches." -#: pisi/cli/commands.py:461 +#: pisi/cli/commands.py:462 msgid "Break build after running configure step" msgstr "Konstruktion nach dem Konfigurations-Step abbrechen" -#: pisi/cli/commands.py:463 +#: pisi/cli/commands.py:464 msgid "Break build after running compile step" msgstr "Konstruktion nach dem Kompilierungs-Step abbrechen" -#: pisi/cli/commands.py:465 +#: pisi/cli/commands.py:466 msgid "Break build after running install step" msgstr "Konstruktion nach dem Installations-Step abbrechen" -#: pisi/cli/commands.py:467 +#: pisi/cli/commands.py:468 msgid "create PiSi package" msgstr "PiSi Paket erstellen" -#: pisi/cli/commands.py:481 +#: pisi/cli/commands.py:482 msgid "package_format must be one of %s " msgstr "Paket_format muss von %s sein" -#: pisi/cli/commands.py:484 pisi/cli/commands.py:533 +#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 msgid "Output directory: %s" msgstr "Ausgabe-Verzeichnis: %s" -#: pisi/cli/commands.py:486 +#: pisi/cli/commands.py:487 msgid "Outputting packages in the working directory." msgstr "Pakete werden in das Arbeitsverzeichnis ausgegeben." -#: pisi/cli/commands.py:497 +#: pisi/cli/commands.py:498 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1484,35 +1477,35 @@ msgstr "" "\n" "Sie können auch den Namen von der Komponente angeben.\n" -#: pisi/cli/commands.py:516 +#: pisi/cli/commands.py:517 msgid "emerge options" msgstr "emerge Optionen" -#: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 +#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 msgid "Ignore file conflicts" msgstr "Datei-Konflikte ignorieren" -#: pisi/cli/commands.py:521 pisi/cli/commands.py:594 pisi/cli/commands.py:658 +#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 msgid "Ignore package conflicts" msgstr "Paket-Konflikte ignorieren" -#: pisi/cli/commands.py:523 pisi/cli/commands.py:552 +#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 msgid "Bypass comar configuration agent" msgstr "Comar Konfigurations-Agent umgehen" -#: pisi/cli/commands.py:535 +#: pisi/cli/commands.py:536 msgid "Outputting binary packages in the package cache." msgstr "Sende binäres Paket in den Zielcache." -#: pisi/cli/commands.py:543 +#: pisi/cli/commands.py:544 msgid "Abstract package operation command" msgstr "Abstrakter Befehl für Paketoperation" -#: pisi/cli/commands.py:556 +#: pisi/cli/commands.py:557 msgid "Do not perform any action, just show what would be done" msgstr "Nicht machen, nur zeigen was gemacht würde" -#: pisi/cli/commands.py:567 +#: pisi/cli/commands.py:568 msgid "" "Install PiSi packages\n" "\n" @@ -1534,23 +1527,23 @@ msgstr "" "Es können auch Komponenten statt Paketnamen angegeben werden, die zu\n" "Paketnamen expandiert werden.\n" -#: pisi/cli/commands.py:585 +#: pisi/cli/commands.py:586 msgid "install options" msgstr "Installier Optionen" -#: pisi/cli/commands.py:590 +#: pisi/cli/commands.py:591 msgid "Reinstall already installed packages" msgstr "Bereits installierte Pakete erneut installieren." -#: pisi/cli/commands.py:596 +#: pisi/cli/commands.py:597 msgid "Install component's and recursive components' packages" msgstr "Komponente installieren und Pakete der Komponenten rekursivieren" -#: pisi/cli/commands.py:598 pisi/cli/commands.py:662 +#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 msgid "Fetch upgrades but do not install." msgstr "Upgrades abrufen aber nicht installieren" -#: pisi/cli/commands.py:621 +#: pisi/cli/commands.py:622 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1586,25 +1579,25 @@ msgstr "" "Man kann statt Paketnamen auch Komponenten angeben, die\n" "zu Paketnamen erweitert werden.\n" -#: pisi/cli/commands.py:647 +#: pisi/cli/commands.py:648 msgid "upgrade options" msgstr "Optionen verbessern" -#: pisi/cli/commands.py:652 +#: pisi/cli/commands.py:653 msgid "Security related package upgrades only" msgstr "Nur sicherheitsrelevante Aktualisierungen" -#: pisi/cli/commands.py:654 +#: pisi/cli/commands.py:655 msgid "Do not update repositories" msgstr "Quellen nicht aktualisieren" -#: pisi/cli/commands.py:660 +#: pisi/cli/commands.py:661 msgid "Upgrade component's and recursive components' packages" msgstr "" "Upgrade für die Komponente durchführen und Pakete der Komponente " "rekursivieren" -#: pisi/cli/commands.py:664 +#: pisi/cli/commands.py:665 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1612,7 +1605,7 @@ msgstr "" "Beim Upgrade des Systemes, der Pakete und Komponenten mit gleichem " "Basisnamen ignorieren." -#: pisi/cli/commands.py:666 +#: pisi/cli/commands.py:667 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1620,15 +1613,15 @@ msgstr "" "Beim Upgrade des Systemes, der Pakete und Komponenten ignorieren, deren " "Basisnamen in der Datei enthalten ist." -#: pisi/cli/commands.py:706 +#: pisi/cli/commands.py:707 msgid "Updating repositories" msgstr "Depots-Upgrade wird durchgeführt" -#: pisi/cli/commands.py:711 +#: pisi/cli/commands.py:712 msgid "Will not update repositories" msgstr "Depots werden nicht aktualisiert" -#: pisi/cli/commands.py:733 +#: pisi/cli/commands.py:734 msgid "" "Remove PiSi packages\n" "\n" @@ -1648,15 +1641,15 @@ msgstr "" "Es Kann statt der Paketnamen auch die Komponenten angegeben werden, die\n" "zu den entsprechenden Paketnamen ergänzt werden.\n" -#: pisi/cli/commands.py:750 +#: pisi/cli/commands.py:751 msgid "remove options" msgstr "Optionen entfernen" -#: pisi/cli/commands.py:753 +#: pisi/cli/commands.py:754 msgid "Remove component's and recursive components' packages" msgstr "Komponente entfernen und Pakete der Komponente rekursivieren" -#: pisi/cli/commands.py:775 +#: pisi/cli/commands.py:776 msgid "" "Configure pending packages\n" "\n" @@ -1672,11 +1665,11 @@ msgstr "" "of packages waiting to be configured. This command\n" "configures those packages.\n" -#: pisi/cli/commands.py:791 +#: pisi/cli/commands.py:792 msgid "configure-pending options" msgstr "Optionen configure-pending" -#: pisi/cli/commands.py:803 +#: pisi/cli/commands.py:804 msgid "" "Display package information\n" "\n" @@ -1690,63 +1683,63 @@ msgstr "" "\n" " ist ein Paketname oder eine .pisi Datei,\n" -#: pisi/cli/commands.py:818 +#: pisi/cli/commands.py:819 msgid "info options" msgstr "Info Optionen" -#: pisi/cli/commands.py:825 +#: pisi/cli/commands.py:826 msgid "Show a list of package files." msgstr "Liste der Paket-Dateien anzeigen." -#: pisi/cli/commands.py:827 +#: pisi/cli/commands.py:828 msgid "Info about the given component" msgstr "Info über die angegebene Komponente" -#: pisi/cli/commands.py:830 +#: pisi/cli/commands.py:831 msgid "Show only paths." msgstr "Nur Pfad anzeigen." -#: pisi/cli/commands.py:832 +#: pisi/cli/commands.py:833 msgid "Do not show details" msgstr "Details nicht anzeigen" -#: pisi/cli/commands.py:834 +#: pisi/cli/commands.py:835 msgid "Output in xml format" msgstr "Ausgabe in xml-Format" -#: pisi/cli/commands.py:880 +#: pisi/cli/commands.py:881 msgid "Package file: %s" msgstr "Paket-Datei: %s" -#: pisi/cli/commands.py:886 +#: pisi/cli/commands.py:887 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:888 +#: pisi/cli/commands.py:889 msgid "Installed package:" msgstr "Installierte Pakete:" -#: pisi/cli/commands.py:894 +#: pisi/cli/commands.py:895 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:896 +#: pisi/cli/commands.py:897 msgid "Package found in repository:" msgstr "Paket im Depot gefunden:" -#: pisi/cli/commands.py:900 +#: pisi/cli/commands.py:901 msgid "%s is not found in repositories" msgstr "%s wurde in den Depots nicht gefunden" -#: pisi/cli/commands.py:903 +#: pisi/cli/commands.py:904 msgid "%s is not installed" msgstr "%s ist nicht installiert worden" -#: pisi/cli/commands.py:916 +#: pisi/cli/commands.py:917 msgid "Reverse Dependencies:" msgstr "Rückabhängigkeiten:" -#: pisi/cli/commands.py:919 +#: pisi/cli/commands.py:920 msgid "" "\n" "Files:" @@ -1754,11 +1747,11 @@ msgstr "" "\n" "Dateien:" -#: pisi/cli/commands.py:927 +#: pisi/cli/commands.py:928 msgid "File information not available" msgstr "Datei-Informationen nicht vorhanden" -#: pisi/cli/commands.py:933 +#: pisi/cli/commands.py:934 msgid "" "Verify installation\n" "\n" @@ -1786,15 +1779,15 @@ msgstr "" "Wenn kein Paketname angegeben wird, werden alle installierten Pakete " "überprüft.\n" -#: pisi/cli/commands.py:957 +#: pisi/cli/commands.py:958 msgid "Checking all installed packages" msgstr "Prüfe alle installierten Pakete" -#: pisi/cli/commands.py:960 +#: pisi/cli/commands.py:961 msgid "* Checking %s... " msgstr "* %s wird überprüft... " -#: pisi/cli/commands.py:964 +#: pisi/cli/commands.py:965 msgid "" "\n" "Package %s is corrupt." @@ -1802,11 +1795,11 @@ msgstr "" "\n" "Paket %s ist korrupt." -#: pisi/cli/commands.py:968 +#: pisi/cli/commands.py:969 msgid "Package %s not installed" msgstr "Paket %s nicht installiert" -#: pisi/cli/commands.py:973 +#: pisi/cli/commands.py:974 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1833,31 +1826,31 @@ msgstr "" "arbeiten, aber\n" "er setzt dann alles in eine einzelne Index-Datei.\n" -#: pisi/cli/commands.py:994 +#: pisi/cli/commands.py:995 msgid "index options" msgstr "Index Optionen" -#: pisi/cli/commands.py:998 +#: pisi/cli/commands.py:999 msgid "Store absolute links for indexed files." msgstr "Absolute Links für indizierte Dateien speichern." -#: pisi/cli/commands.py:1001 +#: pisi/cli/commands.py:1002 msgid "Index output file" msgstr "Ausgabe-Datei indizieren" -#: pisi/cli/commands.py:1004 +#: pisi/cli/commands.py:1005 msgid "Do not index PiSi spec files." msgstr "PiSi spezifierte Dateien nicht indizieren." -#: pisi/cli/commands.py:1007 +#: pisi/cli/commands.py:1008 msgid "Do not sign index." msgstr "Index nicht signieren." -#: pisi/cli/commands.py:1020 +#: pisi/cli/commands.py:1021 msgid "Indexing current directory." msgstr "Aktuelles Verzeichnis wird indiziert" -#: pisi/cli/commands.py:1028 +#: pisi/cli/commands.py:1029 msgid "" "Print the list of all installed packages\n" "\n" @@ -1867,31 +1860,29 @@ msgstr "" "\n" "Verwendung: list-installed\n" -#: pisi/cli/commands.py:1042 +#: pisi/cli/commands.py:1043 msgid "list-installed options" msgstr "Optionen list-installed " -#: pisi/cli/commands.py:1045 pisi/cli/commands.py:1278 -#: pisi/cli/commands.py:1342 pisi/cli/commands.py:1381 -#: pisi/cli/commands.py:1421 pisi/cli/commands.py:1555 +#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 +#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 +#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 msgid "Show in long format" msgstr "Langes Format anzeigen" -#: pisi/cli/commands.py:1047 +#: pisi/cli/commands.py:1048 msgid "List installed packages under given component" msgstr "Installierte Pakete unter angegebenem Komponent auflisten" -#: pisi/cli/commands.py:1049 pisi/cli/commands.py:1425 +#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 msgid "Show detailed install info" msgstr "Detaillierte Installationsinfo anzeigen" -#: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 -msgid "" -"Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "" -"Paketname |St| Version| Rel.| Build| Distro| Datum" +#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +msgid "Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "Paketname |St| Version| Rel.| Build| Distro| Datum" -#: pisi/cli/commands.py:1081 +#: pisi/cli/commands.py:1082 msgid "" "Rebuild Databases\n" "\n" @@ -1911,19 +1902,19 @@ msgstr "" "Wenn die Paketnamen angegeben werden, sollten sie den Paketverzeichnisnamen\n" "unter /var/lib/pisi sein\n" -#: pisi/cli/commands.py:1099 +#: pisi/cli/commands.py:1100 msgid "rebuild-db options" msgstr "Optionen rebuild-db" -#: pisi/cli/commands.py:1102 +#: pisi/cli/commands.py:1103 msgid "Rebuild files database" msgstr "Rekonstruiere Datenbank der Dateien" -#: pisi/cli/commands.py:1113 +#: pisi/cli/commands.py:1114 msgid "Rebuild PiSi databases?" msgstr "PiSi Datenbank rekonstruieren ?" -#: pisi/cli/commands.py:1120 +#: pisi/cli/commands.py:1121 msgid "" "Update repository databases\n" "\n" @@ -1943,15 +1934,15 @@ msgstr "" "Synchronsiert die PiSi Datenbank mit dem aktuellen Depot.\n" "Wenn kein Depot angegeben wird, werden alle Depots aktualisiert.\n" -#: pisi/cli/commands.py:1138 +#: pisi/cli/commands.py:1139 msgid "update-repo options" msgstr "Optionen update-repo" -#: pisi/cli/commands.py:1142 +#: pisi/cli/commands.py:1143 msgid "Update database in any case" msgstr "Datenbank auf jeden Fall aktualisieren" -#: pisi/cli/commands.py:1160 +#: pisi/cli/commands.py:1161 msgid "" "Add a repository\n" "\n" @@ -1978,23 +1969,23 @@ msgstr "" "Anm.: Momentan werden nur lokale Dateien (z.B., /a/b/c) und http:// URIs " "unterstützt\n" -#: pisi/cli/commands.py:1180 +#: pisi/cli/commands.py:1181 msgid "add-repo options" msgstr "Optionen add-repo " -#: pisi/cli/commands.py:1183 +#: pisi/cli/commands.py:1184 msgid "Add repository at given position (0 is first)" msgstr "Depot in angegebener Positioin hinzufügen (0 ist erste)" -#: pisi/cli/commands.py:1197 +#: pisi/cli/commands.py:1198 msgid "Update PiSi database for repository %s?" msgstr "PiSi Datenbank für Depot %s aktualisieren ?" -#: pisi/cli/commands.py:1201 +#: pisi/cli/commands.py:1202 msgid "%s repository could not be reached. Removing %s from system." msgstr "Depot %s konnte nicht kontaktiert werden. Entferne %s vom System." -#: pisi/cli/commands.py:1210 +#: pisi/cli/commands.py:1211 msgid "" "Remove repositories\n" "\n" @@ -2008,7 +1999,7 @@ msgstr "" "\n" "Entfernt die gesamte Information der Depots vom System.\n" -#: pisi/cli/commands.py:1236 +#: pisi/cli/commands.py:1237 msgid "" "List repositories\n" "\n" @@ -2022,7 +2013,7 @@ msgstr "" "\n" "Listet die momentan beobachteten Depots.\n" -#: pisi/cli/commands.py:1259 +#: pisi/cli/commands.py:1260 msgid "" "List available packages in the repositories\n" "\n" @@ -2040,27 +2031,27 @@ msgstr "" "Wenn kein Depot angegeben wird, werden in der Liste die Pakete\n" "aller Depots ausgegeben.\n" -#: pisi/cli/commands.py:1276 +#: pisi/cli/commands.py:1277 msgid "list-available options" msgstr "Optionen list-available" -#: pisi/cli/commands.py:1280 +#: pisi/cli/commands.py:1281 msgid "List available packages under given component" msgstr "Listet vorhandene Pakete unter einer gegebenen Komponente" -#: pisi/cli/commands.py:1282 +#: pisi/cli/commands.py:1283 msgid "Show uninstalled packages only" msgstr "Nur installierte Pakete anzeigen" -#: pisi/cli/commands.py:1290 +#: pisi/cli/commands.py:1291 msgid "Installed packages are shown in this color" msgstr "Installierte Pakete werden in dieser Farbe dargestellt" -#: pisi/cli/commands.py:1298 +#: pisi/cli/commands.py:1299 msgid "Repository : %s\n" msgstr "Quelle : %s\n" -#: pisi/cli/commands.py:1325 +#: pisi/cli/commands.py:1326 msgid "" "List available components\n" "\n" @@ -2076,11 +2067,11 @@ msgstr "" "Gieine kurze liste der PiSi-Komponenten in den \n" "Depots.\n" -#: pisi/cli/commands.py:1340 +#: pisi/cli/commands.py:1341 msgid "list-components options" msgstr "optionen list-components " -#: pisi/cli/commands.py:1365 +#: pisi/cli/commands.py:1366 msgid "" "List available sources\n" "\n" @@ -2094,11 +2085,11 @@ msgstr "" "\n" "Gives a brief list of sources published in the repositories.\n" -#: pisi/cli/commands.py:1379 +#: pisi/cli/commands.py:1380 msgid "list-sources options" msgstr "Optionen list-sources" -#: pisi/cli/commands.py:1404 +#: pisi/cli/commands.py:1405 msgid "" "List packages to be upgraded\n" "\n" @@ -2112,19 +2103,19 @@ msgstr "" "\n" "Listet die Pakete die aktualisiert werden.\n" -#: pisi/cli/commands.py:1418 +#: pisi/cli/commands.py:1419 msgid "list-upgrades options" msgstr "liste -Upgrades Optionen auf" -#: pisi/cli/commands.py:1423 +#: pisi/cli/commands.py:1424 msgid "List upgradable packages under given component" msgstr "Listet aktualisierbare Pakete unter der angegebenen Komponente" -#: pisi/cli/commands.py:1440 pisi/operations.py:466 +#: pisi/cli/commands.py:1441 pisi/operations.py:466 msgid "No packages to upgrade." msgstr "Es gibt keine Pakete zu aktualisieren." -#: pisi/cli/commands.py:1460 +#: pisi/cli/commands.py:1461 msgid "" "List pending packages\n" "\n" @@ -2134,11 +2125,11 @@ msgstr "" "\n" "Listet Pakete die noch zu konfigurieren sind.\n" -#: pisi/cli/commands.py:1482 +#: pisi/cli/commands.py:1483 msgid "There are no packages waiting to be configured" msgstr "Es sind keine Pakete da, die auf die Konfiguration warten" -#: pisi/cli/commands.py:1487 +#: pisi/cli/commands.py:1488 msgid "" "Search packages\n" "\n" @@ -2154,23 +2145,23 @@ msgstr "" "Sucht Pakete die die angegebenen Suchworte in den Feldern\n" "Zusammenfassung, Beschreibung oder Paketname enthalten.\n" -#: pisi/cli/commands.py:1502 +#: pisi/cli/commands.py:1503 msgid "search options" msgstr "Optionen suchen" -#: pisi/cli/commands.py:1505 +#: pisi/cli/commands.py:1506 msgid "Set search language" msgstr "Sprache für Suchfunktion einrichten" -#: pisi/cli/commands.py:1510 +#: pisi/cli/commands.py:1511 msgid "Show details" msgstr "Details anzeigen" -#: pisi/cli/commands.py:1530 +#: pisi/cli/commands.py:1523 msgid "%s packages found" msgstr "%s Pakete gefunden" -#: pisi/cli/commands.py:1539 +#: pisi/cli/commands.py:1532 msgid "" "Search for a file\n" "\n" @@ -2184,35 +2175,35 @@ msgstr "" "\n" "Sucht das installierte Paket welches die angegebene Datei enthält.\n" -#: pisi/cli/commands.py:1553 +#: pisi/cli/commands.py:1546 msgid "search-file options" msgstr "Optionen search-file" -#: pisi/cli/commands.py:1557 +#: pisi/cli/commands.py:1550 msgid "Fuzzy search" msgstr "Fuzzy Suche" -#: pisi/cli/commands.py:1559 +#: pisi/cli/commands.py:1552 msgid "Show only package name" msgstr "Nur Paketnamen anzeigen" -#: pisi/cli/commands.py:1580 +#: pisi/cli/commands.py:1573 msgid "Package %s has file %s" msgstr "Paket %s hat Datei %s" -#: pisi/cli/commands.py:1582 +#: pisi/cli/commands.py:1575 msgid "Type: %s, Hash: %s" msgstr "Typ: %s, Hash: %s" -#: pisi/cli/commands.py:1585 +#: pisi/cli/commands.py:1578 msgid "Path '%s' does not belong to an installed package" msgstr "Dateipfad '%s' gehört zu keinem installierten Paket" -#: pisi/cli/commands.py:1598 +#: pisi/cli/commands.py:1591 msgid "Searching for %s" msgstr "Suche %s" -#: pisi/cli/commands.py:1608 +#: pisi/cli/commands.py:1601 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2224,7 +2215,7 @@ msgstr "" "wobei einer von:\n" "\n" -#: pisi/cli/commands.py:1614 +#: pisi/cli/commands.py:1607 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2369,8 +2360,7 @@ msgid "Access denied to destination file: \"%s\"" msgstr "Zugriff verweigert für Zielddatei: \"%s\"" #: pisi/fetcher.py:100 -msgid "" -"A problem occured. Please check the archive address and/or permissions again." +msgid "A problem occured. Please check the archive address and/or permissions again." msgstr "" "Es ist ein Problem aufgetreten. Bitte die Adresse der Datei und/oder Rechte " "überprüfen." @@ -2524,8 +2514,7 @@ msgstr "" "rebuild-db aus." #: pisi/lockeddbshelve.py:51 -msgid "" -"Database version for %s greater than PiSi version. You need a newer PiSi." +msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Datenbankversion %s ist grösser als PiSi-Version. Sie benötigen ein neueres " "PiSi." @@ -2565,8 +2554,7 @@ msgstr "" "werden" #: pisi/lockeddbshelve.py:139 -msgid "" -"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Flagge sollte eine von 'r', 'w', 'c' oder 'n' sein oder die bsddb.db.DB_* " "Flaggen benutzen" @@ -2637,18 +2625,15 @@ msgstr "Folgende widersprüchliche Pakete entfernen ?" #: pisi/operations.py:305 msgid "Safety switch: Following packages in system.base will be installed: " -msgstr "" -"Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" +msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" #: pisi/operations.py:311 msgid "Safety switch: Following packages in system.base will be upgraded: " -msgstr "" -"Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" +msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" #: pisi/operations.py:317 pisi/operations.py:597 msgid "Safety switch: the component system.base cannot be found" -msgstr "" -"Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" +msgstr "Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" #: pisi/operations.py:334 msgid "" @@ -3031,8 +3016,7 @@ msgstr "" "%s\n" #: scripts/repostats.py:371 -msgid "" -"Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" "Entwickler '%s <%s>' hat eina andere email adresse '%s' im Quelltext-Paket '%" "s'" @@ -3061,14 +3045,3 @@ msgstr "Suche im Quellcode - Depot...\n" msgid "Scanning binary packages...\n" msgstr "Suche im Binär - Depot...\n" -#~ msgid "Unknown file type '%s' in package '%s'" -#~ msgstr "Unbekannter Datentyp '%s' in Paket '%s'" - -#~ msgid "Source package '%s' has wrong date format '%s'" -#~ msgstr "Quellcode-Paket '%s' hat falsches Datumsformat '%s'" - -#~ msgid "Encountered %d errors! Fix them immediately!\n" -#~ msgstr "%d Fehler gefunden ! Bitte umgehend korrigieren !\n" - -#~ msgid "These dependencies are not available in repository:\n" -#~ msgstr "Folgende Abhängigkeiten sind nicht im Depot vorhanden:\n" diff --git a/po/es.po b/po/es.po index 25675175..130625f0 100644 --- a/po/es.po +++ b/po/es.po @@ -1,14 +1,15 @@ -# translation of es.po to spanish +# translation of es.po to # Copyright (C) YEAR ORGANIZATION # # Klemens Häckel , 2007. +# Faik Uygur , 2007. msgid "" msgstr "" "Project-Id-Version: es\n" -"POT-Creation-Date: 2007-02-28 20:09+EET\n" -"PO-Revision-Date: 2007-02-04 11:42+0200\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: spanish \n" +"POT-Creation-Date: 2007-03-02 16:01+EET\n" +"PO-Revision-Date: 2007-03-02 16:06+0200\n" +"Last-Translator: Faik Uygur \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -92,8 +93,7 @@ msgstr "" #: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 msgid "Return a comma-separated list of option strings & metavariables." -msgstr "" -"Devuelve una lista, separado por comas de cadenas de opción & variables meta." +msgstr "Devuelve una lista, separado por comas de cadenas de opción & variables meta." #: /usr/lib/python2.4/optparse.py:317 msgid "" @@ -515,7 +515,7 @@ msgstr "" "%s/config.log" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Falló Configure." @@ -525,7 +525,7 @@ msgstr "Falló Configure." msgid "No configure script found." msgstr "Script de configuración no encontrado." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 #: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 #: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 #: pisi/actionsapi/scons.py:39 @@ -533,15 +533,15 @@ msgid "Make failed." msgstr "Falló Make." #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 -#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "Falló Install" #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 -#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Archivo para 'make' no encontrado." @@ -565,7 +565,7 @@ msgstr "Falló ejecución de automake." msgid "Running autoheader failed." msgstr "Falló ejecución de autoheader." -#: pisi/actionsapi/cmaketools.py:69 +#: pisi/actionsapi/cmaketools.py:64 #, fuzzy msgid "No configure script found for cmake." msgstr "Script de configuración no encontrado." @@ -707,19 +707,19 @@ msgstr "ActionsAPI [copytree]: Carpeta %s no existe." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Permiso denegado: %s" -#: pisi/api.py:302 pisi/comariface.py:30 +#: pisi/api.py:299 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "paquete comar no está instalado completamente" -#: pisi/api.py:314 +#: pisi/api.py:311 msgid "File %s not found" msgstr "Archivo %s no encontrado" -#: pisi/api.py:375 +#: pisi/api.py:364 msgid "Checking /%s " msgstr "Verificando /%s " -#: pisi/api.py:379 +#: pisi/api.py:368 msgid "" "\n" "Corrupt file: %s" @@ -727,64 +727,64 @@ msgstr "" "\n" "Archivo corrupto: %s" -#: pisi/api.py:381 pisi/cli/commands.py:966 +#: pisi/api.py:370 pisi/cli/commands.py:967 msgid "OK" msgstr "OK" -#: pisi/api.py:394 +#: pisi/api.py:383 msgid "* Building index of PiSi files under %s" msgstr "* Generando índice de archivos de PiSi en %s" -#: pisi/api.py:401 +#: pisi/api.py:390 msgid "* Index file written" msgstr "* Archivo de índice grabado" -#: pisi/api.py:405 +#: pisi/api.py:394 msgid "Repo %s already present." msgstr "Repo %s ya presente." -#: pisi/api.py:409 +#: pisi/api.py:398 msgid "Repo %s added to system." msgstr "Repo %s agregado al sistema." -#: pisi/api.py:415 +#: pisi/api.py:404 msgid "Repo %s removed from system." msgstr "Repo %s removido del sistema." -#: pisi/api.py:417 +#: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." msgstr "Repositorio %s no existe. No posible remover." -#: pisi/api.py:424 +#: pisi/api.py:413 msgid "* Updating repository: %s" msgstr "* Actualizando repositorio: %s" -#: pisi/api.py:432 +#: pisi/api.py:421 msgid "No updates available for repository %s." msgstr "No hay actualizaciones disponibles para repositorio %s." # what do You mean here with "at any rate" ? ok, got it, but will think of better spanish translation. it is not yet in here. -#: pisi/api.py:434 +#: pisi/api.py:423 msgid "Updating database at any rate as requested" msgstr "Actualizando base de datos según solicitado" -#: pisi/api.py:445 +#: pisi/api.py:434 msgid "* Package database updated." msgstr "* Base de datos de paquetes actualizado." -#: pisi/api.py:447 pisi/api.py:472 +#: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." msgstr "No se encontró repositorio con nombre %s." -#: pisi/api.py:455 +#: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " msgstr "* Regenerando repo de nombre '%s' ... " -#: pisi/api.py:468 +#: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" msgstr "Error de Input/Output al leer %s: %s" -#: pisi/api.py:525 +#: pisi/api.py:514 msgid "Rebuilding package database" msgstr "Regenerando base de datos de paquetes" @@ -883,8 +883,7 @@ msgstr "Guardando %s" #: pisi/atomicoperations.py:406 msgid "File list could not be read for package %s, continuing removal." -msgstr "" -"Lista de archivos no se pudo leer para paquete %s, continuando eliminar." +msgstr "Lista de archivos no se pudo leer para paquete %s, continuando eliminar." #: pisi/atomicoperations.py:412 msgid "Removing package %s" @@ -899,8 +898,7 @@ msgid "Not removing conflicted file : %s" msgstr "No eliminado archivo conflictivo: %s" #: pisi/atomicoperations.py:474 -msgid "" -"Installed file %s is not exists on system [Probably you manually deleted]" +msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Archivo instalado %s no existe en el sistema [Probablemente eliminado " "manualmente]" @@ -947,8 +945,7 @@ msgstr "Generando paquete fuente PiSi: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "" -"IceCream detectado. Asegurese que el demónio está activo y funcionando..." +msgstr "IceCream detectado. Asegurese que el demónio está activo y funcionando..." #: pisi/build.py:234 msgid "CCache detected..." @@ -1016,8 +1013,7 @@ msgstr "no posible llamar función desde acciones: %s" # did I get "safety switch" right (in this context)? #: pisi/build.py:433 -msgid "" -"Safety switch: following extra packages in system.devel will be installed: " +msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Verificación de seguridad: Se instalarán los siguientes paquetes adicionales " "en system.devel:" @@ -1028,8 +1024,7 @@ msgstr "Verificación de seguridad: system.devel ya está instalado" #: pisi/build.py:440 msgid "Safety switch: the component system.devel cannot be found" -msgstr "" -"Verificación de seguridad: No posible encontrar el componente system.devel" +msgstr "Verificación de seguridad: No posible encontrar el componente system.devel" #: pisi/build.py:449 msgid "Unsatisfied Build Dependencies:" @@ -1081,8 +1076,7 @@ msgstr "(no se encontró build anterior, seteando número de build a 1.)" #: pisi/build.py:724 msgid "(old package lacks a build no, setting build no to 1.)" -msgstr "" -"(paquete antiguo no tiene número de build, seteando número de build a 1.)" +msgstr "(paquete antiguo no tiene número de build, seteando número de build a 1.)" #: pisi/build.py:727 msgid "There are changes, incrementing build no to %d" @@ -1129,8 +1123,7 @@ msgid "Abandoned files under the install dir (%s):" msgstr "Archivos abandonados en carpeta de instalación (%s):" #: pisi/build.py:887 -msgid "" -"All of the files under the install dir (%s) has been collected by package(s)" +msgid "All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Todos los archivos de la carpeta de instalación (%s) se juntaron en los " "paquetes" @@ -1358,8 +1351,7 @@ msgstr "Ploteando paquetes de repositorio %s" #: pisi/cli/commands.py:383 msgid "Plotting a graph of relations among all repository packages" -msgstr "" -"Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" +msgstr "Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" #: pisi/cli/commands.py:390 msgid "Plotting a graph of relations among all installed packages" @@ -1395,47 +1387,46 @@ msgstr "" "Como alternativa se puede indicar la ubicación de un paquete de fuentes,\n" " para descargarlo de un repositorio de fuentes.\n" -#: pisi/cli/commands.py:433 +#: pisi/cli/commands.py:434 msgid "build options" msgstr "opciones de build" -#: pisi/cli/commands.py:441 +#: pisi/cli/commands.py:442 msgid "Output directory for produced packages" msgstr "Carpeta de salida para paquetes producidos" -#: pisi/cli/commands.py:444 +#: pisi/cli/commands.py:445 msgid "Bypass errors from ActionsAPI" msgstr "Omitir errores del ActionsAPI" # check? -#: pisi/cli/commands.py:446 pisi/cli/commands.py:554 +#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 msgid "Bypass safety switch" msgstr "Omitir la verificación de seguridad" -#: pisi/cli/commands.py:448 +#: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Crear un paquete estático con archivos ar" -#: pisi/cli/commands.py:450 -msgid "" -"Do not install build dependencies, fail if a build dependency is present" +#: pisi/cli/commands.py:451 +msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "" "No instalar dependencias build, error si una dependencia de build está " "presente" -#: pisi/cli/commands.py:452 +#: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" msgstr "Formatos bínarios de paquetes PiSi: '1.0', '1.1' (default)" -#: pisi/cli/commands.py:455 +#: pisi/cli/commands.py:456 msgid "build steps" msgstr "pasos build" -#: pisi/cli/commands.py:457 +#: pisi/cli/commands.py:458 msgid "Break build after fetching the source archive" msgstr "Interrumpir build luego de buscar el archivo fuente" -#: pisi/cli/commands.py:459 +#: pisi/cli/commands.py:460 msgid "" "Break build after unpacking the source archive, checking sha1sum and " "applying patches" @@ -1443,36 +1434,36 @@ msgstr "" "Interrumpir build luego de descompactar el archivo fuente, verificando " "sha1sum y aplicando parches" -#: pisi/cli/commands.py:461 +#: pisi/cli/commands.py:462 msgid "Break build after running configure step" msgstr "Interrumpir build luego de ejecutar el paso de configure" -#: pisi/cli/commands.py:463 +#: pisi/cli/commands.py:464 msgid "Break build after running compile step" msgstr "Interrumpir build luego de compilar" -#: pisi/cli/commands.py:465 +#: pisi/cli/commands.py:466 msgid "Break build after running install step" msgstr "Interrumpir build luego de ejecutar install" -#: pisi/cli/commands.py:467 +#: pisi/cli/commands.py:468 msgid "create PiSi package" msgstr "crear paquete PiSi" -#: pisi/cli/commands.py:481 +#: pisi/cli/commands.py:482 msgid "package_format must be one of %s " msgstr "package_format debe ser uno de %s " -#: pisi/cli/commands.py:484 pisi/cli/commands.py:533 +#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 msgid "Output directory: %s" msgstr "Carpeta de salida: %s" # sense is "current directory" i think ? -#: pisi/cli/commands.py:486 +#: pisi/cli/commands.py:487 msgid "Outputting packages in the working directory." msgstr "Guardando paquetes en la carpeta actual." -#: pisi/cli/commands.py:497 +#: pisi/cli/commands.py:498 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1493,35 +1484,35 @@ msgstr "" "Tambien se puede dar el nombre de un componente.\n" # no idea, i should know the context :( -#: pisi/cli/commands.py:516 +#: pisi/cli/commands.py:517 msgid "emerge options" msgstr "Opciones emerge" -#: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 +#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 msgid "Ignore file conflicts" msgstr "Ignorar conflictos de archivos" -#: pisi/cli/commands.py:521 pisi/cli/commands.py:594 pisi/cli/commands.py:658 +#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 msgid "Ignore package conflicts" msgstr "Ignorar confllictos de paquetes" -#: pisi/cli/commands.py:523 pisi/cli/commands.py:552 +#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 msgid "Bypass comar configuration agent" msgstr "Omitir al agente de configuración comar" -#: pisi/cli/commands.py:535 +#: pisi/cli/commands.py:536 msgid "Outputting binary packages in the package cache." msgstr "Guardando paquetes binarios en el cache de paquetes." -#: pisi/cli/commands.py:543 +#: pisi/cli/commands.py:544 msgid "Abstract package operation command" msgstr "Comando de operación de paquete abstracto" -#: pisi/cli/commands.py:556 +#: pisi/cli/commands.py:557 msgid "Do not perform any action, just show what would be done" msgstr "No hacer nada, solamente mostrar lo que se haría" -#: pisi/cli/commands.py:567 +#: pisi/cli/commands.py:568 msgid "" "Install PiSi packages\n" "\n" @@ -1546,24 +1537,24 @@ msgstr "" "se\n" "completerán a nombres de paquetes.\n" -#: pisi/cli/commands.py:585 +#: pisi/cli/commands.py:586 msgid "install options" msgstr "Opciones de instalación" -#: pisi/cli/commands.py:590 +#: pisi/cli/commands.py:591 msgid "Reinstall already installed packages" msgstr "Reinstalar paquetes ya instalados" # check here: should be the idea be here - "dependent" (instead of "recursive")? -#: pisi/cli/commands.py:596 +#: pisi/cli/commands.py:597 msgid "Install component's and recursive components' packages" msgstr "Instalar paquetes de componente y de componentes recursivos" -#: pisi/cli/commands.py:598 pisi/cli/commands.py:662 +#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 msgid "Fetch upgrades but do not install." msgstr "Descargar actualizaciones pero no instalar" -#: pisi/cli/commands.py:621 +#: pisi/cli/commands.py:622 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1601,23 +1592,23 @@ msgstr "" "que \n" "se autocompletará a nombres de paquetes.\n" -#: pisi/cli/commands.py:647 +#: pisi/cli/commands.py:648 msgid "upgrade options" msgstr "opciones de actualización" -#: pisi/cli/commands.py:652 +#: pisi/cli/commands.py:653 msgid "Security related package upgrades only" msgstr "Solamente actualizaciones de seguridad" -#: pisi/cli/commands.py:654 +#: pisi/cli/commands.py:655 msgid "Do not update repositories" msgstr "No actualizar repositorios" -#: pisi/cli/commands.py:660 +#: pisi/cli/commands.py:661 msgid "Upgrade component's and recursive components' packages" msgstr "Actualizar componentes y recursivamente paquetes de componentes" -#: pisi/cli/commands.py:664 +#: pisi/cli/commands.py:665 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1626,7 +1617,7 @@ msgstr "" "coincide con patrón." # translated as if "..whose basenames contain the pattern string" -#: pisi/cli/commands.py:666 +#: pisi/cli/commands.py:667 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1634,15 +1625,15 @@ msgstr "" "Ignorar paquetes y componentes para la actualización, cuyo nombre base " "contiene el patrón." -#: pisi/cli/commands.py:706 +#: pisi/cli/commands.py:707 msgid "Updating repositories" msgstr "Actualizando repositorios" -#: pisi/cli/commands.py:711 +#: pisi/cli/commands.py:712 msgid "Will not update repositories" msgstr "No se actuallizarán los repositorios" -#: pisi/cli/commands.py:733 +#: pisi/cli/commands.py:734 msgid "" "Remove PiSi packages\n" "\n" @@ -1664,15 +1655,15 @@ msgstr "" "que \n" "se autocompletará a nombres de paquetes.\n" -#: pisi/cli/commands.py:750 +#: pisi/cli/commands.py:751 msgid "remove options" msgstr "opciones de remover" -#: pisi/cli/commands.py:753 +#: pisi/cli/commands.py:754 msgid "Remove component's and recursive components' packages" msgstr "Remover paquetes del componente y recursivamente de los subcomponentes" -#: pisi/cli/commands.py:775 +#: pisi/cli/commands.py:776 msgid "" "Configure pending packages\n" "\n" @@ -1688,11 +1679,11 @@ msgstr "" "de paquetes pendientes a configurar. Este comando \n" "configura los paquetes en esta situación.\n" -#: pisi/cli/commands.py:791 +#: pisi/cli/commands.py:792 msgid "configure-pending options" msgstr "Opciones de configuración de pendientes" -#: pisi/cli/commands.py:803 +#: pisi/cli/commands.py:804 msgid "" "Display package information\n" "\n" @@ -1706,65 +1697,65 @@ msgstr "" "\n" " puede ser nombre de paquete o un archivo .pisi,\n" -#: pisi/cli/commands.py:818 +#: pisi/cli/commands.py:819 msgid "info options" msgstr "opciones de info" -#: pisi/cli/commands.py:825 +#: pisi/cli/commands.py:826 msgid "Show a list of package files." msgstr "Mostrar lista de archivos de paquetes" # my translation of "the current component", is it ok ? -#: pisi/cli/commands.py:827 +#: pisi/cli/commands.py:828 msgid "Info about the given component" msgstr "Infos sobre el componente actual" -#: pisi/cli/commands.py:830 +#: pisi/cli/commands.py:831 msgid "Show only paths." msgstr "Mostrar solamente rutas" -#: pisi/cli/commands.py:832 +#: pisi/cli/commands.py:833 msgid "Do not show details" msgstr "No mostrar detalles" -#: pisi/cli/commands.py:834 +#: pisi/cli/commands.py:835 msgid "Output in xml format" msgstr "Salida en formato xml" -#: pisi/cli/commands.py:880 +#: pisi/cli/commands.py:881 msgid "Package file: %s" msgstr "Archivo de paquete: %s" -#: pisi/cli/commands.py:886 +#: pisi/cli/commands.py:887 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:888 +#: pisi/cli/commands.py:889 msgid "Installed package:" msgstr "Paquete instalado:" -#: pisi/cli/commands.py:894 +#: pisi/cli/commands.py:895 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:896 +#: pisi/cli/commands.py:897 msgid "Package found in repository:" msgstr "Paquete encontrado en repositorio:" -#: pisi/cli/commands.py:900 +#: pisi/cli/commands.py:901 msgid "%s is not found in repositories" msgstr "%s no encontrado en repositorios" -#: pisi/cli/commands.py:903 +#: pisi/cli/commands.py:904 msgid "%s is not installed" msgstr "%s no está instalado" # "Reverse" ne demek ? is this = undo ? -#: pisi/cli/commands.py:916 +#: pisi/cli/commands.py:917 msgid "Reverse Dependencies:" msgstr "Dependencias reversas:" -#: pisi/cli/commands.py:919 +#: pisi/cli/commands.py:920 msgid "" "\n" "Files:" @@ -1772,11 +1763,11 @@ msgstr "" "\n" "Archivos:" -#: pisi/cli/commands.py:927 +#: pisi/cli/commands.py:928 msgid "File information not available" msgstr "Información de archivo no disponible" -#: pisi/cli/commands.py:933 +#: pisi/cli/commands.py:934 msgid "" "Verify installation\n" "\n" @@ -1802,15 +1793,15 @@ msgstr "" "\n" "Sin nombre de paquete, el comando verifica todos los paquetes instalados.\n" -#: pisi/cli/commands.py:957 +#: pisi/cli/commands.py:958 msgid "Checking all installed packages" msgstr "Verificando todos los paquetes instalados" -#: pisi/cli/commands.py:960 +#: pisi/cli/commands.py:961 msgid "* Checking %s... " msgstr "* Verificando %s... " -#: pisi/cli/commands.py:964 +#: pisi/cli/commands.py:965 msgid "" "\n" "Package %s is corrupt." @@ -1818,11 +1809,11 @@ msgstr "" "\n" "Paquete %s está corrupto." -#: pisi/cli/commands.py:968 +#: pisi/cli/commands.py:969 msgid "Package %s not installed" msgstr "Paquete %s no está instalado" -#: pisi/cli/commands.py:973 +#: pisi/cli/commands.py:974 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1849,31 +1840,31 @@ msgstr "" "igual, pero\n" "se junta el resultado en un solo archivo del indexado.\n" -#: pisi/cli/commands.py:994 +#: pisi/cli/commands.py:995 msgid "index options" msgstr "opciones de indexar" -#: pisi/cli/commands.py:998 +#: pisi/cli/commands.py:999 msgid "Store absolute links for indexed files." msgstr "Guardar rutas absolutas para los archivos indexados." -#: pisi/cli/commands.py:1001 +#: pisi/cli/commands.py:1002 msgid "Index output file" msgstr "Archivo index de salida" -#: pisi/cli/commands.py:1004 +#: pisi/cli/commands.py:1005 msgid "Do not index PiSi spec files." msgstr "No incluir archivos de spec PiSi" -#: pisi/cli/commands.py:1007 +#: pisi/cli/commands.py:1008 msgid "Do not sign index." msgstr "No firmar index" -#: pisi/cli/commands.py:1020 +#: pisi/cli/commands.py:1021 msgid "Indexing current directory." msgstr "Indexando carpeta actual" -#: pisi/cli/commands.py:1028 +#: pisi/cli/commands.py:1029 msgid "" "Print the list of all installed packages\n" "\n" @@ -1883,32 +1874,30 @@ msgstr "" "\n" "Uso: list-installed\n" -#: pisi/cli/commands.py:1042 +#: pisi/cli/commands.py:1043 msgid "list-installed options" msgstr "opciones de list-installed" -#: pisi/cli/commands.py:1045 pisi/cli/commands.py:1278 -#: pisi/cli/commands.py:1342 pisi/cli/commands.py:1381 -#: pisi/cli/commands.py:1421 pisi/cli/commands.py:1555 +#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 +#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 +#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 msgid "Show in long format" msgstr "Mostrar formato largo" -#: pisi/cli/commands.py:1047 +#: pisi/cli/commands.py:1048 msgid "List installed packages under given component" msgstr "Listar paquetes instalados bajo componente dado" -#: pisi/cli/commands.py:1049 pisi/cli/commands.py:1425 +#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 msgid "Show detailed install info" msgstr "Mostrar información detallada de instalación" # I suppose here the position is important too ! Should be the same ok as in english -#: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 -msgid "" -"Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "" -"Nombre Paquete |St| Versión| Rel.| Build| Distro| Fecha" +#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +msgid "Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "Nombre Paquete |St| Versión| Rel.| Build| Distro| Fecha" -#: pisi/cli/commands.py:1081 +#: pisi/cli/commands.py:1082 msgid "" "Rebuild Databases\n" "\n" @@ -1928,19 +1917,19 @@ msgstr "" "Si se indican nombres de paquetes, deberían coincidir con \n" "carpetas de paquetes en /var/lib/pisi\n" -#: pisi/cli/commands.py:1099 +#: pisi/cli/commands.py:1100 msgid "rebuild-db options" msgstr "opciones rebuild-db" -#: pisi/cli/commands.py:1102 +#: pisi/cli/commands.py:1103 msgid "Rebuild files database" msgstr "Regenerar base de datos de archivos" -#: pisi/cli/commands.py:1113 +#: pisi/cli/commands.py:1114 msgid "Rebuild PiSi databases?" msgstr "Regenerar base de datos PiSi ?" -#: pisi/cli/commands.py:1120 +#: pisi/cli/commands.py:1121 msgid "" "Update repository databases\n" "\n" @@ -1960,15 +1949,15 @@ msgstr "" "Synchroniza la base de datos PiSi con el repositorio actual.\n" "Si no se indica un repositorio, se actualizan todos los repositorios.\n" -#: pisi/cli/commands.py:1138 +#: pisi/cli/commands.py:1139 msgid "update-repo options" msgstr "opciones update-repo" -#: pisi/cli/commands.py:1142 +#: pisi/cli/commands.py:1143 msgid "Update database in any case" msgstr "Actualizar la base de datos de todas formas" -#: pisi/cli/commands.py:1160 +#: pisi/cli/commands.py:1161 msgid "" "Add a repository\n" "\n" @@ -1994,23 +1983,23 @@ msgstr "" "Obs.: Actualmente están soportados solamente archivos locales (ej., /a/b/c) " "y URIs http:// \n" -#: pisi/cli/commands.py:1180 +#: pisi/cli/commands.py:1181 msgid "add-repo options" msgstr "opciones add-repo" -#: pisi/cli/commands.py:1183 +#: pisi/cli/commands.py:1184 msgid "Add repository at given position (0 is first)" msgstr "Agregar repositorio en posicion indicada (inicia con 0)" -#: pisi/cli/commands.py:1197 +#: pisi/cli/commands.py:1198 msgid "Update PiSi database for repository %s?" msgstr "Actualizar base de datos PiSi para repositorio %s?" -#: pisi/cli/commands.py:1201 +#: pisi/cli/commands.py:1202 msgid "%s repository could not be reached. Removing %s from system." msgstr "Repositorio %s inaccesible. Removiendo %s del sistema." -#: pisi/cli/commands.py:1210 +#: pisi/cli/commands.py:1211 msgid "" "Remove repositories\n" "\n" @@ -2025,7 +2014,7 @@ msgstr "" "Remueve toda información de repositorio del sistema.\n" # i think translatioin ok, but maybe something nicer/better (in spanish) for "tracked" ? -#: pisi/cli/commands.py:1236 +#: pisi/cli/commands.py:1237 msgid "" "List repositories\n" "\n" @@ -2039,7 +2028,7 @@ msgstr "" "\n" "Lista repositorios que están siendo observados actualmente.\n" -#: pisi/cli/commands.py:1259 +#: pisi/cli/commands.py:1260 msgid "" "List available packages in the repositories\n" "\n" @@ -2057,27 +2046,27 @@ msgstr "" "repositorios especificados. Sin especificar un repositorio, se listan\n" "los paquetes de todos los repositorios.\n" -#: pisi/cli/commands.py:1276 +#: pisi/cli/commands.py:1277 msgid "list-available options" msgstr "opciones list-available" -#: pisi/cli/commands.py:1280 +#: pisi/cli/commands.py:1281 msgid "List available packages under given component" msgstr "Listar paquetes disponibles bajo un componente dado" -#: pisi/cli/commands.py:1282 +#: pisi/cli/commands.py:1283 msgid "Show uninstalled packages only" msgstr "Solo muestra paquetes desinstalados" -#: pisi/cli/commands.py:1290 +#: pisi/cli/commands.py:1291 msgid "Installed packages are shown in this color" msgstr "Paquetes instalados se muestran en este color" -#: pisi/cli/commands.py:1298 +#: pisi/cli/commands.py:1299 msgid "Repository : %s\n" msgstr "Repositorio : %s\n" -#: pisi/cli/commands.py:1325 +#: pisi/cli/commands.py:1326 msgid "" "List available components\n" "\n" @@ -2093,11 +2082,11 @@ msgstr "" "Da una lista breve de componentes PiSi publicados en los\n" "repositorios.\n" -#: pisi/cli/commands.py:1340 +#: pisi/cli/commands.py:1341 msgid "list-components options" msgstr "opciones list-components" -#: pisi/cli/commands.py:1365 +#: pisi/cli/commands.py:1366 msgid "" "List available sources\n" "\n" @@ -2111,11 +2100,11 @@ msgstr "" "\n" "Da una lista breve de los fuentes publicados en los repositories.\n" -#: pisi/cli/commands.py:1379 +#: pisi/cli/commands.py:1380 msgid "list-sources options" msgstr "opciones list-sources" -#: pisi/cli/commands.py:1404 +#: pisi/cli/commands.py:1405 msgid "" "List packages to be upgraded\n" "\n" @@ -2129,19 +2118,19 @@ msgstr "" "\n" "Lista los paquetes que se actualizarán.\n" -#: pisi/cli/commands.py:1418 +#: pisi/cli/commands.py:1419 msgid "list-upgrades options" msgstr "opcioens list-upgrades" -#: pisi/cli/commands.py:1423 +#: pisi/cli/commands.py:1424 msgid "List upgradable packages under given component" msgstr "Lista paquetes actualizables bajo un componente dado" -#: pisi/cli/commands.py:1440 pisi/operations.py:466 +#: pisi/cli/commands.py:1441 pisi/operations.py:466 msgid "No packages to upgrade." msgstr "No hay paquetes para actualizar" -#: pisi/cli/commands.py:1460 +#: pisi/cli/commands.py:1461 msgid "" "List pending packages\n" "\n" @@ -2151,11 +2140,11 @@ msgstr "" "\n" "Lista paquetes esperando la configuración.\n" -#: pisi/cli/commands.py:1482 +#: pisi/cli/commands.py:1483 msgid "There are no packages waiting to be configured" msgstr "No hay paquetes esperando la configuración" -#: pisi/cli/commands.py:1487 +#: pisi/cli/commands.py:1488 msgid "" "Search packages\n" "\n" @@ -2171,23 +2160,23 @@ msgstr "" "Busca paquetes con un patrón de búsqueda en\n" "campos de resumen, descripción y nombre de paquete.\n" -#: pisi/cli/commands.py:1502 +#: pisi/cli/commands.py:1503 msgid "search options" msgstr "opciones de busqueda" -#: pisi/cli/commands.py:1505 +#: pisi/cli/commands.py:1506 msgid "Set search language" msgstr "Establecer idioma de búsqueda" -#: pisi/cli/commands.py:1510 +#: pisi/cli/commands.py:1511 msgid "Show details" msgstr "Mostrar detalles" -#: pisi/cli/commands.py:1530 +#: pisi/cli/commands.py:1523 msgid "%s packages found" msgstr "%s paquetes encontrados" -#: pisi/cli/commands.py:1539 +#: pisi/cli/commands.py:1532 msgid "" "Search for a file\n" "\n" @@ -2201,36 +2190,36 @@ msgstr "" "\n" "Busca el paquete instalado que contiene el archivo indicado.\n" -#: pisi/cli/commands.py:1553 +#: pisi/cli/commands.py:1546 msgid "search-file options" msgstr "opciones search-file" -#: pisi/cli/commands.py:1557 +#: pisi/cli/commands.py:1550 msgid "Fuzzy search" msgstr "Búsqueda Fuzzy" -#: pisi/cli/commands.py:1559 +#: pisi/cli/commands.py:1552 msgid "Show only package name" msgstr "Mostrar solamente nombre de paquete" # i put in spanish "contains" instead of "has", ok ? -#: pisi/cli/commands.py:1580 +#: pisi/cli/commands.py:1573 msgid "Package %s has file %s" msgstr "Paquete %s contiene archivo %s" -#: pisi/cli/commands.py:1582 +#: pisi/cli/commands.py:1575 msgid "Type: %s, Hash: %s" msgstr "Tipo: %s, Hash: %s" -#: pisi/cli/commands.py:1585 +#: pisi/cli/commands.py:1578 msgid "Path '%s' does not belong to an installed package" msgstr "Ruta '%s' no perteneca a un paquete instalado" -#: pisi/cli/commands.py:1598 +#: pisi/cli/commands.py:1591 msgid "Searching for %s" msgstr "Buscando %s" -#: pisi/cli/commands.py:1608 +#: pisi/cli/commands.py:1601 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2242,7 +2231,7 @@ msgstr "" "donde es uno de:\n" "\n" -#: pisi/cli/commands.py:1614 +#: pisi/cli/commands.py:1607 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2388,8 +2377,7 @@ msgid "Access denied to destination file: \"%s\"" msgstr "Acceso denegado a archivo de destino: \"%s\"" #: pisi/fetcher.py:100 -msgid "" -"A problem occured. Please check the archive address and/or permissions again." +msgid "A problem occured. Please check the archive address and/or permissions again." msgstr "" "Ocurrió un problema. Favor verifique otra vez la ubicación y/o los permisos " "del paquete." @@ -2543,8 +2531,7 @@ msgstr "" "db." #: pisi/lockeddbshelve.py:51 -msgid "" -"Database version for %s greater than PiSi version. You need a newer PiSi." +msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Versión de base de datos %s mayor que versión de PiSi. Necesitas una versión " "PiSi más nueva." @@ -2582,8 +2569,7 @@ msgid "Cannot attain read or write access to database %s" msgstr "No posible acceder a base de datos %s para lectura o escritura" #: pisi/lockeddbshelve.py:139 -msgid "" -"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Banderas deberían ser uno de 'r', 'w', 'c' or 'n' o use las banderas bsddb." "db.DB_* " @@ -2603,8 +2589,7 @@ msgstr "Archivo mirror %s no existe. No posible resolver mirrors://" #: pisi/operations.py:114 msgid "Mixing file names and package names not supported yet." -msgstr "" -"Mezclando nombres de archivos y nombres de paquetes todavía no soportado." +msgstr "Mezclando nombres de archivos y nombres de paquetes todavía no soportado." #: pisi/operations.py:156 msgid "" @@ -2671,15 +2656,13 @@ msgstr "" # should this say in english ? "Safety switch: the component cannot be found in system.base" ?? (i did in spanish like this) #: pisi/operations.py:317 pisi/operations.py:597 msgid "Safety switch: the component system.base cannot be found" -msgstr "" -"Verificación de seguridad: No posible encontrar el componente system.base: " +msgstr "Verificación de seguridad: No posible encontrar el componente system.base: " #: pisi/operations.py:334 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" -msgstr "" -"Los siguientes paquetes ya están instalados y no se instalarán de nuevo:\n" +msgstr "Los siguientes paquetes ya están instalados y no se instalarán de nuevo:\n" #: pisi/operations.py:355 msgid "" @@ -2695,8 +2678,7 @@ msgstr "Tamaño total de paquete(s): %.2f %s" #: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 msgid "There are extra packages due to dependencies. Do you want to continue?" -msgstr "" -"Hay paquetes adicionales por motivo de dependencias. Quiere continuar ?" +msgstr "Hay paquetes adicionales por motivo de dependencias. Quiere continuar ?" #: pisi/operations.py:432 msgid "Warning: package *name* ends with '.pisi'" @@ -3051,10 +3033,8 @@ msgstr "" "%s\n" #: scripts/repostats.py:371 -msgid "" -"Developer '%s <%s>' has another mail address '%s' in source package '%s'" -msgstr "" -"Desarollador '%s <%s>' tiene otra dirección email '%s' en archivo fuente '%s'" +msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "Desarollador '%s <%s>' tiene otra dirección email '%s' en archivo fuente '%s'" #: scripts/repostats.py:467 msgid "" @@ -3080,15 +3060,3 @@ msgstr "Buscando en repositorio fuente...\n" msgid "Scanning binary packages...\n" msgstr "Buscando en paquetes binarios...\n" -#~ msgid "Unknown file type '%s' in package '%s'" -#~ msgstr "Tipo de archivo '%s' en paquete '%s' desconocido" - -#~ msgid "Source package '%s' has wrong date format '%s'" -#~ msgstr "Paquete de fuente '%s' tiene formato de fecha incorrecto '%s'" - -#~ msgid "Encountered %d errors! Fix them immediately!\n" -#~ msgstr "%d errores encontrados! Corrígalos de inmediato!\n" - -#~ msgid "These dependencies are not available in repository:\n" -#~ msgstr "" -#~ "Las siguientes dependencias no están disponibles en el repositorio:\n" diff --git a/po/nl.po b/po/nl.po index 37633d1c..d43f367a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,16 +1,17 @@ -# translation of nl.po to Nederlands +# translation of nl.po to # Andre van der Lubben , 2006. # Willem Gielen , 2006, 2007. # Rinse de Vries , 2006. # W.P.M.H.I.A. Gielen , 2006. +# Faik Uygur , 2007. # Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. msgid "" msgstr "" "Project-Id-Version: nl\n" -"POT-Creation-Date: 2007-02-28 20:09+EET\n" -"PO-Revision-Date: 2007-02-18 03:02+0200\n" -"Last-Translator: Willem Gielen \n" -"Language-Team: Nederlands \n" +"POT-Creation-Date: 2007-03-02 16:01+EET\n" +"PO-Revision-Date: 2007-03-02 16:06+0200\n" +"Last-Translator: Faik Uygur \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -498,7 +499,7 @@ msgstr "" # pisi/actionsapi/autotools.py:75 :85 #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Configuratie is mislukt." @@ -509,7 +510,7 @@ msgstr "Configuratie is mislukt." msgid "No configure script found." msgstr "Geen configuratiescript gevonden." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 #: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 #: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 #: pisi/actionsapi/scons.py:39 @@ -518,7 +519,7 @@ msgstr "Make mislukt." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 -#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." @@ -526,8 +527,8 @@ msgstr "Installatie mislukt." # pisi/actionsapi/autotools.py:121 :129 #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 -#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Geen Makefile-bestand gevonden." @@ -554,10 +555,9 @@ msgid "Running autoheader failed." msgstr "Uitvoeren autoheader mislukt." # pisi/actionsapi/autotools.py:77 :87 -#: pisi/actionsapi/cmaketools.py:69 -#, fuzzy +#: pisi/actionsapi/cmaketools.py:64 msgid "No configure script found for cmake." -msgstr "Geen configuratiescript gevonden." +msgstr "Geen cmake configuratiescript gevonden." #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" @@ -698,19 +698,19 @@ msgstr "ActionsAPI [copytree]: map %s bestaat niet." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: toegang geweigerd: %s" -#: pisi/api.py:302 pisi/comariface.py:30 +#: pisi/api.py:299 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "comar-pakket is niet volledig geïnstalleerd" -#: pisi/api.py:314 +#: pisi/api.py:311 msgid "File %s not found" msgstr "Bestand %s niet gevonden." -#: pisi/api.py:375 +#: pisi/api.py:364 msgid "Checking /%s " msgstr "Contrôle /%s " -#: pisi/api.py:379 +#: pisi/api.py:368 msgid "" "\n" "Corrupt file: %s" @@ -718,63 +718,63 @@ msgstr "" "\n" "Bestand met fouten: %s" -#: pisi/api.py:381 pisi/cli/commands.py:966 +#: pisi/api.py:370 pisi/cli/commands.py:967 msgid "OK" msgstr "OK" -#: pisi/api.py:394 +#: pisi/api.py:383 msgid "* Building index of PiSi files under %s" msgstr "* Index aanmaken van PiSi-bestanden onder %s" -#: pisi/api.py:401 +#: pisi/api.py:390 msgid "* Index file written" msgstr "* Index-bestand geschreven" -#: pisi/api.py:405 +#: pisi/api.py:394 msgid "Repo %s already present." msgstr "Repo %s is al aanwezig." -#: pisi/api.py:409 +#: pisi/api.py:398 msgid "Repo %s added to system." msgstr "Repo %s toegevoegd aan het systeem." -#: pisi/api.py:415 +#: pisi/api.py:404 msgid "Repo %s removed from system." msgstr "Repo %s verwijderd uit het systeem." -#: pisi/api.py:417 +#: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." msgstr "Repository %s bestaat niet. Kan niet verwijderen." -#: pisi/api.py:424 +#: pisi/api.py:413 msgid "* Updating repository: %s" msgstr "* Bijwerken repository: %s " -#: pisi/api.py:432 +#: pisi/api.py:421 msgid "No updates available for repository %s." msgstr "Geen bijgewerkte pakketten op repository %s." -#: pisi/api.py:434 +#: pisi/api.py:423 msgid "Updating database at any rate as requested" msgstr "Database bijwerken op elke snelheid zoals verzocht" -#: pisi/api.py:445 +#: pisi/api.py:434 msgid "* Package database updated." msgstr "* Pakketdatabase bijgewerkt." -#: pisi/api.py:447 pisi/api.py:472 +#: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." msgstr "Geen repository met de naam %s gevonden." -#: pisi/api.py:455 +#: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " msgstr "* 'Opnieuw opbouwen '%s' repo... " -#: pisi/api.py:468 +#: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" msgstr "I/O-fout bij lezen van %s: %s" -#: pisi/api.py:525 +#: pisi/api.py:514 msgid "Rebuilding package database" msgstr "Herbouwen pakket database" @@ -892,8 +892,7 @@ msgid "Not removing conflicted file : %s" msgstr "Niet verwijderen conflicterend bestand: %s" #: pisi/atomicoperations.py:474 -msgid "" -"Installed file %s is not exists on system [Probably you manually deleted]" +msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Geïnstalleerd bestand %s bestaat niet op systeem [mogelijk met de hand " "verwijderd]" @@ -1007,8 +1006,7 @@ msgid "unable to call function from actions: %s" msgstr "kan functie niet aanroepen vanuit actions: %s" #: pisi/build.py:433 -msgid "" -"Safety switch: following extra packages in system.devel will be installed: " +msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Veiligheidsprocedure: de volgende extra pakketten in system.devel zullen " "geïnstalleerd worden:" @@ -1066,6 +1064,7 @@ msgid "Skipping %s with wrong pkg name " msgstr "Overslaan %s met onjuiste pakketnaam" #: pisi/build.py:679 +#, fuzzy msgid "(no previous build found, setting build no to 1.)" msgstr "(geen eerdere bouw gevonden, zet compilatienummer op 1.)" @@ -1119,10 +1118,8 @@ msgid "Abandoned files under the install dir (%s):" msgstr "Verlaten bestanden in de installatiemap (%s):" #: pisi/build.py:887 -msgid "" -"All of the files under the install dir (%s) has been collected by package(s)" -msgstr "" -"Alle bestanden in de installatiemap (%s) zijn verzameld door pakket(ten)." +msgid "All of the files under the install dir (%s) has been collected by package(s)" +msgstr "Alle bestanden in de installatiemap (%s) zijn verzameld door pakket(ten)." #: pisi/build.py:891 msgid "Cleaning Build Directory..." @@ -1380,46 +1377,45 @@ msgstr "" "Als alternatief kunt u de naam van het bronpakket opgeven\n" "dat gedownload moet worden van een repository die de broncode bevat.\n" -#: pisi/cli/commands.py:433 +#: pisi/cli/commands.py:434 msgid "build options" msgstr "bouw opties" -#: pisi/cli/commands.py:441 +#: pisi/cli/commands.py:442 msgid "Output directory for produced packages" msgstr "Doelmap voor geproduceerde pakketten" -#: pisi/cli/commands.py:444 +#: pisi/cli/commands.py:445 msgid "Bypass errors from ActionsAPI" msgstr "Omzeilen fouten van ActionsAPI" -#: pisi/cli/commands.py:446 pisi/cli/commands.py:554 +#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 msgid "Bypass safety switch" msgstr "Omzeilen veiligheidsprocedure" -#: pisi/cli/commands.py:448 +#: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Maak een statisch pakket met ar-bestanden aan" -#: pisi/cli/commands.py:450 -msgid "" -"Do not install build dependencies, fail if a build dependency is present" +#: pisi/cli/commands.py:451 +msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "" "Installeer geen bouwafhankelijkheden, stoppen als zich een " "compileerafhankelijkheid voordoet" -#: pisi/cli/commands.py:452 +#: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" msgstr "PiSi binaire pakket formaten: '1.0', '1.1' (standaard)" -#: pisi/cli/commands.py:455 +#: pisi/cli/commands.py:456 msgid "build steps" msgstr "bouw stappen" -#: pisi/cli/commands.py:457 +#: pisi/cli/commands.py:458 msgid "Break build after fetching the source archive" msgstr "Breek bouwen af na ophalen bron archief" -#: pisi/cli/commands.py:459 +#: pisi/cli/commands.py:460 msgid "" "Break build after unpacking the source archive, checking sha1sum and " "applying patches" @@ -1427,35 +1423,35 @@ msgstr "" "Breek bouwen af na uitpakken van het bron archief, controleert sha1sum en " "herstelt" -#: pisi/cli/commands.py:461 +#: pisi/cli/commands.py:462 msgid "Break build after running configure step" msgstr "Breek bouwen af na uitvoeren van de configuratie stap" -#: pisi/cli/commands.py:463 +#: pisi/cli/commands.py:464 msgid "Break build after running compile step" msgstr "Breek bouwen af na uitvoeren van de compilatie stap" -#: pisi/cli/commands.py:465 +#: pisi/cli/commands.py:466 msgid "Break build after running install step" msgstr "Breek bouwen af na uitvoeren van de installatie stap" -#: pisi/cli/commands.py:467 +#: pisi/cli/commands.py:468 msgid "create PiSi package" msgstr "Aanmaken PiSi-pakket" -#: pisi/cli/commands.py:481 +#: pisi/cli/commands.py:482 msgid "package_format must be one of %s " msgstr "package_format moet zijn %s " -#: pisi/cli/commands.py:484 pisi/cli/commands.py:533 +#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 msgid "Output directory: %s" msgstr "Doelmap: %s" -#: pisi/cli/commands.py:486 +#: pisi/cli/commands.py:487 msgid "Outputting packages in the working directory." msgstr "Uitvoeren pakketten naar de werkmap." -#: pisi/cli/commands.py:497 +#: pisi/cli/commands.py:498 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1475,35 +1471,35 @@ msgstr "" "\n" "U kunt ook de naam van een component opgeven.\n" -#: pisi/cli/commands.py:516 +#: pisi/cli/commands.py:517 msgid "emerge options" msgstr "duik opties op" -#: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 +#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 msgid "Ignore file conflicts" msgstr "Negeer bestandsconflicten" -#: pisi/cli/commands.py:521 pisi/cli/commands.py:594 pisi/cli/commands.py:658 +#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 msgid "Ignore package conflicts" msgstr "Negeer pakketconflicten" -#: pisi/cli/commands.py:523 pisi/cli/commands.py:552 +#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 msgid "Bypass comar configuration agent" msgstr "Omzeil Comar-configuratieagent" -#: pisi/cli/commands.py:535 +#: pisi/cli/commands.py:536 msgid "Outputting binary packages in the package cache." msgstr "Uitvoeren binaire pakketten naar de pakketcache." -#: pisi/cli/commands.py:543 +#: pisi/cli/commands.py:544 msgid "Abstract package operation command" msgstr "Abstract pakket handelingscommando" -#: pisi/cli/commands.py:556 +#: pisi/cli/commands.py:557 msgid "Do not perform any action, just show what would be done" msgstr "Geen acties uitvoeren, geef alleen weer wat er zou gebeuren" -#: pisi/cli/commands.py:567 +#: pisi/cli/commands.py:568 msgid "" "Install PiSi packages\n" "\n" @@ -1526,23 +1522,23 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen dan " "worden uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:585 +#: pisi/cli/commands.py:586 msgid "install options" msgstr "installatie opties" -#: pisi/cli/commands.py:590 +#: pisi/cli/commands.py:591 msgid "Reinstall already installed packages" msgstr "Herïnstalleer reeds geïnstalleerde pakketten" -#: pisi/cli/commands.py:596 +#: pisi/cli/commands.py:597 msgid "Install component's and recursive components' packages" msgstr "Installeer componenten en de pakketten van recursieve componenten" -#: pisi/cli/commands.py:598 pisi/cli/commands.py:662 +#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 msgid "Fetch upgrades but do not install." msgstr "Haal bijgewerkte bestanden op maar installeer ze niet." -#: pisi/cli/commands.py:621 +#: pisi/cli/commands.py:622 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1580,23 +1576,23 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen worden " "uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:647 +#: pisi/cli/commands.py:648 msgid "upgrade options" msgstr "bijwerk opties" -#: pisi/cli/commands.py:652 +#: pisi/cli/commands.py:653 msgid "Security related package upgrades only" msgstr "Alleen beveiligingspakketten bijwerken" -#: pisi/cli/commands.py:654 +#: pisi/cli/commands.py:655 msgid "Do not update repositories" msgstr "Repositories niet bijwerken" -#: pisi/cli/commands.py:660 +#: pisi/cli/commands.py:661 msgid "Upgrade component's and recursive components' packages" msgstr "Opwaarderen componenten en recursieve componenten pakketten" -#: pisi/cli/commands.py:664 +#: pisi/cli/commands.py:665 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1604,7 +1600,7 @@ msgstr "" "Bij het opwaarderen van het systeem, pakketten en componenten negeren " "waarbij basenames overeenkomen met patroon." -#: pisi/cli/commands.py:666 +#: pisi/cli/commands.py:667 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1612,15 +1608,15 @@ msgstr "" "Als het systeem bijgewerkt wordt, pakketten en componenten negeren waarbij " "basenames overeenkomen met ieder patroon in bestand." -#: pisi/cli/commands.py:706 +#: pisi/cli/commands.py:707 msgid "Updating repositories" msgstr "Bijwerken repositories" -#: pisi/cli/commands.py:711 +#: pisi/cli/commands.py:712 msgid "Will not update repositories" msgstr "Zal repositories niet bijwerken" -#: pisi/cli/commands.py:733 +#: pisi/cli/commands.py:734 msgid "" "Remove PiSi packages\n" "\n" @@ -1641,15 +1637,15 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen " "worden uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:750 +#: pisi/cli/commands.py:751 msgid "remove options" msgstr "verwijder opties" -#: pisi/cli/commands.py:753 +#: pisi/cli/commands.py:754 msgid "Remove component's and recursive components' packages" msgstr "Verwijder componenten en de pakketten van recursieve componenten" -#: pisi/cli/commands.py:775 +#: pisi/cli/commands.py:776 msgid "" "Configure pending packages\n" "\n" @@ -1665,11 +1661,11 @@ msgstr "" "een lijst van pakketten in de wachtrij voor configuratie. Dit commando\n" "configureert deze pakketten.\n" -#: pisi/cli/commands.py:791 +#: pisi/cli/commands.py:792 msgid "configure-pending options" msgstr "wachtende configuratie opties" -#: pisi/cli/commands.py:803 +#: pisi/cli/commands.py:804 msgid "" "Display package information\n" "\n" @@ -1683,63 +1679,63 @@ msgstr "" "\n" " is ofwel een pakketnaam ofwel een .pisi bestand.\n" -#: pisi/cli/commands.py:818 +#: pisi/cli/commands.py:819 msgid "info options" msgstr "info opties" -#: pisi/cli/commands.py:825 +#: pisi/cli/commands.py:826 msgid "Show a list of package files." msgstr "Toon een lijst van pakketbestanden." -#: pisi/cli/commands.py:827 +#: pisi/cli/commands.py:828 msgid "Info about the given component" msgstr "Info van het gegeven component" -#: pisi/cli/commands.py:830 +#: pisi/cli/commands.py:831 msgid "Show only paths." msgstr "Toon alleen paden." -#: pisi/cli/commands.py:832 +#: pisi/cli/commands.py:833 msgid "Do not show details" msgstr "Geen details tonen" -#: pisi/cli/commands.py:834 +#: pisi/cli/commands.py:835 msgid "Output in xml format" msgstr "Uitvoer in xml-opmaak" -#: pisi/cli/commands.py:880 +#: pisi/cli/commands.py:881 msgid "Package file: %s" msgstr "Pakketbestand: %s" -#: pisi/cli/commands.py:886 +#: pisi/cli/commands.py:887 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:888 +#: pisi/cli/commands.py:889 msgid "Installed package:" msgstr "Geïnstalleerd pakket:" -#: pisi/cli/commands.py:894 +#: pisi/cli/commands.py:895 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:896 +#: pisi/cli/commands.py:897 msgid "Package found in repository:" msgstr "Pakket gevonden in repository:" -#: pisi/cli/commands.py:900 +#: pisi/cli/commands.py:901 msgid "%s is not found in repositories" msgstr "%s niet gevonden in de repositories" -#: pisi/cli/commands.py:903 +#: pisi/cli/commands.py:904 msgid "%s is not installed" msgstr "%s is niet geïnstalleerd." -#: pisi/cli/commands.py:916 +#: pisi/cli/commands.py:917 msgid "Reverse Dependencies:" msgstr "Omgekeerde afhankelijkheden:" -#: pisi/cli/commands.py:919 +#: pisi/cli/commands.py:920 msgid "" "\n" "Files:" @@ -1747,11 +1743,11 @@ msgstr "" "\n" "Bestanden:" -#: pisi/cli/commands.py:927 +#: pisi/cli/commands.py:928 msgid "File information not available" msgstr "Bestandsinformatie niet aanwezig" -#: pisi/cli/commands.py:933 +#: pisi/cli/commands.py:934 msgid "" "Verify installation\n" "\n" @@ -1778,15 +1774,15 @@ msgstr "" "\n" "Als er geen pakketten opgegeven worden, worden alle pakketen nagekeken.\n" -#: pisi/cli/commands.py:957 +#: pisi/cli/commands.py:958 msgid "Checking all installed packages" msgstr "Controleren alle geïnstalleerde pakketten" -#: pisi/cli/commands.py:960 +#: pisi/cli/commands.py:961 msgid "* Checking %s... " msgstr "* Contrôle %s... " -#: pisi/cli/commands.py:964 +#: pisi/cli/commands.py:965 msgid "" "\n" "Package %s is corrupt." @@ -1794,11 +1790,11 @@ msgstr "" "\n" "Pakket %s is beschadigd." -#: pisi/cli/commands.py:968 +#: pisi/cli/commands.py:969 msgid "Package %s not installed" msgstr "Pakket %s niet geïnstalleerd" -#: pisi/cli/commands.py:973 +#: pisi/cli/commands.py:974 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1824,31 +1820,31 @@ msgstr "" "Als u meerdere mappen opgeeft, werkt het commando nog steeds, maar\n" "zal het alles in één index bestand zetten.\n" -#: pisi/cli/commands.py:994 +#: pisi/cli/commands.py:995 msgid "index options" msgstr "index opties" -#: pisi/cli/commands.py:998 +#: pisi/cli/commands.py:999 msgid "Store absolute links for indexed files." msgstr "Opslaan absolute koppelingen voor geïndexeerde bestanden." -#: pisi/cli/commands.py:1001 +#: pisi/cli/commands.py:1002 msgid "Index output file" msgstr "Index-uitvoerbestand" -#: pisi/cli/commands.py:1004 +#: pisi/cli/commands.py:1005 msgid "Do not index PiSi spec files." msgstr "Niet indexeren PiSi-specifieke bestanden." -#: pisi/cli/commands.py:1007 +#: pisi/cli/commands.py:1008 msgid "Do not sign index." msgstr "Niet ondertekenen index." -#: pisi/cli/commands.py:1020 +#: pisi/cli/commands.py:1021 msgid "Indexing current directory." msgstr "Indexeren huidige map." -#: pisi/cli/commands.py:1028 +#: pisi/cli/commands.py:1029 msgid "" "Print the list of all installed packages\n" "\n" @@ -1858,31 +1854,30 @@ msgstr "" "\n" "Gebruik: list-installed\n" -#: pisi/cli/commands.py:1042 +#: pisi/cli/commands.py:1043 msgid "list-installed options" msgstr "list-installed opties" -#: pisi/cli/commands.py:1045 pisi/cli/commands.py:1278 -#: pisi/cli/commands.py:1342 pisi/cli/commands.py:1381 -#: pisi/cli/commands.py:1421 pisi/cli/commands.py:1555 +#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 +#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 +#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 msgid "Show in long format" msgstr "Toon in lang formaat" -#: pisi/cli/commands.py:1047 +#: pisi/cli/commands.py:1048 msgid "List installed packages under given component" msgstr "Toon geïnstalleerde pakketten onder gegeven component" -#: pisi/cli/commands.py:1049 pisi/cli/commands.py:1425 +#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 msgid "Show detailed install info" msgstr "Toon gedetailleerde installatie-informatie" # pisi/cli/commands.py:542 :729 -#: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 -msgid "" -"Package Name |St| Version| Rel.| Build| Distro| Date" +#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "Pakketnaam |St| Versie| Rel.| Bouw | Distro| Datum" -#: pisi/cli/commands.py:1081 +#: pisi/cli/commands.py:1082 msgid "" "Rebuild Databases\n" "\n" @@ -1902,19 +1897,19 @@ msgstr "" "Als pakketspecificaties worden gegeven, geef dan de namen van de\n" "pakketmappen onder /var/lib/pisi\n" -#: pisi/cli/commands.py:1099 +#: pisi/cli/commands.py:1100 msgid "rebuild-db options" msgstr "rebuild-db opties" -#: pisi/cli/commands.py:1102 +#: pisi/cli/commands.py:1103 msgid "Rebuild files database" msgstr "Herbouw bestanden database" -#: pisi/cli/commands.py:1113 +#: pisi/cli/commands.py:1114 msgid "Rebuild PiSi databases?" msgstr "PiSi-databases herbouwen?" -#: pisi/cli/commands.py:1120 +#: pisi/cli/commands.py:1121 msgid "" "Update repository databases\n" "\n" @@ -1934,15 +1929,15 @@ msgstr "" "Synchroniseert de PiSi-databases met de huidige repository.\n" "Indien geen repository opgegeven is worden alle repositories bijgewerkt.\n" -#: pisi/cli/commands.py:1138 +#: pisi/cli/commands.py:1139 msgid "update-repo options" msgstr "update-repo opties" -#: pisi/cli/commands.py:1142 +#: pisi/cli/commands.py:1143 msgid "Update database in any case" msgstr "Database altijd bijwerken" -#: pisi/cli/commands.py:1160 +#: pisi/cli/commands.py:1161 msgid "" "Add a repository\n" "\n" @@ -1969,23 +1964,23 @@ msgstr "" "Opmerking: we ondersteunen vooralsnog alleen lokale bestanden (b.v. /a/b/c) " "en http: // URI's.\n" -#: pisi/cli/commands.py:1180 +#: pisi/cli/commands.py:1181 msgid "add-repo options" msgstr "add-repo opties" -#: pisi/cli/commands.py:1183 +#: pisi/cli/commands.py:1184 msgid "Add repository at given position (0 is first)" msgstr "Toevoegen repository op gegeven positie (0 is eerst)" -#: pisi/cli/commands.py:1197 +#: pisi/cli/commands.py:1198 msgid "Update PiSi database for repository %s?" msgstr "Bijwerken PiSi-database voor repository %s?" -#: pisi/cli/commands.py:1201 +#: pisi/cli/commands.py:1202 msgid "%s repository could not be reached. Removing %s from system." msgstr "%s repository kan niet bereikt worden. Verwijderd %s van systeem." -#: pisi/cli/commands.py:1210 +#: pisi/cli/commands.py:1211 msgid "" "Remove repositories\n" "\n" @@ -1999,7 +1994,7 @@ msgstr "" "\n" "Verwijdert alle repository-informatie van het systeem.\n" -#: pisi/cli/commands.py:1236 +#: pisi/cli/commands.py:1237 msgid "" "List repositories\n" "\n" @@ -2013,7 +2008,7 @@ msgstr "" "\n" "Toont de huidige opgespoorde repositories.\n" -#: pisi/cli/commands.py:1259 +#: pisi/cli/commands.py:1260 msgid "" "List available packages in the repositories\n" "\n" @@ -2032,27 +2027,27 @@ msgstr "" "opgegeven is worden de pakketten in alle repositories\n" "getoond.\n" -#: pisi/cli/commands.py:1276 +#: pisi/cli/commands.py:1277 msgid "list-available options" msgstr "list-available opties" -#: pisi/cli/commands.py:1280 +#: pisi/cli/commands.py:1281 msgid "List available packages under given component" msgstr "Toon aanwezige pakketten onder gegeven component" -#: pisi/cli/commands.py:1282 +#: pisi/cli/commands.py:1283 msgid "Show uninstalled packages only" msgstr "Toon alleen niet-geïnstalleerde pakketten" -#: pisi/cli/commands.py:1290 +#: pisi/cli/commands.py:1291 msgid "Installed packages are shown in this color" msgstr "Geïnstalleerde pakketten worden in deze kleur weergegeven" -#: pisi/cli/commands.py:1298 +#: pisi/cli/commands.py:1299 msgid "Repository : %s\n" msgstr "Repository: %s\n" -#: pisi/cli/commands.py:1325 +#: pisi/cli/commands.py:1326 msgid "" "List available components\n" "\n" @@ -2068,11 +2063,11 @@ msgstr "" "Geeft een korte lijst van PiSi componenten gepubliceerd in \n" "de repositories.\n" -#: pisi/cli/commands.py:1340 +#: pisi/cli/commands.py:1341 msgid "list-components options" msgstr "list-components opties" -#: pisi/cli/commands.py:1365 +#: pisi/cli/commands.py:1366 msgid "" "List available sources\n" "\n" @@ -2086,11 +2081,11 @@ msgstr "" "\n" "Geeft een korte lijst van bronnen in de repositories.\n" -#: pisi/cli/commands.py:1379 +#: pisi/cli/commands.py:1380 msgid "list-sources options" msgstr "list-sources opties" -#: pisi/cli/commands.py:1404 +#: pisi/cli/commands.py:1405 msgid "" "List packages to be upgraded\n" "\n" @@ -2104,19 +2099,19 @@ msgstr "" "\n" "Toont pakketten die opgewaardeerd zullen worden.\n" -#: pisi/cli/commands.py:1418 +#: pisi/cli/commands.py:1419 msgid "list-upgrades options" msgstr "list-upgrades opties" -#: pisi/cli/commands.py:1423 +#: pisi/cli/commands.py:1424 msgid "List upgradable packages under given component" msgstr "Toon op te waarderen pakketten onder opgegeven component" -#: pisi/cli/commands.py:1440 pisi/operations.py:466 +#: pisi/cli/commands.py:1441 pisi/operations.py:466 msgid "No packages to upgrade." msgstr "Geen pakketten op te waarderen." -#: pisi/cli/commands.py:1460 +#: pisi/cli/commands.py:1461 msgid "" "List pending packages\n" "\n" @@ -2126,11 +2121,11 @@ msgstr "" "\n" "Toont pakketten wachtend op configuratie\n" -#: pisi/cli/commands.py:1482 +#: pisi/cli/commands.py:1483 msgid "There are no packages waiting to be configured" msgstr "Er zijn geen pakketten die wachten op configuratie" -#: pisi/cli/commands.py:1487 +#: pisi/cli/commands.py:1488 msgid "" "Search packages\n" "\n" @@ -2146,23 +2141,23 @@ msgstr "" "Vindt een pakket met de opgegeven zoekterm\n" "in de samenvatting, beschrijving en/of pakketnaam.\n" -#: pisi/cli/commands.py:1502 +#: pisi/cli/commands.py:1503 msgid "search options" msgstr "search opties" -#: pisi/cli/commands.py:1505 +#: pisi/cli/commands.py:1506 msgid "Set search language" msgstr "Stel zoektaal in" -#: pisi/cli/commands.py:1510 +#: pisi/cli/commands.py:1511 msgid "Show details" msgstr "Toon details" -#: pisi/cli/commands.py:1530 +#: pisi/cli/commands.py:1523 msgid "%s packages found" msgstr "%s pakketten gevonden" -#: pisi/cli/commands.py:1539 +#: pisi/cli/commands.py:1532 msgid "" "Search for a file\n" "\n" @@ -2176,35 +2171,35 @@ msgstr "" "\n" "Vindt het geïnstalleerde pakket dat het opgegeven bestand bevat.\n" -#: pisi/cli/commands.py:1553 +#: pisi/cli/commands.py:1546 msgid "search-file options" msgstr "search-file opties" -#: pisi/cli/commands.py:1557 +#: pisi/cli/commands.py:1550 msgid "Fuzzy search" msgstr "Vage zoekopdracht" -#: pisi/cli/commands.py:1559 +#: pisi/cli/commands.py:1552 msgid "Show only package name" msgstr "Toon alleen pakketnaam" -#: pisi/cli/commands.py:1580 +#: pisi/cli/commands.py:1573 msgid "Package %s has file %s" msgstr "Pakket %s bevat bestand %s" -#: pisi/cli/commands.py:1582 +#: pisi/cli/commands.py:1575 msgid "Type: %s, Hash: %s" msgstr "Type: %s, Hash: %s" -#: pisi/cli/commands.py:1585 +#: pisi/cli/commands.py:1578 msgid "Path '%s' does not belong to an installed package" msgstr "Pad '%s' hoort niet bij een geïnstalleerd pakket" -#: pisi/cli/commands.py:1598 +#: pisi/cli/commands.py:1591 msgid "Searching for %s" msgstr "Zoekt naar %s" -#: pisi/cli/commands.py:1608 +#: pisi/cli/commands.py:1601 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2216,7 +2211,7 @@ msgstr "" "waar één is van:\n" "\n" -#: pisi/cli/commands.py:1614 +#: pisi/cli/commands.py:1607 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2362,8 +2357,7 @@ msgid "Access denied to destination file: \"%s\"" msgstr "Toegang geweigerd van doelbestand: \"%s\" " #: pisi/fetcher.py:100 -msgid "" -"A problem occured. Please check the archive address and/or permissions again." +msgid "A problem occured. Please check the archive address and/or permissions again." msgstr "" "Probleem plaatsgevonden. Controleer het archiefadres en/of de " "toegangsrechten opnieuw." @@ -2515,8 +2509,7 @@ msgstr "" "db uit." #: pisi/lockeddbshelve.py:51 -msgid "" -"Database version for %s greater than PiSi version. You need a newer PiSi." +msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Databaseversie van %s is hoger dan de PiSi-versie. Een nieuwere versie van " "PiSi is nodig." @@ -2554,8 +2547,7 @@ msgid "Cannot attain read or write access to database %s" msgstr "Kan geen lees- of schrijftoegang krijgen tot de database %s" #: pisi/lockeddbshelve.py:139 -msgid "" -"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Opties moeten een van 'r', 'w', 'c' of 'n' zijn of gebruik de opties bsddb." "db.DB_*" @@ -3023,10 +3015,8 @@ msgstr "" "%s\n" #: scripts/repostats.py:371 -msgid "" -"Developer '%s <%s>' has another mail address '%s' in source package '%s'" -msgstr "" -"Ontwikkelaar '%s <%s>' heeft een ander e-mailadres '%s' in bronpakket '%s'" +msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "Ontwikkelaar '%s <%s>' heeft een ander e-mailadres '%s' in bronpakket '%s'" #: scripts/repostats.py:467 msgid "" @@ -3052,14 +3042,3 @@ msgstr "Scannen bron-repository...\n" msgid "Scanning binary packages...\n" msgstr "Scannen binaire pakketten...\n" -#~ msgid "Unknown file type '%s' in package '%s'" -#~ msgstr "Onbekend bestandstype '%s' in pakket '%s'" - -#~ msgid "Source package '%s' has wrong date format '%s'" -#~ msgstr "Bronpakket '%s' heeft een onjuiste datumopmaak: '%s'" - -#~ msgid "Encountered %d errors! Fix them immediately!\n" -#~ msgstr "%d problemen gevonden! Repareer ze onmiddellijk!\n" - -#~ msgid "These dependencies are not available in repository:\n" -#~ msgstr "Deze afhankelijkheden zijn niet beschikbaar in de repository:\n" diff --git a/po/pisi.pot b/po/pisi.pot index 7c24b3d0..2a243cee 100644 --- a/po/pisi.pot +++ b/po/pisi.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-02-28 20:09+EET\n" +"POT-Creation-Date: 2007-03-02 16:01+EET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -366,7 +366,7 @@ msgid "" msgstr "" #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "" @@ -376,7 +376,7 @@ msgstr "" msgid "No configure script found." msgstr "" -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 #: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 #: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 #: pisi/actionsapi/scons.py:39 @@ -384,15 +384,15 @@ msgid "Make failed." msgstr "" #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 -#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." msgstr "" #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 -#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "" @@ -416,7 +416,7 @@ msgstr "" msgid "Running autoheader failed." msgstr "" -#: pisi/actionsapi/cmaketools.py:69 +#: pisi/actionsapi/cmaketools.py:64 msgid "No configure script found for cmake." msgstr "" @@ -553,81 +553,81 @@ msgstr "" msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "" -#: pisi/api.py:302 pisi/comariface.py:30 +#: pisi/api.py:299 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "" -#: pisi/api.py:314 +#: pisi/api.py:311 msgid "File %s not found" msgstr "" -#: pisi/api.py:375 +#: pisi/api.py:364 msgid "Checking /%s " msgstr "" -#: pisi/api.py:379 +#: pisi/api.py:368 msgid "" "\n" "Corrupt file: %s" msgstr "" -#: pisi/api.py:381 pisi/cli/commands.py:966 +#: pisi/api.py:370 pisi/cli/commands.py:967 msgid "OK" msgstr "" -#: pisi/api.py:394 +#: pisi/api.py:383 msgid "* Building index of PiSi files under %s" msgstr "" -#: pisi/api.py:401 +#: pisi/api.py:390 msgid "* Index file written" msgstr "" -#: pisi/api.py:405 +#: pisi/api.py:394 msgid "Repo %s already present." msgstr "" -#: pisi/api.py:409 +#: pisi/api.py:398 msgid "Repo %s added to system." msgstr "" -#: pisi/api.py:415 +#: pisi/api.py:404 msgid "Repo %s removed from system." msgstr "" -#: pisi/api.py:417 +#: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." msgstr "" -#: pisi/api.py:424 +#: pisi/api.py:413 msgid "* Updating repository: %s" msgstr "" -#: pisi/api.py:432 +#: pisi/api.py:421 msgid "No updates available for repository %s." msgstr "" -#: pisi/api.py:434 +#: pisi/api.py:423 msgid "Updating database at any rate as requested" msgstr "" -#: pisi/api.py:445 +#: pisi/api.py:434 msgid "* Package database updated." msgstr "" -#: pisi/api.py:447 pisi/api.py:472 +#: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." msgstr "" -#: pisi/api.py:455 +#: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " msgstr "" -#: pisi/api.py:468 +#: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" msgstr "" -#: pisi/api.py:525 +#: pisi/api.py:514 msgid "Rebuilding package database" msgstr "" @@ -1188,75 +1188,75 @@ msgid "" "to be downloaded from a repository containing sources.\n" msgstr "" -#: pisi/cli/commands.py:433 +#: pisi/cli/commands.py:434 msgid "build options" msgstr "" -#: pisi/cli/commands.py:441 +#: pisi/cli/commands.py:442 msgid "Output directory for produced packages" msgstr "" -#: pisi/cli/commands.py:444 +#: pisi/cli/commands.py:445 msgid "Bypass errors from ActionsAPI" msgstr "" -#: pisi/cli/commands.py:446 pisi/cli/commands.py:554 +#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 msgid "Bypass safety switch" msgstr "" -#: pisi/cli/commands.py:448 +#: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "" -#: pisi/cli/commands.py:450 +#: pisi/cli/commands.py:451 msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "" -#: pisi/cli/commands.py:452 +#: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" msgstr "" -#: pisi/cli/commands.py:455 +#: pisi/cli/commands.py:456 msgid "build steps" msgstr "" -#: pisi/cli/commands.py:457 +#: pisi/cli/commands.py:458 msgid "Break build after fetching the source archive" msgstr "" -#: pisi/cli/commands.py:459 +#: pisi/cli/commands.py:460 msgid "Break build after unpacking the source archive, checking sha1sum and applying patches" msgstr "" -#: pisi/cli/commands.py:461 +#: pisi/cli/commands.py:462 msgid "Break build after running configure step" msgstr "" -#: pisi/cli/commands.py:463 +#: pisi/cli/commands.py:464 msgid "Break build after running compile step" msgstr "" -#: pisi/cli/commands.py:465 +#: pisi/cli/commands.py:466 msgid "Break build after running install step" msgstr "" -#: pisi/cli/commands.py:467 +#: pisi/cli/commands.py:468 msgid "create PiSi package" msgstr "" -#: pisi/cli/commands.py:481 +#: pisi/cli/commands.py:482 msgid "package_format must be one of %s " msgstr "" -#: pisi/cli/commands.py:484 pisi/cli/commands.py:533 +#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 msgid "Output directory: %s" msgstr "" -#: pisi/cli/commands.py:486 +#: pisi/cli/commands.py:487 msgid "Outputting packages in the working directory." msgstr "" -#: pisi/cli/commands.py:497 +#: pisi/cli/commands.py:498 #, docstring msgid "" "Build and install PiSi source packages from repository\n" @@ -1269,36 +1269,36 @@ msgid "" "You can also give the name of a component.\n" msgstr "" -#: pisi/cli/commands.py:516 +#: pisi/cli/commands.py:517 msgid "emerge options" msgstr "" -#: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 +#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 msgid "Ignore file conflicts" msgstr "" -#: pisi/cli/commands.py:521 pisi/cli/commands.py:594 pisi/cli/commands.py:658 +#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 msgid "Ignore package conflicts" msgstr "" -#: pisi/cli/commands.py:523 pisi/cli/commands.py:552 +#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 msgid "Bypass comar configuration agent" msgstr "" -#: pisi/cli/commands.py:535 +#: pisi/cli/commands.py:536 msgid "Outputting binary packages in the package cache." msgstr "" -#: pisi/cli/commands.py:543 +#: pisi/cli/commands.py:544 #, docstring msgid "Abstract package operation command" msgstr "" -#: pisi/cli/commands.py:556 +#: pisi/cli/commands.py:557 msgid "Do not perform any action, just show what would be done" msgstr "" -#: pisi/cli/commands.py:567 +#: pisi/cli/commands.py:568 #, docstring msgid "" "Install PiSi packages\n" @@ -1312,23 +1312,23 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:585 +#: pisi/cli/commands.py:586 msgid "install options" msgstr "" -#: pisi/cli/commands.py:590 +#: pisi/cli/commands.py:591 msgid "Reinstall already installed packages" msgstr "" -#: pisi/cli/commands.py:596 +#: pisi/cli/commands.py:597 msgid "Install component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:598 pisi/cli/commands.py:662 +#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 msgid "Fetch upgrades but do not install." msgstr "" -#: pisi/cli/commands.py:621 +#: pisi/cli/commands.py:622 #, docstring msgid "" "Upgrade PiSi packages\n" @@ -1349,39 +1349,39 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:647 +#: pisi/cli/commands.py:648 msgid "upgrade options" msgstr "" -#: pisi/cli/commands.py:652 +#: pisi/cli/commands.py:653 msgid "Security related package upgrades only" msgstr "" -#: pisi/cli/commands.py:654 +#: pisi/cli/commands.py:655 msgid "Do not update repositories" msgstr "" -#: pisi/cli/commands.py:660 +#: pisi/cli/commands.py:661 msgid "Upgrade component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:664 +#: pisi/cli/commands.py:665 msgid "When upgrading system, ignore packages and components whose basenames match pattern." msgstr "" -#: pisi/cli/commands.py:666 +#: pisi/cli/commands.py:667 msgid "When upgrading system, ignore packages and components whose basenames match any pattern contained in file." msgstr "" -#: pisi/cli/commands.py:706 +#: pisi/cli/commands.py:707 msgid "Updating repositories" msgstr "" -#: pisi/cli/commands.py:711 +#: pisi/cli/commands.py:712 msgid "Will not update repositories" msgstr "" -#: pisi/cli/commands.py:733 +#: pisi/cli/commands.py:734 #, docstring msgid "" "Remove PiSi packages\n" @@ -1394,15 +1394,15 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:750 +#: pisi/cli/commands.py:751 msgid "remove options" msgstr "" -#: pisi/cli/commands.py:753 +#: pisi/cli/commands.py:754 msgid "Remove component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:775 +#: pisi/cli/commands.py:776 #, docstring msgid "" "Configure pending packages\n" @@ -1413,11 +1413,11 @@ msgid "" "configures those packages.\n" msgstr "" -#: pisi/cli/commands.py:791 +#: pisi/cli/commands.py:792 msgid "configure-pending options" msgstr "" -#: pisi/cli/commands.py:803 +#: pisi/cli/commands.py:804 #, docstring msgid "" "Display package information\n" @@ -1427,73 +1427,73 @@ msgid "" " is either a package name or a .pisi file,\n" msgstr "" -#: pisi/cli/commands.py:818 +#: pisi/cli/commands.py:819 msgid "info options" msgstr "" -#: pisi/cli/commands.py:825 +#: pisi/cli/commands.py:826 msgid "Show a list of package files." msgstr "" -#: pisi/cli/commands.py:827 +#: pisi/cli/commands.py:828 msgid "Info about the given component" msgstr "" -#: pisi/cli/commands.py:830 +#: pisi/cli/commands.py:831 msgid "Show only paths." msgstr "" -#: pisi/cli/commands.py:832 +#: pisi/cli/commands.py:833 msgid "Do not show details" msgstr "" -#: pisi/cli/commands.py:834 +#: pisi/cli/commands.py:835 msgid "Output in xml format" msgstr "" -#: pisi/cli/commands.py:880 +#: pisi/cli/commands.py:881 msgid "Package file: %s" msgstr "" -#: pisi/cli/commands.py:886 +#: pisi/cli/commands.py:887 msgid "[inst] " msgstr "" -#: pisi/cli/commands.py:888 +#: pisi/cli/commands.py:889 msgid "Installed package:" msgstr "" -#: pisi/cli/commands.py:894 +#: pisi/cli/commands.py:895 msgid "[repo] " msgstr "" -#: pisi/cli/commands.py:896 +#: pisi/cli/commands.py:897 msgid "Package found in repository:" msgstr "" -#: pisi/cli/commands.py:900 +#: pisi/cli/commands.py:901 msgid "%s is not found in repositories" msgstr "" -#: pisi/cli/commands.py:903 +#: pisi/cli/commands.py:904 msgid "%s is not installed" msgstr "" -#: pisi/cli/commands.py:916 +#: pisi/cli/commands.py:917 msgid "Reverse Dependencies:" msgstr "" -#: pisi/cli/commands.py:919 +#: pisi/cli/commands.py:920 msgid "" "\n" "Files:" msgstr "" -#: pisi/cli/commands.py:927 +#: pisi/cli/commands.py:928 msgid "File information not available" msgstr "" -#: pisi/cli/commands.py:933 +#: pisi/cli/commands.py:934 #, docstring msgid "" "Verify installation\n" @@ -1509,25 +1509,25 @@ msgid "" "If no packages are given, checks all installed packages.\n" msgstr "" -#: pisi/cli/commands.py:957 +#: pisi/cli/commands.py:958 msgid "Checking all installed packages" msgstr "" -#: pisi/cli/commands.py:960 +#: pisi/cli/commands.py:961 msgid "* Checking %s... " msgstr "" -#: pisi/cli/commands.py:964 +#: pisi/cli/commands.py:965 msgid "" "\n" "Package %s is corrupt." msgstr "" -#: pisi/cli/commands.py:968 +#: pisi/cli/commands.py:969 msgid "Package %s not installed" msgstr "" -#: pisi/cli/commands.py:973 +#: pisi/cli/commands.py:974 #, docstring msgid "" "Index PiSi files in a given directory\n" @@ -1543,31 +1543,31 @@ msgid "" "everything in a single index file.\n" msgstr "" -#: pisi/cli/commands.py:994 +#: pisi/cli/commands.py:995 msgid "index options" msgstr "" -#: pisi/cli/commands.py:998 +#: pisi/cli/commands.py:999 msgid "Store absolute links for indexed files." msgstr "" -#: pisi/cli/commands.py:1001 +#: pisi/cli/commands.py:1002 msgid "Index output file" msgstr "" -#: pisi/cli/commands.py:1004 +#: pisi/cli/commands.py:1005 msgid "Do not index PiSi spec files." msgstr "" -#: pisi/cli/commands.py:1007 +#: pisi/cli/commands.py:1008 msgid "Do not sign index." msgstr "" -#: pisi/cli/commands.py:1020 +#: pisi/cli/commands.py:1021 msgid "Indexing current directory." msgstr "" -#: pisi/cli/commands.py:1028 +#: pisi/cli/commands.py:1029 #, docstring msgid "" "Print the list of all installed packages\n" @@ -1575,29 +1575,29 @@ msgid "" "Usage: list-installed\n" msgstr "" -#: pisi/cli/commands.py:1042 +#: pisi/cli/commands.py:1043 msgid "list-installed options" msgstr "" -#: pisi/cli/commands.py:1045 pisi/cli/commands.py:1278 -#: pisi/cli/commands.py:1342 pisi/cli/commands.py:1381 -#: pisi/cli/commands.py:1421 pisi/cli/commands.py:1555 +#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 +#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 +#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 msgid "Show in long format" msgstr "" -#: pisi/cli/commands.py:1047 +#: pisi/cli/commands.py:1048 msgid "List installed packages under given component" msgstr "" -#: pisi/cli/commands.py:1049 pisi/cli/commands.py:1425 +#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 msgid "Show detailed install info" msgstr "" -#: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 +#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "" -#: pisi/cli/commands.py:1081 +#: pisi/cli/commands.py:1082 #, docstring msgid "" "Rebuild Databases\n" @@ -1610,19 +1610,19 @@ msgid "" "dirs under /var/lib/pisi\n" msgstr "" -#: pisi/cli/commands.py:1099 +#: pisi/cli/commands.py:1100 msgid "rebuild-db options" msgstr "" -#: pisi/cli/commands.py:1102 +#: pisi/cli/commands.py:1103 msgid "Rebuild files database" msgstr "" -#: pisi/cli/commands.py:1113 +#: pisi/cli/commands.py:1114 msgid "Rebuild PiSi databases?" msgstr "" -#: pisi/cli/commands.py:1120 +#: pisi/cli/commands.py:1121 #, docstring msgid "" "Update repository databases\n" @@ -1635,15 +1635,15 @@ msgid "" "If no repository is given, all repositories are updated.\n" msgstr "" -#: pisi/cli/commands.py:1138 +#: pisi/cli/commands.py:1139 msgid "update-repo options" msgstr "" -#: pisi/cli/commands.py:1142 +#: pisi/cli/commands.py:1143 msgid "Update database in any case" msgstr "" -#: pisi/cli/commands.py:1160 +#: pisi/cli/commands.py:1161 #, docstring msgid "" "Add a repository\n" @@ -1658,23 +1658,23 @@ msgid "" "NB: We support only local files (e.g., /a/b/c) and http:// URIs at the moment\n" msgstr "" -#: pisi/cli/commands.py:1180 +#: pisi/cli/commands.py:1181 msgid "add-repo options" msgstr "" -#: pisi/cli/commands.py:1183 +#: pisi/cli/commands.py:1184 msgid "Add repository at given position (0 is first)" msgstr "" -#: pisi/cli/commands.py:1197 +#: pisi/cli/commands.py:1198 msgid "Update PiSi database for repository %s?" msgstr "" -#: pisi/cli/commands.py:1201 +#: pisi/cli/commands.py:1202 msgid "%s repository could not be reached. Removing %s from system." msgstr "" -#: pisi/cli/commands.py:1210 +#: pisi/cli/commands.py:1211 #, docstring msgid "" "Remove repositories\n" @@ -1684,7 +1684,7 @@ msgid "" "Remove all repository information from the system.\n" msgstr "" -#: pisi/cli/commands.py:1236 +#: pisi/cli/commands.py:1237 #, docstring msgid "" "List repositories\n" @@ -1694,7 +1694,7 @@ msgid "" "Lists currently tracked repositories.\n" msgstr "" -#: pisi/cli/commands.py:1259 +#: pisi/cli/commands.py:1260 #, docstring msgid "" "List available packages in the repositories\n" @@ -1706,28 +1706,28 @@ msgid "" "all repositories.\n" msgstr "" -#: pisi/cli/commands.py:1276 +#: pisi/cli/commands.py:1277 msgid "list-available options" msgstr "" -#: pisi/cli/commands.py:1280 +#: pisi/cli/commands.py:1281 msgid "List available packages under given component" msgstr "" -#: pisi/cli/commands.py:1282 +#: pisi/cli/commands.py:1283 msgid "Show uninstalled packages only" msgstr "" -#: pisi/cli/commands.py:1290 +#: pisi/cli/commands.py:1291 msgid "Installed packages are shown in this color" msgstr "" -#: pisi/cli/commands.py:1298 +#: pisi/cli/commands.py:1299 msgid "" "Repository : %s\n" msgstr "" -#: pisi/cli/commands.py:1325 +#: pisi/cli/commands.py:1326 #, docstring msgid "" "List available components\n" @@ -1738,11 +1738,11 @@ msgid "" "repositories.\n" msgstr "" -#: pisi/cli/commands.py:1340 +#: pisi/cli/commands.py:1341 msgid "list-components options" msgstr "" -#: pisi/cli/commands.py:1365 +#: pisi/cli/commands.py:1366 #, docstring msgid "" "List available sources\n" @@ -1752,11 +1752,11 @@ msgid "" "Gives a brief list of sources published in the repositories.\n" msgstr "" -#: pisi/cli/commands.py:1379 +#: pisi/cli/commands.py:1380 msgid "list-sources options" msgstr "" -#: pisi/cli/commands.py:1404 +#: pisi/cli/commands.py:1405 #, docstring msgid "" "List packages to be upgraded\n" @@ -1766,19 +1766,19 @@ msgid "" "Lists the packages that will be upgraded.\n" msgstr "" -#: pisi/cli/commands.py:1418 +#: pisi/cli/commands.py:1419 msgid "list-upgrades options" msgstr "" -#: pisi/cli/commands.py:1423 +#: pisi/cli/commands.py:1424 msgid "List upgradable packages under given component" msgstr "" -#: pisi/cli/commands.py:1440 pisi/operations.py:466 +#: pisi/cli/commands.py:1441 pisi/operations.py:466 msgid "No packages to upgrade." msgstr "" -#: pisi/cli/commands.py:1460 +#: pisi/cli/commands.py:1461 #, docstring msgid "" "List pending packages\n" @@ -1786,11 +1786,11 @@ msgid "" "Lists packages waiting to be configured.\n" msgstr "" -#: pisi/cli/commands.py:1482 +#: pisi/cli/commands.py:1483 msgid "There are no packages waiting to be configured" msgstr "" -#: pisi/cli/commands.py:1487 +#: pisi/cli/commands.py:1488 #, docstring msgid "" "Search packages\n" @@ -1801,23 +1801,23 @@ msgid "" "in summary, description, and package name fields.\n" msgstr "" -#: pisi/cli/commands.py:1502 +#: pisi/cli/commands.py:1503 msgid "search options" msgstr "" -#: pisi/cli/commands.py:1505 +#: pisi/cli/commands.py:1506 msgid "Set search language" msgstr "" -#: pisi/cli/commands.py:1510 +#: pisi/cli/commands.py:1511 msgid "Show details" msgstr "" -#: pisi/cli/commands.py:1530 +#: pisi/cli/commands.py:1523 msgid "%s packages found" msgstr "" -#: pisi/cli/commands.py:1539 +#: pisi/cli/commands.py:1532 #, docstring msgid "" "Search for a file\n" @@ -1827,35 +1827,35 @@ msgid "" "Finds the installed package which contains the specified file.\n" msgstr "" -#: pisi/cli/commands.py:1553 +#: pisi/cli/commands.py:1546 msgid "search-file options" msgstr "" -#: pisi/cli/commands.py:1557 +#: pisi/cli/commands.py:1550 msgid "Fuzzy search" msgstr "" -#: pisi/cli/commands.py:1559 +#: pisi/cli/commands.py:1552 msgid "Show only package name" msgstr "" -#: pisi/cli/commands.py:1580 +#: pisi/cli/commands.py:1573 msgid "Package %s has file %s" msgstr "" -#: pisi/cli/commands.py:1582 +#: pisi/cli/commands.py:1575 msgid "Type: %s, Hash: %s" msgstr "" -#: pisi/cli/commands.py:1585 +#: pisi/cli/commands.py:1578 msgid "Path '%s' does not belong to an installed package" msgstr "" -#: pisi/cli/commands.py:1598 +#: pisi/cli/commands.py:1591 msgid "Searching for %s" msgstr "" -#: pisi/cli/commands.py:1608 +#: pisi/cli/commands.py:1601 msgid "" "%prog [options] [arguments]\n" "\n" @@ -1863,7 +1863,7 @@ msgid "" "\n" msgstr "" -#: pisi/cli/commands.py:1614 +#: pisi/cli/commands.py:1607 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" diff --git a/po/tr.po b/po/tr.po index 241e26f7..ef205acb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: tr\n" -"POT-Creation-Date: 2007-02-28 20:09+EET\n" -"PO-Revision-Date: 2007-02-28 20:11+0200\n" +"POT-Creation-Date: 2007-03-02 16:01+EET\n" +"PO-Revision-Date: 2007-03-02 16:04+0200\n" "Last-Translator: Faik Uygur \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -361,7 +361,7 @@ msgstr "" # pisi/actionsapi/autotools.py:75 :85 #: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 -#: pisi/actionsapi/cmaketools.py:67 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." msgstr "Yapılandırma başarısızlığa uğradı." @@ -372,7 +372,7 @@ msgstr "Yapılandırma başarısızlığa uğradı." msgid "No configure script found." msgstr "Yapılandırma betiği bulunamadı." -#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:75 +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 #: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 #: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 #: pisi/actionsapi/scons.py:39 @@ -381,7 +381,7 @@ msgstr "İnşa başarısızlığa uğradı." # pisi/actionsapi/autotools.py:119 :127 #: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 -#: pisi/actionsapi/cmaketools.py:105 pisi/actionsapi/cmaketools.py:115 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." @@ -389,8 +389,8 @@ msgstr "Kurulum başarısızlığa uğradı." # pisi/actionsapi/autotools.py:121 :129 #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 -#: pisi/actionsapi/cmaketools.py:77 pisi/actionsapi/cmaketools.py:107 -#: pisi/actionsapi/cmaketools.py:117 pisi/actionsapi/kde.py:81 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 msgid "No Makefile found." msgstr "Makefile bulunamadı." @@ -417,9 +417,9 @@ msgid "Running autoheader failed." msgstr "autoheader çalıştırılamadı." # pisi/actionsapi/autotools.py:77 :87 -#: pisi/actionsapi/cmaketools.py:69 +#: pisi/actionsapi/cmaketools.py:64 msgid "No configure script found for cmake." -msgstr "cmake için yapılandırma betiği bulunamadı." +msgstr "cmake yapılandırma betiği bulunamadı." #: pisi/actionsapi/get.py:163 msgid "Util %s cannot be found" @@ -560,19 +560,19 @@ msgstr "ActionsAPI [copytree]: %s dizini bulunamadı." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Erişim engellendi: %s" -#: pisi/api.py:302 pisi/comariface.py:30 +#: pisi/api.py:299 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "comar paketi tam olarak kurulmamış" -#: pisi/api.py:314 +#: pisi/api.py:311 msgid "File %s not found" msgstr "Dosya %s bulunamadı." -#: pisi/api.py:375 +#: pisi/api.py:364 msgid "Checking /%s " msgstr "/%s kontrol ediliyor " -#: pisi/api.py:379 +#: pisi/api.py:368 msgid "" "\n" "Corrupt file: %s" @@ -580,63 +580,63 @@ msgstr "" "\n" "Bozuk dosya: %s" -#: pisi/api.py:381 pisi/cli/commands.py:966 +#: pisi/api.py:370 pisi/cli/commands.py:967 msgid "OK" msgstr "Tamam" -#: pisi/api.py:394 +#: pisi/api.py:383 msgid "* Building index of PiSi files under %s" msgstr "* %s altındaki PiSi dosyalarının bir indeksi yapılıyor" -#: pisi/api.py:401 +#: pisi/api.py:390 msgid "* Index file written" msgstr "* İndeks dosyası yazıldı" -#: pisi/api.py:405 +#: pisi/api.py:394 msgid "Repo %s already present." msgstr "Depo %s halihazırda var." -#: pisi/api.py:409 +#: pisi/api.py:398 msgid "Repo %s added to system." msgstr "%s isimli depo sisteme eklendi." -#: pisi/api.py:415 +#: pisi/api.py:404 msgid "Repo %s removed from system." msgstr "%s isimli depo sistemden çıkarıldı." -#: pisi/api.py:417 +#: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." msgstr "%s deposu yok. Kaldırılamıyor." -#: pisi/api.py:424 +#: pisi/api.py:413 msgid "* Updating repository: %s" msgstr "* %s deposu güncelleniyor" -#: pisi/api.py:432 +#: pisi/api.py:421 msgid "No updates available for repository %s." msgstr "%s deposu için güncelleme yok." -#: pisi/api.py:434 +#: pisi/api.py:423 msgid "Updating database at any rate as requested" msgstr "Veritabanı istek üzerine güncelleniyor" -#: pisi/api.py:445 +#: pisi/api.py:434 msgid "* Package database updated." msgstr "* Paket veritabanı güncellendi." -#: pisi/api.py:447 pisi/api.py:472 +#: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." msgstr "%s adında bir depo bulunamadı." -#: pisi/api.py:455 +#: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " msgstr "* '%s' isimli depo yeniden inşa ediliyor... " -#: pisi/api.py:468 +#: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" msgstr "%s okunurken girdi/çıktı hatası: %s" -#: pisi/api.py:525 +#: pisi/api.py:514 msgid "Rebuilding package database" msgstr "Paket veritabanı yeniden inşa ediliyor" @@ -1230,43 +1230,43 @@ msgstr "" "Yahut, kaynaklar içeren bir depodan indirilmesi için \n" "kaynak paketinin adını verebilirsiniz. \n" -#: pisi/cli/commands.py:433 +#: pisi/cli/commands.py:434 msgid "build options" msgstr "inşa seçenekleri" -#: pisi/cli/commands.py:441 +#: pisi/cli/commands.py:442 msgid "Output directory for produced packages" msgstr "Üretilecek paketler için çıktı dizini" -#: pisi/cli/commands.py:444 +#: pisi/cli/commands.py:445 msgid "Bypass errors from ActionsAPI" msgstr "ActionsAPI kaynaklı hataları esgeç" -#: pisi/cli/commands.py:446 pisi/cli/commands.py:554 +#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 msgid "Bypass safety switch" msgstr "Emniyet mandalını esgeç" -#: pisi/cli/commands.py:448 +#: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Ar dosyaları içeren bir statik paket yarat" -#: pisi/cli/commands.py:450 +#: pisi/cli/commands.py:451 msgid "Do not install build dependencies, fail if a build dependency is present" msgstr "İnşa bağımlılıklarını kurma, eğer bir inşa bağımlılığı yoksa hatayla çık" -#: pisi/cli/commands.py:452 +#: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" msgstr "PiSi ikili paket formatları: '1.0', '1.1' (öntanımlı)" -#: pisi/cli/commands.py:455 +#: pisi/cli/commands.py:456 msgid "build steps" msgstr "inşa adımları" -#: pisi/cli/commands.py:457 +#: pisi/cli/commands.py:458 msgid "Break build after fetching the source archive" msgstr "Kaynak arşivini indirdikten sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:459 +#: pisi/cli/commands.py:460 msgid "" "Break build after unpacking the source archive, checking sha1sum and " "applying patches" @@ -1274,35 +1274,35 @@ msgstr "" "Kaynak arşivini açtıktan, sha1sum kontrolü yaptıktan ve yamaları " "uyguladıktan sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:461 +#: pisi/cli/commands.py:462 msgid "Break build after running configure step" msgstr "Yapılandırma adımından sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:463 +#: pisi/cli/commands.py:464 msgid "Break build after running compile step" msgstr "Derleme adımından sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:465 +#: pisi/cli/commands.py:466 msgid "Break build after running install step" msgstr "Kurulum adımından sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:467 +#: pisi/cli/commands.py:468 msgid "create PiSi package" msgstr "PiSi paketini oluştur" -#: pisi/cli/commands.py:481 +#: pisi/cli/commands.py:482 msgid "package_format must be one of %s " msgstr "package_format, bunlardan birisi olmalı: %s" -#: pisi/cli/commands.py:484 pisi/cli/commands.py:533 +#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 msgid "Output directory: %s" msgstr "Çıktı dizini: %s" -#: pisi/cli/commands.py:486 +#: pisi/cli/commands.py:487 msgid "Outputting packages in the working directory." msgstr "Paketler çalışma dizinine yazılıyor." -#: pisi/cli/commands.py:497 +#: pisi/cli/commands.py:498 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1322,35 +1322,35 @@ msgstr "" "\n" "Bir bileşen adı da verebilirsiniz.\n" -#: pisi/cli/commands.py:516 +#: pisi/cli/commands.py:517 msgid "emerge options" msgstr "emerge seçenekleri" -#: pisi/cli/commands.py:519 pisi/cli/commands.py:592 pisi/cli/commands.py:656 +#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 msgid "Ignore file conflicts" msgstr "Dosya çakışmalarına aldırma" -#: pisi/cli/commands.py:521 pisi/cli/commands.py:594 pisi/cli/commands.py:658 +#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 msgid "Ignore package conflicts" msgstr "Paket çakışmalarına aldırma" -#: pisi/cli/commands.py:523 pisi/cli/commands.py:552 +#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 msgid "Bypass comar configuration agent" msgstr "Çomar yapılandırma aygıtını kullanma" -#: pisi/cli/commands.py:535 +#: pisi/cli/commands.py:536 msgid "Outputting binary packages in the package cache." msgstr "İkili paketler paket önbelleğine yazılıyor." -#: pisi/cli/commands.py:543 +#: pisi/cli/commands.py:544 msgid "Abstract package operation command" msgstr "" -#: pisi/cli/commands.py:556 +#: pisi/cli/commands.py:557 msgid "Do not perform any action, just show what would be done" msgstr "Hiç bir eylem gerçekleştirme, sadece ne yapılacağını göster" -#: pisi/cli/commands.py:567 +#: pisi/cli/commands.py:568 msgid "" "Install PiSi packages\n" "\n" @@ -1371,23 +1371,23 @@ msgstr "" "\n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:585 +#: pisi/cli/commands.py:586 msgid "install options" msgstr "install seçenekleri" -#: pisi/cli/commands.py:590 +#: pisi/cli/commands.py:591 msgid "Reinstall already installed packages" msgstr "Halihazırda kurulu paketi yeniden kur" -#: pisi/cli/commands.py:596 +#: pisi/cli/commands.py:597 msgid "Install component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini kur" -#: pisi/cli/commands.py:598 pisi/cli/commands.py:662 +#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 msgid "Fetch upgrades but do not install." msgstr "Yükseltilecekleri indir ama kurma" -#: pisi/cli/commands.py:621 +#: pisi/cli/commands.py:622 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1415,23 +1415,23 @@ msgstr "" "bir dosyayı yeniden kurmak istiyorsanız install komutunu kullanın. \n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:647 +#: pisi/cli/commands.py:648 msgid "upgrade options" msgstr "upgrade seçenekleri" -#: pisi/cli/commands.py:652 +#: pisi/cli/commands.py:653 msgid "Security related package upgrades only" msgstr "Sadece güvenlik ile alakalı güncellemeler" -#: pisi/cli/commands.py:654 +#: pisi/cli/commands.py:655 msgid "Do not update repositories" msgstr "Depoları güncelleme" -#: pisi/cli/commands.py:660 +#: pisi/cli/commands.py:661 msgid "Upgrade component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini güncelle" -#: pisi/cli/commands.py:664 +#: pisi/cli/commands.py:665 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1439,7 +1439,7 @@ msgstr "" "Sistemi yükseltirken paket ya da bileşen isimlerinden verilen kalıp ile " "eşleşenleri yok say" -#: pisi/cli/commands.py:666 +#: pisi/cli/commands.py:667 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1447,15 +1447,15 @@ msgstr "" "Sistemi yükseltirken paket ya da bileşen isimlerinden dosya içerisinde " "verilen kalıplardan herhangi birisi ile eşleşenleri yok say" -#: pisi/cli/commands.py:706 +#: pisi/cli/commands.py:707 msgid "Updating repositories" msgstr "Depolar güncelleniyor" -#: pisi/cli/commands.py:711 +#: pisi/cli/commands.py:712 msgid "Will not update repositories" msgstr "Depolar güncellenmeyecek" -#: pisi/cli/commands.py:733 +#: pisi/cli/commands.py:734 msgid "" "Remove PiSi packages\n" "\n" @@ -1474,15 +1474,15 @@ msgstr "" "verin.\n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:750 +#: pisi/cli/commands.py:751 msgid "remove options" msgstr "remove seçenekler" -#: pisi/cli/commands.py:753 +#: pisi/cli/commands.py:754 msgid "Remove component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini kaldır" -#: pisi/cli/commands.py:775 +#: pisi/cli/commands.py:776 msgid "" "Configure pending packages\n" "\n" @@ -1497,11 +1497,11 @@ msgstr "" "yapılmadıysa, yapılandırmayı bekleyen paketler listesine eklenirler.\n" "Bu komut bekleyen paketleri yapılandırır.\n" -#: pisi/cli/commands.py:791 +#: pisi/cli/commands.py:792 msgid "configure-pending options" msgstr "configure-pending seçenekleri" -#: pisi/cli/commands.py:803 +#: pisi/cli/commands.py:804 msgid "" "Display package information\n" "\n" @@ -1515,63 +1515,63 @@ msgstr "" "\n" " ya bir paket adıdır ya da bir .pisi dosyasıdır.\n" -#: pisi/cli/commands.py:818 +#: pisi/cli/commands.py:819 msgid "info options" msgstr "info seçenekler" -#: pisi/cli/commands.py:825 +#: pisi/cli/commands.py:826 msgid "Show a list of package files." msgstr "Paketteki dosyaların bir listesini göster." -#: pisi/cli/commands.py:827 +#: pisi/cli/commands.py:828 msgid "Info about the given component" msgstr "Verilen bileşen hakkında bilgi" -#: pisi/cli/commands.py:830 +#: pisi/cli/commands.py:831 msgid "Show only paths." msgstr "Sadece yolları göster" -#: pisi/cli/commands.py:832 +#: pisi/cli/commands.py:833 msgid "Do not show details" msgstr "Detayları gösterme" -#: pisi/cli/commands.py:834 +#: pisi/cli/commands.py:835 msgid "Output in xml format" msgstr "Xml biçiminde çıktı" -#: pisi/cli/commands.py:880 +#: pisi/cli/commands.py:881 msgid "Package file: %s" msgstr "Paket dosyası: %s" -#: pisi/cli/commands.py:886 +#: pisi/cli/commands.py:887 msgid "[inst] " msgstr "[yüklü]" -#: pisi/cli/commands.py:888 +#: pisi/cli/commands.py:889 msgid "Installed package:" msgstr "Yüklü paket:" -#: pisi/cli/commands.py:894 +#: pisi/cli/commands.py:895 msgid "[repo] " msgstr "[depo] " -#: pisi/cli/commands.py:896 +#: pisi/cli/commands.py:897 msgid "Package found in repository:" msgstr "Paket depoda bulundu:" -#: pisi/cli/commands.py:900 +#: pisi/cli/commands.py:901 msgid "%s is not found in repositories" msgstr "%s depolarda bulunamadı" -#: pisi/cli/commands.py:903 +#: pisi/cli/commands.py:904 msgid "%s is not installed" msgstr "%s kurulu değil" -#: pisi/cli/commands.py:916 +#: pisi/cli/commands.py:917 msgid "Reverse Dependencies:" msgstr "Ters bağımlılıklar:" -#: pisi/cli/commands.py:919 +#: pisi/cli/commands.py:920 msgid "" "\n" "Files:" @@ -1579,11 +1579,11 @@ msgstr "" "\n" "Dosyalar:" -#: pisi/cli/commands.py:927 +#: pisi/cli/commands.py:928 msgid "File information not available" msgstr "Dosya bilgisi bulunamadı" -#: pisi/cli/commands.py:933 +#: pisi/cli/commands.py:934 msgid "" "Verify installation\n" "\n" @@ -1608,15 +1608,15 @@ msgstr "" "bu kontrol toplamlarını kullanır. \n" "Eğer paket belirtilmemiş ise tüm paketler üzerinde doğrulama yapar.\n" -#: pisi/cli/commands.py:957 +#: pisi/cli/commands.py:958 msgid "Checking all installed packages" msgstr "Tüm kurulu paketler denetleniyor" -#: pisi/cli/commands.py:960 +#: pisi/cli/commands.py:961 msgid "* Checking %s... " msgstr "* %s kontrol ediliyor... " -#: pisi/cli/commands.py:964 +#: pisi/cli/commands.py:965 msgid "" "\n" "Package %s is corrupt." @@ -1624,11 +1624,11 @@ msgstr "" "\n" "Paket %s bozuk." -#: pisi/cli/commands.py:968 +#: pisi/cli/commands.py:969 msgid "Package %s not installed" msgstr "Paket %s kurulmamış" -#: pisi/cli/commands.py:973 +#: pisi/cli/commands.py:974 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1654,31 +1654,31 @@ msgstr "" "Eğer birden çok dizin verirseniz, komut hala çalışır, ama herşeyi\n" "tek bir indeks dosyasına koyar.\n" -#: pisi/cli/commands.py:994 +#: pisi/cli/commands.py:995 msgid "index options" msgstr "index seçenekleri" -#: pisi/cli/commands.py:998 +#: pisi/cli/commands.py:999 msgid "Store absolute links for indexed files." msgstr "İndekslenmiş dosyalar için mutlak bağlar sakla." -#: pisi/cli/commands.py:1001 +#: pisi/cli/commands.py:1002 msgid "Index output file" msgstr "İndeks çıktı dosyası" -#: pisi/cli/commands.py:1004 +#: pisi/cli/commands.py:1005 msgid "Do not index PiSi spec files." msgstr "PiSi spec dosyalarını indeksleme." -#: pisi/cli/commands.py:1007 +#: pisi/cli/commands.py:1008 msgid "Do not sign index." msgstr "İndeksi imzalama." -#: pisi/cli/commands.py:1020 +#: pisi/cli/commands.py:1021 msgid "Indexing current directory." msgstr "Şu andaki dizini indeksliyor." -#: pisi/cli/commands.py:1028 +#: pisi/cli/commands.py:1029 msgid "" "Print the list of all installed packages\n" "\n" @@ -1688,30 +1688,30 @@ msgstr "" "\n" "Kullanım: list-installed\n" -#: pisi/cli/commands.py:1042 +#: pisi/cli/commands.py:1043 msgid "list-installed options" msgstr "list-installed seçenekleri" -#: pisi/cli/commands.py:1045 pisi/cli/commands.py:1278 -#: pisi/cli/commands.py:1342 pisi/cli/commands.py:1381 -#: pisi/cli/commands.py:1421 pisi/cli/commands.py:1555 +#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 +#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 +#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 msgid "Show in long format" msgstr "Uzun biçimde göster" -#: pisi/cli/commands.py:1047 +#: pisi/cli/commands.py:1048 msgid "List installed packages under given component" msgstr "Bileşen altındaki kurulu paketleri listele" -#: pisi/cli/commands.py:1049 pisi/cli/commands.py:1425 +#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 msgid "Show detailed install info" msgstr "Detaylı kurulum bilgisi göster" # pisi/cli/commands.py:542 :729 -#: pisi/cli/commands.py:1066 pisi/cli/commands.py:1444 +#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "Paket Adı |Dm| Versiyon| Sürüm| İnşa| Dağıt.| Tarih" -#: pisi/cli/commands.py:1081 +#: pisi/cli/commands.py:1082 msgid "" "Rebuild Databases\n" "\n" @@ -1731,19 +1731,19 @@ msgstr "" "Eğer paket tanımları verildiyse /var/lib/pisi altındaki paket dizinlerinin " "adları olmalılar\n" -#: pisi/cli/commands.py:1099 +#: pisi/cli/commands.py:1100 msgid "rebuild-db options" msgstr "rebuild-db seçenekleri" -#: pisi/cli/commands.py:1102 +#: pisi/cli/commands.py:1103 msgid "Rebuild files database" msgstr "Dosya veritabanını yeniden inşa et" -#: pisi/cli/commands.py:1113 +#: pisi/cli/commands.py:1114 msgid "Rebuild PiSi databases?" msgstr "PiSi veritabanı yeniden inşa edilsin mi?" -#: pisi/cli/commands.py:1120 +#: pisi/cli/commands.py:1121 msgid "" "Update repository databases\n" "\n" @@ -1763,15 +1763,15 @@ msgstr "" "PiSi veritabanlarını depo ile eşzamanlı hale getirir.\n" " Eğer bir depo verilmediyse, bütün depolar güncellenir.\n" -#: pisi/cli/commands.py:1138 +#: pisi/cli/commands.py:1139 msgid "update-repo options" msgstr "update-repo seçenekleri" -#: pisi/cli/commands.py:1142 +#: pisi/cli/commands.py:1143 msgid "Update database in any case" msgstr "Veritabanını her halde güncelle" -#: pisi/cli/commands.py:1160 +#: pisi/cli/commands.py:1161 msgid "" "Add a repository\n" "\n" @@ -1796,23 +1796,23 @@ msgstr "" "Şimdilik sadece yerel dosyalar (örn. /a/b/c) ve http:// veya ftp:// türü \n" "adresler desteklenir\n" -#: pisi/cli/commands.py:1180 +#: pisi/cli/commands.py:1181 msgid "add-repo options" msgstr "add-repo seçenekler" -#: pisi/cli/commands.py:1183 +#: pisi/cli/commands.py:1184 msgid "Add repository at given position (0 is first)" msgstr "Belirtilen pozisyona depo ekler (0 birinci)" -#: pisi/cli/commands.py:1197 +#: pisi/cli/commands.py:1198 msgid "Update PiSi database for repository %s?" msgstr "%s isimli depo için PiSi veritabanı güncellensin mi?" -#: pisi/cli/commands.py:1201 +#: pisi/cli/commands.py:1202 msgid "%s repository could not be reached. Removing %s from system." msgstr "%s deposuna erişilemedi. %s sistemden kaldırılıyor." -#: pisi/cli/commands.py:1210 +#: pisi/cli/commands.py:1211 msgid "" "Remove repositories\n" "\n" @@ -1826,7 +1826,7 @@ msgstr "" "\n" "Sistemden ilgili bütün depo bilgisini kaldır.\n" -#: pisi/cli/commands.py:1236 +#: pisi/cli/commands.py:1237 msgid "" "List repositories\n" "\n" @@ -1840,7 +1840,7 @@ msgstr "" "\n" "Şu anda izlenen bütün depoları gösterir.\n" -#: pisi/cli/commands.py:1259 +#: pisi/cli/commands.py:1260 msgid "" "List available packages in the repositories\n" "\n" @@ -1857,27 +1857,27 @@ msgstr "" "Depoda yayımlanmış olan PiSi bileşenlerinin kısa bir listesini verir.\n" "Eğer bir depo verilmediyse, bütün depolardaki paketleri listeler.\n" -#: pisi/cli/commands.py:1276 +#: pisi/cli/commands.py:1277 msgid "list-available options" msgstr "list-available seçenekleri" -#: pisi/cli/commands.py:1280 +#: pisi/cli/commands.py:1281 msgid "List available packages under given component" msgstr "Bileşen altındaki paketleri listele" -#: pisi/cli/commands.py:1282 +#: pisi/cli/commands.py:1283 msgid "Show uninstalled packages only" msgstr "Sadece kurulu olmayan paketleri göster" -#: pisi/cli/commands.py:1290 +#: pisi/cli/commands.py:1291 msgid "Installed packages are shown in this color" msgstr "Kurulu paketler bu renkle gösterilir" -#: pisi/cli/commands.py:1298 +#: pisi/cli/commands.py:1299 msgid "Repository : %s\n" msgstr "Depo: %s\n" -#: pisi/cli/commands.py:1325 +#: pisi/cli/commands.py:1326 msgid "" "List available components\n" "\n" @@ -1892,11 +1892,11 @@ msgstr "" "\n" "Depoda yayımlanmış olan PiSi bileşenlerinin kısa bir listesini verir.\n" -#: pisi/cli/commands.py:1340 +#: pisi/cli/commands.py:1341 msgid "list-components options" msgstr "list-components seçenekleri" -#: pisi/cli/commands.py:1365 +#: pisi/cli/commands.py:1366 msgid "" "List available sources\n" "\n" @@ -1910,11 +1910,11 @@ msgstr "" "\n" "Depolarda bulunan kaynakların kısa bir listesini verir.\n" -#: pisi/cli/commands.py:1379 +#: pisi/cli/commands.py:1380 msgid "list-sources options" msgstr "list-sources seçenekleri" -#: pisi/cli/commands.py:1404 +#: pisi/cli/commands.py:1405 msgid "" "List packages to be upgraded\n" "\n" @@ -1926,19 +1926,19 @@ msgstr "" "\n" "Kullanım: list-upgrades [ ... depon ]\n" -#: pisi/cli/commands.py:1418 +#: pisi/cli/commands.py:1419 msgid "list-upgrades options" msgstr "list-upgrades seçenekleri" -#: pisi/cli/commands.py:1423 +#: pisi/cli/commands.py:1424 msgid "List upgradable packages under given component" msgstr "Bileşen altındaki güncellenebilir paketleri listele" -#: pisi/cli/commands.py:1440 pisi/operations.py:466 +#: pisi/cli/commands.py:1441 pisi/operations.py:466 msgid "No packages to upgrade." msgstr "Yükseltilecek paket yok." -#: pisi/cli/commands.py:1460 +#: pisi/cli/commands.py:1461 msgid "" "List pending packages\n" "\n" @@ -1948,11 +1948,11 @@ msgstr "" "\n" "Yapılandırmayı bekleyen paketlerin bir listesini verir.\n" -#: pisi/cli/commands.py:1482 +#: pisi/cli/commands.py:1483 msgid "There are no packages waiting to be configured" msgstr "Yapılandırılmayı bekleyen paket yok" -#: pisi/cli/commands.py:1487 +#: pisi/cli/commands.py:1488 msgid "" "Search packages\n" "\n" @@ -1968,23 +1968,23 @@ msgstr "" "Belirtilen arama terimlerini özet, tanım ve paket adı \n" "alanlarında içeren paketleri bulur.\n" -#: pisi/cli/commands.py:1502 +#: pisi/cli/commands.py:1503 msgid "search options" msgstr "search seçenekleri" -#: pisi/cli/commands.py:1505 +#: pisi/cli/commands.py:1506 msgid "Set search language" msgstr "Arama dilini seç" -#: pisi/cli/commands.py:1510 +#: pisi/cli/commands.py:1511 msgid "Show details" msgstr "Detayları göster" -#: pisi/cli/commands.py:1530 +#: pisi/cli/commands.py:1523 msgid "%s packages found" msgstr "%s paket bulundu" -#: pisi/cli/commands.py:1539 +#: pisi/cli/commands.py:1532 msgid "" "Search for a file\n" "\n" @@ -1998,35 +1998,35 @@ msgstr "" "\n" "Belirtilen dosyayı içeren paketi bulur.\n" -#: pisi/cli/commands.py:1553 +#: pisi/cli/commands.py:1546 msgid "search-file options" msgstr "search-file seçenekleri" -#: pisi/cli/commands.py:1557 +#: pisi/cli/commands.py:1550 msgid "Fuzzy search" msgstr "Yaklaşık arama" -#: pisi/cli/commands.py:1559 +#: pisi/cli/commands.py:1552 msgid "Show only package name" msgstr "Sadece paket ismi göster" -#: pisi/cli/commands.py:1580 +#: pisi/cli/commands.py:1573 msgid "Package %s has file %s" msgstr "%s paketi içinde %s dosyası var" -#: pisi/cli/commands.py:1582 +#: pisi/cli/commands.py:1575 msgid "Type: %s, Hash: %s" msgstr "Tip: %s, Hash: %s" -#: pisi/cli/commands.py:1585 +#: pisi/cli/commands.py:1578 msgid "Path '%s' does not belong to an installed package" msgstr "Yol '%s' yerleştirilmiş bir pakete ait değil" -#: pisi/cli/commands.py:1598 +#: pisi/cli/commands.py:1591 msgid "Searching for %s" msgstr "%s'i arıyor" -#: pisi/cli/commands.py:1608 +#: pisi/cli/commands.py:1601 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2038,7 +2038,7 @@ msgstr "" " aşağıdakilerden birisi olabilir:\n" "\n" -#: pisi/cli/commands.py:1614 +#: pisi/cli/commands.py:1607 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" From 2507fc038863dfdff4a5113b907ca4de5bb296ef Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 15:02:37 +0000 Subject: [PATCH 024/212] merge fix for bug #4834 by gurer. the right way to calculate installedsize is to iterate through self.files of the current package. A source package may produce multiple packages as in skim-tables src package. Iterating through package.files ( s of pspec.xml) and calculating the size with util.dir_size is not the right approach. Some files that are in other produced packages may also be added to an unrelated package's - that actually has not that file - in its size calculation approach. --- pisi/build.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 0db8791a..e68a0c9f 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -569,14 +569,8 @@ class Builder: metadata.package.packageFormat = ctx.get_option('package_format') size = 0 - if package.debug_package: - d = self.pkg_debug_dir() - else: - d = self.pkg_install_dir() - - for path in package.files: - for p in glob.glob(util.join_path(d, path.path)): - size += util.dir_size(p) + for fileinfo in self.files.list: + size += fileinfo.size metadata.package.installedSize = size From f9270cc87090c3c9dfdd9fef723fe986966dbb5c Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 19:32:26 +0000 Subject: [PATCH 025/212] * increase sha1sum calculation performance by reading in blocks instead of lines. a patch by gurer. --- pisi/util.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pisi/util.py b/pisi/util.py index d2709b31..9e90e02e 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -433,8 +433,19 @@ def sha1_file(filename): try: m = sha.new() f = file(filename, 'rb') - for line in f: - m.update(line) + while True: + # 256 KB seems ideal for speed/memory tradeoff + # It wont get much faster with bigger blocks, but + # heap peak grows + block = f.read(256 * 1024) + if len(block) == 0: + # end of file + break + m.update(block) + # Simple trick to keep total heap even lower + # Delete the previous block, so while next one is read + # we wont have two allocated blocks with same size + del block return m.hexdigest() except IOError: raise FileError(_("I/O Error: Cannot calculate SHA1 hash of %s") % filename) From d56c24cb34b902dbc23b96377bd9025bca4aa212 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 19:44:21 +0000 Subject: [PATCH 026/212] * pisi 1.1.1 is coming... --- pisi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/__init__.py b/pisi/__init__.py index 7c68b663..13b3dc84 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,7 +12,7 @@ # PiSi version -__version__ = "1.1" +__version__ = "1.1.1" __dbversion__ = "1.1_rc7" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck From f55026ee031c76e508e4d12078f0156ec8961460 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 20:37:16 +0000 Subject: [PATCH 027/212] svndist should export pisi-1.1 branch here... --- tools/svndist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/svndist.py b/tools/svndist.py index dfc3896c..9b62b430 100755 --- a/tools/svndist.py +++ b/tools/svndist.py @@ -23,7 +23,7 @@ if os.path.exists('svndist/pisi-%s' % ver): shutil.rmtree('svndist/pisi-%s' % ver) print 'Exporting svn directory' -run('svn export http://svn.uludag.org.tr/uludag/trunk/pisi svndist/pisi-%s' % ver) +run('svn export http://svn.uludag.org.tr/uludag/branches/pisi-1.1 svndist/pisi-%s' % ver) os.chdir('svndist') run('tar cjvf pisi-%s.tar.bz2 pisi-%s' % (ver, ver)) From 729ddf079a7c7552c4ca925b1256fc270082b6aa Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 2 Mar 2007 20:52:52 +0000 Subject: [PATCH 028/212] * removed option --- pisi/cli/commands.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 88e1f249..b6cf5853 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1502,8 +1502,6 @@ in summary, description, and package name fields. def options(self): group = OptionGroup(self.parser, _("search options")) super(Search, self).add_options(group) - group.add_option("-L", "--language", action="store", - help=_("Set search language")) group.remove_option("--component") group.remove_option("--short") group.remove_option("--xml") From 82c39f75e7dff72a2777828abb8e830f32d282f1 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 8 Mar 2007 13:22:03 +0000 Subject: [PATCH 029/212] * search for package-manager --- pisi/api.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pisi/api.py b/pisi/api.py index 9bc3a31c..a2b2ed83 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -339,6 +339,9 @@ def info_name(package_name, installed=False): return metadata, files def search_package_terms(terms, repo = pisi.itembyrepodb.all): + return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo) + +def search_in_packages(terms, packages, repo = pisi.itembyrepodb.all): def search(package, term): term = unicode(term).lower() @@ -348,7 +351,7 @@ def search_package_terms(terms, repo = pisi.itembyrepodb.all): return True found = [] - for name in ctx.packagedb.list_packages(repo): + for name in packages: pkg = ctx.packagedb.get_package(name, repo) if terms == filter(lambda x:search(pkg, x), terms): found.append(name) From 22d8d3a927f1e9c48bf4b640d68896fdfa1dc3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 19 Mar 2007 20:31:38 +0000 Subject: [PATCH 030/212] backport from trunk --- pisi/cli/commands.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index b6cf5853..9ef11827 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -719,6 +719,9 @@ expanded to package names. packages.extend(ctx.componentdb.get_union_packages(name, walk=True)) packages.extend(self.args) + if packages = []: + packages = ctx.installdb.list_installed() + if ctx.get_option('exclude_from'): packages = self.exclude_from(packages) From 35847b93df129c22fc9725513e92e4021bac5df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 19 Mar 2007 20:32:31 +0000 Subject: [PATCH 031/212] =?UTF-8?q?=C3=B6h=C3=B6m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/cli/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 9ef11827..f469a6e7 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -719,7 +719,7 @@ expanded to package names. packages.extend(ctx.componentdb.get_union_packages(name, walk=True)) packages.extend(self.args) - if packages = []: + if packages == []: packages = ctx.installdb.list_installed() if ctx.get_option('exclude_from'): From c836f33d735f74a24845027b053a4d258f00056b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 23 Mar 2007 14:35:16 +0000 Subject: [PATCH 032/212] [DELTA] Delta merge from pisi-delta branch --- pisi/atomicoperations.py | 61 ++++++++++++++++-- pisi/cli/commands.py | 49 +++++++++++++++ pisi/delta.py | 132 +++++++++++++++++++++++++++++++++++++++ pisi/index.py | 23 ++++++- pisi/metadata.py | 16 +++++ pisi/operations.py | 22 +++++-- pisi/package.py | 5 ++ pisi/util.py | 12 ++++ 8 files changed, 306 insertions(+), 14 deletions(-) create mode 100644 pisi/delta.py diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 2cbfb564..86bea8a2 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -18,6 +18,7 @@ _ = __trans.ugettext import sys import os import bsddb3.db as db +import shutil import pisi import pisi.context as ctx @@ -31,6 +32,7 @@ from pisi.files import Files from pisi.uri import URI import pisi.ui from pisi.version import Version +from pisi.delta import find_relocations class Error(pisi.Error): pass @@ -66,14 +68,25 @@ class Install(AtomicOperation): ctx.ui.info(_("Package %s found in repository %s") % (name, repo)) repo = ctx.repodb.get_repo(repo) pkg = ctx.packagedb.get_package(name) + delta = None - # FIXME: let pkg.packageURI be stored as URI type rather than string - pkg_uri = URI(pkg.packageURI) - if pkg_uri.is_absolute_path(): - pkg_path = str(pkg.packageURI) + # Package is installed. This is an upgrade. Check delta. + if ctx.installdb.is_installed(pkg.name): + (version, release, build) = ctx.installdb.get_version(pkg.name) + delta = pkg.get_delta(buildFrom=build) + + # If delta exists than use the delta uri. + if delta: + pkg_uri = delta.packageURI + else: + pkg_uri = pkg.packageURI + + uri = URI(pkg_uri) + if uri.is_absolute_path(): + pkg_path = str(pkg_uri) else: pkg_path = os.path.join(os.path.dirname(repo.indexuri.get_uri()), - str(pkg_uri.path())) + str(uri.path())) ctx.ui.info(_("Package URI: %s") % pkg_path, verbose=True) @@ -287,9 +300,42 @@ class Install(AtomicOperation): oldconfig = path + '.old' if os.path.exists(newconfig): os.unlink(newconfig) - os.rename(path, newconfig) + + # In the case of delta packages: the old package and the new package + # may contain same config typed files with same hashes, so the delta + # package will not have that config file. In order to protect user + # changed config files, they are renamed with ".old" prefix in case + # of the hashes of these files on the filesystem and the new config + # file that is coming from the new package. But in delta package case + # with the given scenario there wont be any, so we can pass this one. + # If the config files were not be the same between these packages the + # delta package would have it and extract it and the path would point + # to that new config file. If they are same and the user had changed + # that file and using the changed config file, there is no problem + # here. + if os.path.exists(path): + os.rename(path, newconfig) + os.rename(oldconfig, path) + # Delta package does not contain the files that have the same hash as in + # the old package's. Because it means the file has not changed. But some + # of these files may be relocated to some other directory in the new package. + # We handle these cases here. + def relocate_files(): + for old_file, new_file in find_relocations(self.old_files, self.files): + old_path, new_path = ("/" + old_file.path, "/" + new_file.path) + + destdir = os.path.dirname(new_path) + if not os.path.exists(destdir): + os.makedirs(destdir) + + if os.path.islink(old_path): + if not os.path.lexists(new_path): + os.symlink(os.readlink(old_path), new_path) + else: + shutil.copy(old_path, new_path) + # remove left over files from the old package. def clean_leftovers(): new = set(map(lambda x: str(x.path), self.files.list)) @@ -321,6 +367,9 @@ class Install(AtomicOperation): # there may be left over config files check_config_changed(file) + if self.package_fname.endswith(ctx.const.delta_package_suffix): + relocate_files() + self.package.extract_install(ctx.config.dest_dir()) if config_changed: diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index f469a6e7..1e5fd2d1 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -494,6 +494,55 @@ to be downloaded from a repository containing sources. pisi.api.build(x) self.finalize() +class Delta(Command): + """Creates delta PiSi packages + +Usage: delta oldpackage newpackage + +Delta command finds the changed files between the given packages by comparing the sha1sum of the files +and creates a delta pisi package with the changed files between two releases. + +""" + __metaclass__ = autocommand + + def __init__(self, args): + super(Delta, self).__init__(args) + + name = ("delta", "dt") + + def options(self): + + group = OptionGroup(self.parser, _("delta options")) + self.add_options(group) + self.parser.add_option_group(group) + + def add_options(self, group): + group.add_option("-O", "--output-dir", action="store", default=None, + help=_("Output directory for produced packages")) + + def run(self): + + from pisi.delta import create_delta_package + + self.init(database=False, write=False) + + if len(self.args) is not 2: + self.help() + return + + if ctx.get_option('output_dir'): + ctx.ui.info(_('Output directory: %s') % ctx.config.options.output_dir) + else: + ctx.ui.info(_('Outputting packages in the working directory.')) + ctx.config.options.output_dir = '.' + + oldpackage = self.args[0] + newpackage = self.args[1] + + create_delta_package(oldpackage, newpackage) + + self.finalize() + class Emerge(Build): """Build and install PiSi source packages from repository diff --git a/pisi/delta.py b/pisi/delta.py new file mode 100644 index 00000000..e9dd29fb --- /dev/null +++ b/pisi/delta.py @@ -0,0 +1,132 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2007, TUBITAK/UEKAE +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# Please read the COPYING file. + +import os +from sets import Set as set + +import gettext +__trans = gettext.translation("pisi", fallback=True) +_ = __trans.ugettext + +import pisi.context as ctx +from pisi.package import Package +import pisi.util as util +import pisi.archive as archive + +def create_delta_package(old_package, new_package): + + if old_package == new_package: + ctx.ui.error(_("Cannot create delta for same package!")) + return + + oldpkg = Package(old_package, "r") + newpkg = Package(new_package, "r") + + newmd = newpkg.get_metadata() + oldmd = oldpkg.get_metadata() + + oldfiles = oldpkg.get_files() + newfiles = newpkg.get_files() + + files_delta = find_delta(oldfiles, newfiles) + + ctx.ui.info(_("Creating delta PiSi package between %s %s") % (old_package, new_package)) + + # Unpack new package to temp + newpkg_name = util.package_name(newmd.package.name, newmd.package.version, newmd.package.release, newmd.package.build, False) + newpkg_path = util.join_path(ctx.config.tmp_dir(), newpkg_name) + newpkg.extract_to(newpkg_path, True) + + tar = archive.ArchiveTar(util.join_path(newpkg_path, ctx.const.install_tar_lzma), "tarlzma", False, False) + tar.unpack_dir(newpkg_path) + + # Create delta package + deltaname = "%s-%s-%s%s" % (oldmd.package.name, oldmd.package.build, newmd.package.build, ctx.const.delta_package_suffix) + + outdir = ctx.get_option("output_dir") + if outdir: + deltaname = util.join_path(outdir, deltaname) + + deltapkg = Package(deltaname, "w") + + c = os.getcwd() + os.chdir(newpkg_path) + + # add comar files to package + for pcomar in newmd.package.providesComar: + fname = util.join_path(ctx.const.comar_dir, pcomar.script) + deltapkg.add_to_package(fname) + + # add xmls and files + deltapkg.add_to_package(ctx.const.metadata_xml) + deltapkg.add_to_package(ctx.const.files_xml) + + # only metadata information may change in a package, so no install.tar.lzma added to delta package + if files_delta: + ctx.build_leftover = util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma) + + tar = archive.ArchiveTar(util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), "tarlzma") + for file in files_delta: + tar.add_to_archive(file.path) + tar.close() + + os.chdir(ctx.config.tmp_dir()) + deltapkg.add_to_package(ctx.const.install_tar_lzma) + + deltapkg.close() + + tmp_file = util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma) + if os.path.exists(tmp_file): + os.unlink(tmp_file) + + ctx.build_leftover = None + os.chdir(c) + + ctx.ui.info(_("Done.")) + +# Hash not equals (these are the deltas) +# Hash equal but path different ones (these are the relocations) +# Hash and also path equal ones (do nothing) + +def find_delta(oldfiles, newfiles): + + hashto_files = {} + for file in newfiles.list: + hashto_files.setdefault(file.hash, []).append(file) + + files_new = set(map(lambda x:x.hash, newfiles.list)) + files_old = set(map(lambda x:x.hash, oldfiles.list)) + files_delta = files_new - files_old + + deltas = [] + for hash in files_delta: + deltas.extend(hashto_files[hash]) + + return deltas + +def find_relocations(oldfiles, newfiles): + + files_new = {} + for file in newfiles.list: + files_new.setdefault(file.hash, []).append(file) + + files_old = {} + for file in oldfiles.list: + files_old.setdefault(file.hash, []).append(file) + + relocations = [] + for hash in files_new.keys(): + if hash and hash in files_old: + for i in range(len(files_new[hash])): + if files_old[hash][0].path != files_new[hash][i].path: + relocations.append((files_old[hash][0], files_new[hash][i])) + + return relocations diff --git a/pisi/index.py b/pisi/index.py index 7ac82a48..8d3d38c3 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -88,10 +88,16 @@ class Index(XmlFile): self.repo_dir = repo_uri packages = [] + deltas = {} for root, dirs, files in os.walk(repo_uri): for fn in files: - if fn.endswith(ctx.const.package_suffix): + + if fn.endswith(ctx.const.delta_package_suffix): + name, version = util.parse_package_name(fn) + deltas.setdefault(name, []).append(os.path.join(root, fn)) + elif fn.endswith(ctx.const.package_suffix): packages.append(os.path.join(root, fn)) + if fn == 'component.xml': ctx.ui.info(_('Adding %s to component index') % fn) self.add_component(os.path.join(root, fn)) @@ -106,7 +112,7 @@ class Index(XmlFile): pkg_name = util.parse_package_name(os.path.basename(pkg))[0] if pkg_name not in obsoletes_list: ctx.ui.info(_('Adding %s to package index') % pkg) - self.add_package(pkg, repo_uri) + self.add_package(pkg, deltas, repo_uri) def update_db(self, repo, txn = None): # FIXME: updating db takes too much time. So a notify mechanism is used to inform the status @@ -133,7 +139,7 @@ class Index(XmlFile): ctx.sourcedb.add_spec(sf, repo, txn=txn) update_progress() - def add_package(self, path, repo_uri): + def add_package(self, path, deltas, repo_uri): package = Package(path, 'r') md = package.get_metadata() md.package.packageSize = os.path.getsize(path) @@ -153,6 +159,17 @@ class Index(XmlFile): # No need to carry these with index (#3965) md.package.files = None md.package.additionalFiles = None + + if md.package.name in deltas: + for delta_path in deltas[md.package.name]: + delta = metadata.Delta() + delta.packageURI = util.removepathprefix(repo_uri, delta_path) + delta.packageSize = os.path.getsize(delta_path) + delta.packageHash = util.sha1_file(delta_path) + name, buildFrom, buildTo = util.parse_delta_package_name(delta_path) + delta.buildFrom = buildFrom + md.package.deltaPackages.append(delta) + self.packages.append(md.package) def add_component(self, path): diff --git a/pisi/metadata.py b/pisi/metadata.py index f26e5ac1..2229221f 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -27,6 +27,14 @@ import pisi.pxml.xmlfile as xmlfile import pisi.pxml.autoxml as autoxml import pisi.util as util +class Delta: + __metaclass__ = autoxml.autoxml + + t_PackageURI = [ autoxml.String, autoxml.optional] + t_PackageSize = [ autoxml.Long, autoxml.optional] + t_PackageHash = [ autoxml.String, autoxml.optional, "SHA1Sum" ] + a_buildFrom = [autoxml.String, autoxml.optional] + class Source: __metaclass__ = autoxml.autoxml @@ -45,10 +53,18 @@ class Package(specfile.Package): t_PackageSize = [ autoxml.Long, autoxml.optional] t_PackageHash = [ autoxml.String, autoxml.optional, "SHA1Sum" ] t_PackageURI = [ autoxml.String, autoxml.optional] + t_DeltaPackages = [ [Delta], autoxml.optional] t_PackageFormat = [ autoxml.String, autoxml.optional] t_Source = [ Source, autoxml.optional] + def get_delta(self, buildFrom): + for delta in self.deltaPackages: + if delta.buildFrom == str(buildFrom): + return delta + else: + return None + def decode_hook(self, node, errs, where): self.version = self.history[0].version self.release = self.history[0].release diff --git a/pisi/operations.py b/pisi/operations.py index 1aff30ac..7aff23a6 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -799,15 +799,27 @@ def calculate_download_sizes(order): for pkg in [ctx.packagedb.get_package(name) for name in order]: - # get the cached package's path - fn = util.package_name(pkg.name, pkg.version, pkg.release, pkg.build, True) + delta = None + if ctx.installdb.is_installed(pkg.name): + (version, release, build) = ctx.installdb.get_version(pkg.name) + delta = pkg.get_delta(buildFrom=build) + + if delta: + fn = os.path.basename(delta.packageURI) + pkg_hash = delta.packageHash + pkg_size = delta.packageSize + else: + fn = os.path.basename(pkg.packageURI) + pkg_hash = pkg.packageHash + pkg_size = pkg.packageSize + path = util.join_path(ctx.config.packages_dir(), fn) # check the file and sha1sum to be sure it _is_ the cached package - if os.path.exists(path) and util.sha1_file(path) == pkg.packageHash: - cached_size += pkg.packageSize + if os.path.exists(path) and util.sha1_file(path) == pkg_hash: + cached_size += pkg_size - total_size += pkg.packageSize + total_size += pkg_size ctx.ui.notify(ui.cached, total=total_size, cached=cached_size) return total_size, cached_size diff --git a/pisi/package.py b/pisi/package.py index 42807766..ef309d1e 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -98,6 +98,11 @@ class Package: this is the function used by the installer""" self.impl.unpack_dir_flat(dir, outdir) + def extract_to(self, outdir, clean_dir = False): + """Extracts contents of the archive to outdir. Before extracting if clean_dir + is set, outdir is deleted with its contents""" + self.impl.unpack(outdir, clean_dir) + def extract_pisi_files(self, outdir): """Extract PiSi control files: metadata.xml, files.xml, action scripts, etc.""" diff --git a/pisi/util.py b/pisi/util.py index 9e90e02e..ec811b90 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -644,6 +644,18 @@ def parse_package_name(package_name): return (name, version) +def parse_delta_package_name(package_name): + """Separate delta package name and release infos + + example: tasma-5-7.pisi.delta -> (tasma, 5, 7) + + """ + name, build = parse_package_name(package_name) + build = build[:-len(ctx.const.delta_package_suffix)] + buildFrom, buildTo = build.split("-") + + return name, buildFrom, buildTo + def filter_latest_packages(package_paths): """ For a given pisi package paths list where there may also be multiple versions of the same package, filters only the latest versioned ones """ From e3b841afdfe3c985f598caf504f9a0198d63fb0b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 23 Mar 2007 14:40:34 +0000 Subject: [PATCH 033/212] [DELTA] add "delta.pisi" suffix --- pisi/constants.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pisi/constants.py b/pisi/constants.py index 45353234..5ef870e4 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -46,6 +46,9 @@ class Constants: # suffix for package names self.__c.package_suffix = ".pisi" + # delta suffix for package names + self.__c.delta_package_suffix = ".delta.pisi" + # suffix for lzma self.__c.lzma_suffix = ".lzma" From 2908b8698d42a6bf26b7048757c38f13e3e77240 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 23 Mar 2007 14:42:14 +0000 Subject: [PATCH 034/212] [DELTA] createdelta script --- scripts/createdelta.py | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 scripts/createdelta.py diff --git a/scripts/createdelta.py b/scripts/createdelta.py new file mode 100644 index 00000000..cfe00c96 --- /dev/null +++ b/scripts/createdelta.py @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2005, 2006 TUBITAK/UEKAE +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# Please read the COPYING file. + +import os +import glob +import pisi +import pisi.util as util +from pisi.version import Version +from pisi.delta import create_delta_package + +def minsandmaxes(): + + packages = map(lambda x: os.path.basename(x).split(".pisi")[0], set(glob.glob("*.pisi")) - set(glob.glob("*.delta.pisi"))) + + versions = {} + for file in packages: + name, version = util.parse_package_name(file) + versions.setdefault(name, []).append(Version(version)) + + mins = {} + maxs = {} + for pkg in versions.keys(): + mins[pkg] = min(versions[pkg]) + maxs[pkg] = max(versions[pkg]) + + return mins, maxs + +if __name__ == "__main__": + + pisi.api.init(write=False) + + mi, ma = minsandmaxes() + for pkg in mi.keys(): + old_pkg = "%s-%s.pisi" % (pkg, str(mi[pkg])) + new_pkg = "%s-%s.pisi" % (pkg, str(ma[pkg])) + name, version = util.parse_package_name(pkg) + + if not old_pkg == new_pkg: + # skip if same + if not os.path.exists("%s-%s-%s.delta.pisi" % (name, str(mi[pkg].build), str(ma[pkg].build))): + # skip if delta exists + print "%s --> Min: %s Max: %s \n %s-%s-%s.delta.pisi" % (pkg, old_pkg, new_pkg, name, str(mi[pkg].build), str(ma[pkg].build)) + create_delta_package(old_pkg, new_pkg) From b2449ae103c61d43a89d2595920a058be8a375f8 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 08:45:47 +0000 Subject: [PATCH 035/212] * remove qtLIBDIR --- pisi/actionsapi/get.py | 3 --- pisi/actionsapi/kde.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index 6b998271..67d914a2 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -143,9 +143,6 @@ def kdeDIR(): def qtDIR(): return dirs.qt -def qtLIBDIR(): - return '%s/lib/' % qtDIR() - # Binutils Variables def existBinary(bin): diff --git a/pisi/actionsapi/kde.py b/pisi/actionsapi/kde.py index 2ef46278..38ce578b 100644 --- a/pisi/actionsapi/kde.py +++ b/pisi/actionsapi/kde.py @@ -54,12 +54,12 @@ def configure(parameters = ''): --with-x \ --enable-mitshm \ --with-xinerama \ - --with-qt-dir=%s \ + --with-qt-dir=%s/lib \ --enable-mt \ --with-qt-libraries=%s \ --disable-dependency-tracking \ --disable-debug \ - %s' % (get.kdeDIR(), get.HOST(), get.qtDIR(), get.qtLIBDIR(), parameters) + %s' % (get.kdeDIR(), get.HOST(), get.qtDIR(), get.qtDIR(), parameters) if system(args): raise ConfigureError(_('Configure failed.')) From 48b14265792b3d1afda4c0d181b1a3acb757e6c8 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 08:56:58 +0000 Subject: [PATCH 036/212] * remove patch.target (merge with trunk) --- pisi/build.py | 2 +- pisi/specfile.py | 3 --- pisi/util.py | 8 +++----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index e68a0c9f..1f7efe94 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -490,7 +490,7 @@ class Builder: targetDir=ctx.config.tmp_dir()) ctx.ui.action(_("* Applying patch: %s") % patch.filename) - util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) + util.do_patch(self.srcDir, patchFile, level=patch.level) def generate_static_package_object(self): ar_files = [] diff --git a/pisi/specfile.py b/pisi/specfile.py index 636d8a34..0fa5d224 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -68,7 +68,6 @@ class Patch: s_Filename = [autoxml.String, autoxml.mandatory] a_compressionType = [autoxml.String, autoxml.optional] a_level = [autoxml.Integer, autoxml.optional] - a_target = [autoxml.String, autoxml.optional] #FIXME: what's the cleanest way to give a default value for reading level? #def decode_hook(self, node, errs, where): @@ -81,8 +80,6 @@ class Patch: s += ' (' + self.compressionType + ')' if self.level: s += ' level:' + self.level - if self.target: - s += ' target:' + self.target return s diff --git a/pisi/util.py b/pisi/util.py index ec811b90..27b53668 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -480,19 +480,17 @@ def uncompress(patchFile, compressType="gz", targetDir=None): return filePath -def do_patch(sourceDir, patchFile, level = 0, target = ''): +def do_patch(sourceDir, patchFile, level = 0): """Apply given patch to the sourceDir.""" cwd = os.getcwd() os.chdir(sourceDir) if level == None: level = 0 - if target == None: - target = '' check_file(patchFile) - (ret, out, err) = run_batch("patch -p%d %s < %s" % - (level, target, patchFile)) + (ret, out, err) = run_batch("patch -p%d < %s" % + (level, patchFile)) if ret: if out is None and err is None: # Which means stderr and stdout directed so they are None From c3f444880b86afd4eb7af63b61f0447fcf88a568 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 08:59:57 +0000 Subject: [PATCH 037/212] * Do not init database in write mode if fetch-only used. (merge from trunk) --- pisi/cli/commands.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 1e5fd2d1..dcc34f20 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -605,8 +605,8 @@ class PackageOp(Command): group.add_option("-n", "--dry-run", action="store_true", default=False, help = _("Do not perform any action, just show what would be done")) - def init(self): - super(PackageOp, self).init(True) + def init(self, database=True, write=True): + super(PackageOp, self).init(database, write) def finalize(self): #self.finalize_db() @@ -649,7 +649,11 @@ expanded to package names. self.parser.add_option_group(group) def run(self): - self.init() + + if self.options.fetch_only: + self.init(database=True, write=False) + else: + self.init() components = ctx.get_option('component') if not components and not self.args: @@ -750,7 +754,11 @@ expanded to package names. return list(packages) def run(self): - self.init() + + if self.options.fetch_only: + self.init(database=True, write=False) + else: + self.init() if not ctx.get_option('bypass_update_repo'): ctx.ui.info(_('Updating repositories')) From 7f69e6eb995501916e3ce10c8ea9eeab815e3ef1 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 09:06:23 +0000 Subject: [PATCH 038/212] * [FEATURE] Make package tests possible between build and install. (merge from trunk) --- pisi/build.py | 16 ++++++++++++++++ pisi/cli/commands.py | 4 ++++ pisi/constants.py | 1 + 3 files changed, 21 insertions(+) diff --git a/pisi/build.py b/pisi/build.py index 1f7efe94..ee43c926 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -198,6 +198,8 @@ class Builder: self.run_setup_action() self.run_build_action() + if ctx.get_option('debug') and not ctx.get_option('ignore_check'): + self.run_check_action() self.run_install_action() # after all, we are ready to build/prepare the packages @@ -324,6 +326,10 @@ class Builder: self.run_action_function(ctx.const.build_func) self.set_state("buildaction") + def run_check_action(self): + ctx.ui.action(_("Testing package...")) + self.run_action_function(ctx.const.check_func) + def run_install_action(self): ctx.ui.action(_("Installing...")) @@ -937,6 +943,12 @@ def __buildState_buildaction(pb, last): __buildState_setupaction(pb, last) pb.run_build_action() +def __buildState_checkaction(pb, last): + + if order[last] < order["buildaction"]: + __buildState_buildaction(pb, last) + pb.run_check_action() + def __buildState_installaction(pb, last): if order[last] < order["buildaction"]: @@ -979,6 +991,10 @@ def build_until(pspec, state): __buildState_buildaction(pb, last) return + if state == "check": + __buildState_checkaction(pb, last) + return + if state == "install": __buildState_installaction(pb, last) return diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index dcc34f20..6a1b636e 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -445,6 +445,8 @@ to be downloaded from a repository containing sources. help=_("Bypass errors from ActionsAPI")) group.add_option("--ignore-safety", action="store_true", default=False, help=_("Bypass safety switch")) + group.add_option("--ignore-check", action="store_true", + default=False, help=_("Bypass testing step")) group.add_option("--create-static", action="store_true", default=False, help=_("Create a static package with ar files")) group.add_option("--no-install", action="store_true", @@ -462,6 +464,8 @@ to be downloaded from a repository containing sources. const="setup", help=_("Break build after running configure step")) group.add_option("--build", dest="until", action="store_const", const="build", help=_("Break build after running compile step")) + group.add_option("--check", dest="until", action="store_const", + const="check", help=_("Break build after running check step")) group.add_option("--install", dest="until", action="store_const", const="install", help=_("Break build after running install step")) group.add_option("--package", dest="until", action="store_const", diff --git a/pisi/constants.py b/pisi/constants.py index 5ef870e4..8118c2b3 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -87,6 +87,7 @@ class Constants: # functions in actions_file self.__c.setup_func = "setup" self.__c.build_func = "build" + self.__c.check_func = "check" self.__c.install_func = "install" # file types From 34a3ca22c393c783b47830a5b070a802106fcc35 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 09:12:26 +0000 Subject: [PATCH 039/212] * Copyright spam patch by meren (merge with trunk) --- pisi-cli | 2 +- pisi-cli2.5 | 2 +- pisi/__init__.py | 2 +- pisi/actionsapi/__init__.py | 2 +- pisi/actionsapi/autotools.py | 2 +- pisi/actionsapi/coreutils.py | 2 +- pisi/actionsapi/get.py | 2 +- pisi/actionsapi/kde.py | 2 +- pisi/actionsapi/libtools.py | 2 +- pisi/actionsapi/perlmodules.py | 2 +- pisi/actionsapi/pisitools.py | 2 +- pisi/actionsapi/pisitoolsfunctions.py | 2 +- pisi/actionsapi/pythonmodules.py | 2 +- pisi/actionsapi/scons.py | 2 +- pisi/actionsapi/shelltools.py | 2 +- pisi/actionsapi/variables.py | 2 +- pisi/archive.py | 2 +- pisi/atomicoperations.py | 2 +- pisi/build.py | 2 +- pisi/cli/__init__.py | 2 +- pisi/cli/colors.py | 2 +- pisi/cli/commands.py | 2 +- pisi/cli/pisicli.py | 2 +- pisi/component.py | 2 +- pisi/config.py | 2 +- pisi/configfile.py | 2 +- pisi/conflict.py | 2 +- pisi/constants.py | 2 +- pisi/context.py | 2 +- pisi/dependency.py | 2 +- pisi/fetcher.py | 2 +- pisi/file.py | 2 +- pisi/files.py | 2 +- pisi/index.py | 2 +- pisi/installdb.py | 2 +- pisi/itembyrepodb.py | 2 +- pisi/lockeddbshelve.py | 2 +- pisi/metadata.py | 2 +- pisi/operations.py | 2 +- pisi/package.py | 2 +- pisi/pgraph.py | 2 +- pisi/pxml/__init__.py | 2 +- pisi/pxml/autoxml.py | 2 +- pisi/pxml/xmlext.py | 2 +- pisi/pxml/xmlfile.py | 2 +- pisi/repodb.py | 2 +- pisi/sourcearchive.py | 2 +- pisi/sourcedb.py | 2 +- pisi/specfile.py | 2 +- pisi/ui.py | 2 +- pisi/uri.py | 2 +- pisi/util.py | 2 +- pisi/version.py | 2 +- setup.py | 2 +- tests/actionsapitests.py | 2 +- tests/archivetests.py | 2 +- tests/autoxmltests.py | 2 +- tests/buildtests.py | 2 +- tests/configfiletests.py | 2 +- tests/constantstests.py | 2 +- tests/dependencytests.py | 2 +- tests/fetchertests.py | 2 +- tests/filestests.py | 2 +- tests/filetests.py | 2 +- tests/graphtests.py | 2 +- tests/helloworld/actions.py | 2 +- tests/installdbtests.py | 2 +- tests/metadatatests.py | 2 +- tests/ootests.py | 2 +- tests/packagedbtests.py | 2 +- tests/packagetests.py | 2 +- tests/pccts/actions.py | 2 +- tests/popt/actions.py | 2 +- tests/repodbtests.py | 2 +- tests/run.py | 2 +- tests/searchtests.py | 2 +- tests/sourcedbtests.py | 2 +- tests/specfiletests.py | 2 +- tests/testcase.py | 2 +- tests/unzip/actions.py | 2 +- tests/unzip2/actions.py | 2 +- tests/utiltests.py | 2 +- tests/versiontests.py | 2 +- tests/xmlexttests.py | 2 +- tests/zip/actions.py | 2 +- tests/zip2/actions.py | 2 +- 86 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pisi-cli b/pisi-cli index cd316a4a..0dab058c 100755 --- a/pisi-cli +++ b/pisi-cli @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi-cli2.5 b/pisi-cli2.5 index caa26255..aaeea9d1 100755 --- a/pisi-cli2.5 +++ b/pisi-cli2.5 @@ -1,6 +1,6 @@ #!/usr/bin/python2.5 # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/__init__.py b/pisi/__init__.py index 13b3dc84..d9e483af 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/__init__.py b/pisi/actionsapi/__init__.py index eeba55a7..362ca288 100644 --- a/pisi/actionsapi/__init__.py +++ b/pisi/actionsapi/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index 91586237..35be12c3 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/coreutils.py b/pisi/actionsapi/coreutils.py index 2df5f46d..381e80bf 100644 --- a/pisi/actionsapi/coreutils.py +++ b/pisi/actionsapi/coreutils.py @@ -1,6 +1,6 @@ #-*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index 67d914a2..a9b54322 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/kde.py b/pisi/actionsapi/kde.py index 38ce578b..2edde784 100644 --- a/pisi/actionsapi/kde.py +++ b/pisi/actionsapi/kde.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/libtools.py b/pisi/actionsapi/libtools.py index ae582686..a70fe2e8 100644 --- a/pisi/actionsapi/libtools.py +++ b/pisi/actionsapi/libtools.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/perlmodules.py b/pisi/actionsapi/perlmodules.py index 0937b36d..e4f4483a 100644 --- a/pisi/actionsapi/perlmodules.py +++ b/pisi/actionsapi/perlmodules.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 5a71445d..83a29eb4 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -1,6 +1,6 @@ #-*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/pisitoolsfunctions.py b/pisi/actionsapi/pisitoolsfunctions.py index b50fd5a9..d378d866 100644 --- a/pisi/actionsapi/pisitoolsfunctions.py +++ b/pisi/actionsapi/pisitoolsfunctions.py @@ -1,6 +1,6 @@ #-*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index e3fa14ce..b2a01007 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/scons.py b/pisi/actionsapi/scons.py index da44c52e..82df7ae7 100644 --- a/pisi/actionsapi/scons.py +++ b/pisi/actionsapi/scons.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py index 5ad24771..47784af8 100644 --- a/pisi/actionsapi/shelltools.py +++ b/pisi/actionsapi/shelltools.py @@ -1,6 +1,6 @@ #-*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index 19ff301d..fcc17ff2 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/archive.py b/pisi/archive.py index 8f9b2287..4e99e6ca 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 86bea8a2..a0bf2943 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/build.py b/pisi/build.py index ee43c926..74ace471 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index a5139880..826bb203 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/cli/colors.py b/pisi/cli/colors.py index dc5b9ff7..e7d37171 100644 --- a/pisi/cli/colors.py +++ b/pisi/cli/colors.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 6a1b636e..90655b19 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/cli/pisicli.py b/pisi/cli/pisicli.py index 6f07d93e..685aa781 100644 --- a/pisi/cli/pisicli.py +++ b/pisi/cli/pisicli.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/component.py b/pisi/component.py index ceb96a2c..43223995 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/config.py b/pisi/config.py index cfffd985..a962f884 100644 --- a/pisi/config.py +++ b/pisi/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/configfile.py b/pisi/configfile.py index 7ccc9f7f..5f3d8bf4 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/conflict.py b/pisi/conflict.py index edd1b148..acf7b45f 100644 --- a/pisi/conflict.py +++ b/pisi/conflict.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/constants.py b/pisi/constants.py index 8118c2b3..619ce2fd 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/context.py b/pisi/context.py index 361ca92c..4799a7ba 100644 --- a/pisi/context.py +++ b/pisi/context.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/dependency.py b/pisi/dependency.py index 10b008dd..99c79db5 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/fetcher.py b/pisi/fetcher.py index 0ece37f2..7e9ae626 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/file.py b/pisi/file.py index fb257735..ffe233f5 100644 --- a/pisi/file.py +++ b/pisi/file.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/files.py b/pisi/files.py index 0dab0d0b..ecdc6c5d 100644 --- a/pisi/files.py +++ b/pisi/files.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/index.py b/pisi/index.py index 8d3d38c3..d9776c78 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/installdb.py b/pisi/installdb.py index 9e36be74..d3a97087 100644 --- a/pisi/installdb.py +++ b/pisi/installdb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/itembyrepodb.py b/pisi/itembyrepodb.py index 11741336..f010a15b 100644 --- a/pisi/itembyrepodb.py +++ b/pisi/itembyrepodb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/lockeddbshelve.py b/pisi/lockeddbshelve.py index ea8cb9ed..64da9c33 100644 --- a/pisi/lockeddbshelve.py +++ b/pisi/lockeddbshelve.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/metadata.py b/pisi/metadata.py index 2229221f..0320bb64 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/operations.py b/pisi/operations.py index 7aff23a6..9dbfa432 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/package.py b/pisi/package.py index ef309d1e..2ee46aef 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/pgraph.py b/pisi/pgraph.py index 5c7d444b..ca1c8413 100644 --- a/pisi/pgraph.py +++ b/pisi/pgraph.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/pxml/__init__.py b/pisi/pxml/__init__.py index 67d1fd25..cde29f87 100644 --- a/pisi/pxml/__init__.py +++ b/pisi/pxml/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py index 84ae3b65..712064fd 100644 --- a/pisi/pxml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/pxml/xmlext.py b/pisi/pxml/xmlext.py index 41293fa9..0f6ae0d9 100644 --- a/pisi/pxml/xmlext.py +++ b/pisi/pxml/xmlext.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/pxml/xmlfile.py b/pisi/pxml/xmlfile.py index 263624a4..d2de7cc7 100644 --- a/pisi/pxml/xmlfile.py +++ b/pisi/pxml/xmlfile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/repodb.py b/pisi/repodb.py index 039cb6dc..3b787f4c 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py index dede49cb..e98dbb0f 100644 --- a/pisi/sourcearchive.py +++ b/pisi/sourcearchive.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py index ba1770e6..a3f5f4f3 100644 --- a/pisi/sourcedb.py +++ b/pisi/sourcedb.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/specfile.py b/pisi/specfile.py index 0fa5d224..ead9a8c8 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/ui.py b/pisi/ui.py index 63fed5d1..9973a3df 100644 --- a/pisi/ui.py +++ b/pisi/ui.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/uri.py b/pisi/uri.py index 08b04226..f582cfda 100644 --- a/pisi/uri.py +++ b/pisi/uri.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/util.py b/pisi/util.py index 27b53668..1c9e99d5 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/pisi/version.py b/pisi/version.py index 88fd97c0..1fc2711c 100644 --- a/pisi/version.py +++ b/pisi/version.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/setup.py b/setup.py index 33512653..c58cdb7f 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2005-2006, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/actionsapitests.py b/tests/actionsapitests.py index 53f7335d..c5f61fb3 100644 --- a/tests/actionsapitests.py +++ b/tests/actionsapitests.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/archivetests.py b/tests/archivetests.py index 53e2e2e5..a4ea534e 100644 --- a/tests/archivetests.py +++ b/tests/archivetests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/autoxmltests.py b/tests/autoxmltests.py index c24400f5..836169dd 100644 --- a/tests/autoxmltests.py +++ b/tests/autoxmltests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/buildtests.py b/tests/buildtests.py index a90e9236..c9a8e205 100644 --- a/tests/buildtests.py +++ b/tests/buildtests.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/configfiletests.py b/tests/configfiletests.py index 5a136693..b0395001 100644 --- a/tests/configfiletests.py +++ b/tests/configfiletests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/constantstests.py b/tests/constantstests.py index 45a61b1c..77c1cc3e 100644 --- a/tests/constantstests.py +++ b/tests/constantstests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/dependencytests.py b/tests/dependencytests.py index 029a2d3d..8e5d10ba 100644 --- a/tests/dependencytests.py +++ b/tests/dependencytests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/fetchertests.py b/tests/fetchertests.py index ed7b2f47..80272ec1 100644 --- a/tests/fetchertests.py +++ b/tests/fetchertests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/filestests.py b/tests/filestests.py index c1fd196b..a784d330 100644 --- a/tests/filestests.py +++ b/tests/filestests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/filetests.py b/tests/filetests.py index 3ccde2bd..75524d90 100644 --- a/tests/filetests.py +++ b/tests/filetests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/graphtests.py b/tests/graphtests.py index 6249fd31..62d1ca42 100644 --- a/tests/graphtests.py +++ b/tests/graphtests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/helloworld/actions.py b/tests/helloworld/actions.py index 410d41ee..ccf59890 100644 --- a/tests/helloworld/actions.py +++ b/tests/helloworld/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/installdbtests.py b/tests/installdbtests.py index ce66809f..082ff1e4 100644 --- a/tests/installdbtests.py +++ b/tests/installdbtests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/metadatatests.py b/tests/metadatatests.py index b5514f5c..083c2dd5 100644 --- a/tests/metadatatests.py +++ b/tests/metadatatests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/ootests.py b/tests/ootests.py index 8bbbde3a..ac2b335f 100644 --- a/tests/ootests.py +++ b/tests/ootests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/packagedbtests.py b/tests/packagedbtests.py index e140940d..4c315b7a 100644 --- a/tests/packagedbtests.py +++ b/tests/packagedbtests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/packagetests.py b/tests/packagetests.py index 638223c8..93d3ecf0 100644 --- a/tests/packagetests.py +++ b/tests/packagetests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/pccts/actions.py b/tests/pccts/actions.py index 50add5ca..184a6599 100644 --- a/tests/pccts/actions.py +++ b/tests/pccts/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/popt/actions.py b/tests/popt/actions.py index c8fc6046..2be6f570 100644 --- a/tests/popt/actions.py +++ b/tests/popt/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/repodbtests.py b/tests/repodbtests.py index 04f352e7..463f7b3d 100644 --- a/tests/repodbtests.py +++ b/tests/repodbtests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/run.py b/tests/run.py index 65ca4207..9bb3f59d 100755 --- a/tests/run.py +++ b/tests/run.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/searchtests.py b/tests/searchtests.py index e39829b9..a44af47d 100644 --- a/tests/searchtests.py +++ b/tests/searchtests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/sourcedbtests.py b/tests/sourcedbtests.py index 7a14c186..3f273ad0 100644 --- a/tests/sourcedbtests.py +++ b/tests/sourcedbtests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/specfiletests.py b/tests/specfiletests.py index 5e5ff46f..a5f918c4 100644 --- a/tests/specfiletests.py +++ b/tests/specfiletests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/testcase.py b/tests/testcase.py index d861d4ec..f6d5406d 100644 --- a/tests/testcase.py +++ b/tests/testcase.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/unzip/actions.py b/tests/unzip/actions.py index ed12a90d..2f22dce4 100644 --- a/tests/unzip/actions.py +++ b/tests/unzip/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/unzip2/actions.py b/tests/unzip2/actions.py index 09b91126..85e0098e 100644 --- a/tests/unzip2/actions.py +++ b/tests/unzip2/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/utiltests.py b/tests/utiltests.py index 069aff15..484e9454 100644 --- a/tests/utiltests.py +++ b/tests/utiltests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/versiontests.py b/tests/versiontests.py index cae9ef1e..b9ccd3eb 100644 --- a/tests/versiontests.py +++ b/tests/versiontests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/xmlexttests.py b/tests/xmlexttests.py index 0d5ccb7d..b5b7f14d 100644 --- a/tests/xmlexttests.py +++ b/tests/xmlexttests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/zip/actions.py b/tests/zip/actions.py index 730924b4..0d48caae 100644 --- a/tests/zip/actions.py +++ b/tests/zip/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free diff --git a/tests/zip2/actions.py b/tests/zip2/actions.py index a2c1b060..0726d844 100644 --- a/tests/zip2/actions.py +++ b/tests/zip2/actions.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# Copyright (C) 2005, TUBITAK/UEKAE +# Copyright (C) 2005 - 2007, TUBITAK/UEKAE # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free From 4711372a1032533d36eebf6ccc494236e3939cd5 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 10:49:53 +0000 Subject: [PATCH 040/212] * pisi-1.1.2 is coming --- pisi/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/__init__.py b/pisi/__init__.py index d9e483af..89a95deb 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,9 +12,9 @@ # PiSi version -__version__ = "1.1.1" +__version__ = "1.1.2" -__dbversion__ = "1.1_rc7" +__dbversion__ = "1.1.2" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck __all__ = [ 'api', 'config', 'packagedb', 'installdb', 'search' ] From 8ce715c05535698478a08d1dbd49bc584b0c473b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 11:54:36 +0000 Subject: [PATCH 041/212] * :/ wrongly merged --- pisi/actionsapi/kde.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/actionsapi/kde.py b/pisi/actionsapi/kde.py index 2edde784..7c9133dd 100644 --- a/pisi/actionsapi/kde.py +++ b/pisi/actionsapi/kde.py @@ -54,9 +54,9 @@ def configure(parameters = ''): --with-x \ --enable-mitshm \ --with-xinerama \ - --with-qt-dir=%s/lib \ + --with-qt-dir=%s \ --enable-mt \ - --with-qt-libraries=%s \ + --with-qt-libraries=%s/lib \ --disable-dependency-tracking \ --disable-debug \ %s' % (get.kdeDIR(), get.HOST(), get.qtDIR(), get.qtDIR(), parameters) From 3ac06fc774016bcb4098867d548eb598d2c3e8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 26 Mar 2007 13:26:35 +0000 Subject: [PATCH 042/212] ignore, just cosmetic --- pisi/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/util.py b/pisi/util.py index 1c9e99d5..b1c86120 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -664,7 +664,7 @@ def filter_latest_packages(package_paths): for path in package_paths: root = os.path.dirname(path) - name, version = parse_package_name(os.path.basename(path[:-len(".pisi")])) + name, version = parse_package_name(os.path.basename(path[:-len(ctx.const.package_suffix)])) if latest.has_key(name): if Version(latest[name][2]) < Version(version): From d14234b1e85923bf98750cc5a1d2d53013d24cae Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 26 Mar 2007 13:45:27 +0000 Subject: [PATCH 043/212] pisi check -c [--component] support (caglar) (merged from trunk) --- pisi/cli/commands.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 90655b19..529ca123 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1014,13 +1014,28 @@ If no packages are given, checks all installed packages. name = ("check", None) + def options(self): + group = OptionGroup(self.parser, _("check options")) + group.add_option("-c", "--component", action="store", + default=None, help=_("Check installed packages under given component")) + self.parser.add_option_group(group) + def run(self): self.init(database = True, write = False) - if self.args: + + component = ctx.get_option('component') + if component: + #FIXME: pisi api is insufficient to do this + from sets import Set as set + installed = ctx.installdb.list_installed() + component_pkgs = ctx.componentdb.get_union_packages(component, walk=True) + pkgs = list(set(installed) & set(component_pkgs)) + elif self.args: pkgs = self.args else: ctx.ui.info(_('Checking all installed packages')) pkgs = ctx.installdb.list_installed() + for pkg in pkgs: ctx.ui.info(_('* Checking %s... ') % pkg, noln=True) if ctx.installdb.is_installed(pkg): From b1543d5e699f47f3903981eaf56307a243b43cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrer=20=C3=96zen?= Date: Wed, 4 Apr 2007 11:58:49 +0000 Subject: [PATCH 044/212] buna burada gerek yok zaten --- pisi/catbox.patch | 51 ----------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 pisi/catbox.patch diff --git a/pisi/catbox.patch b/pisi/catbox.patch deleted file mode 100644 index 17f26bc3..00000000 --- a/pisi/catbox.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: build.py -=================================================================== ---- build.py (revision 10048) -+++ build.py (working copy) -@@ -193,13 +193,30 @@ - # apply the patches and prepare a source directory for build. - self.apply_patches() - -+ if ctx.get_option('use_catbox'): -+ import catbox -+ ret = catbox.run( -+ self.sandboxed, -+ ["/var/pisi", "/tmp", "/dev/tty", "/dev/null"], -+ logger = self.sandbox_logger -+ ) -+ if ret != 0: -+ raise Error, "actions.py borked" -+ else: -+ self.sandboxed() -+ -+ # after all, we are ready to build/prepare the packages -+ return self.build_packages() -+ -+ def sandbox_logger(self, event, data): -+ if event == "denied": -+ ctx.ui.error("Access denied to '%s'" % data) -+ -+ def sandboxed(self): - self.run_setup_action() - self.run_build_action() - self.run_install_action() - -- # after all, we are ready to build/prepare the packages -- return self.build_packages() -- - def set_environment_vars(self): - """Sets the environment variables for actions API to use""" - -Index: cli/commands.py -=================================================================== ---- cli/commands.py (revision 10048) -+++ cli/commands.py (working copy) -@@ -452,6 +452,8 @@ - default=False, help=_("Do not install build dependencies, fail if a build dependency is present")) - group.add_option("-F", "--package-format", action="store", default='1.1', - help=_("PiSi binary package formats: '1.0', '1.1' (default)")) -+ self.parser.add_option("", "--use-catbox", action="store_true", default=False, -+ help=_("use catbox")) - - def add_steps_options(self): - group = OptionGroup(self.parser, _("build steps")) From 560891ebcd13188698d56942fc537eb10a436fdf Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 5 Apr 2007 11:20:44 +0000 Subject: [PATCH 045/212] * revert this. We upgraded pisi db. But "from imports" of pisi do not let us reload all the extracted modules and than safely run rebuild-db. --- pisi/build.py | 2 +- pisi/specfile.py | 3 +++ pisi/util.py | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 74ace471..5ed1345c 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -496,7 +496,7 @@ class Builder: targetDir=ctx.config.tmp_dir()) ctx.ui.action(_("* Applying patch: %s") % patch.filename) - util.do_patch(self.srcDir, patchFile, level=patch.level) + util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) def generate_static_package_object(self): ar_files = [] diff --git a/pisi/specfile.py b/pisi/specfile.py index ead9a8c8..6354a91e 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -68,6 +68,7 @@ class Patch: s_Filename = [autoxml.String, autoxml.mandatory] a_compressionType = [autoxml.String, autoxml.optional] a_level = [autoxml.Integer, autoxml.optional] + a_target = [autoxml.String, autoxml.optional] #FIXME: what's the cleanest way to give a default value for reading level? #def decode_hook(self, node, errs, where): @@ -80,6 +81,8 @@ class Patch: s += ' (' + self.compressionType + ')' if self.level: s += ' level:' + self.level + if self.target: + s += ' target:' + self.target return s diff --git a/pisi/util.py b/pisi/util.py index b1c86120..6ff47413 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -480,17 +480,19 @@ def uncompress(patchFile, compressType="gz", targetDir=None): return filePath -def do_patch(sourceDir, patchFile, level = 0): +def do_patch(sourceDir, patchFile, level = 0, target = ''): """Apply given patch to the sourceDir.""" cwd = os.getcwd() os.chdir(sourceDir) if level == None: level = 0 + if target == None: + target = '' check_file(patchFile) - (ret, out, err) = run_batch("patch -p%d < %s" % - (level, patchFile)) + (ret, out, err) = run_batch("patch -p%d %s < %s" % + (level, target, patchFile)) if ret: if out is None and err is None: # Which means stderr and stdout directed so they are None From 858e5d3babcc8333e159f9050689fdf9321d1494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 8 Apr 2007 19:49:35 +0000 Subject: [PATCH 046/212] backport remove suffix and compiled_packages_dir patches from trunk --- pisi/build.py | 2 +- pisi/configfile.py | 2 ++ pisi/util.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pisi/build.py b/pisi/build.py index 5ed1345c..7649e282 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -663,7 +663,7 @@ class Builder: except Error: ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn) - for root, dirs, files in os.walk(ctx.config.packages_dir()): + for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()): for file in files: locate_old_package(join(root,file)) diff --git a/pisi/configfile.py b/pisi/configfile.py index 5f3d8bf4..cadaa0b8 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -38,6 +38,7 @@ #db_dir = /var/db/pisi #archives_dir = /var/cache/pisi/archives #packages_dir = /var/cache/pisi/packages +#compiled_packages_dir = "/var/cache/pisi/packages" #index_dir = /var/cache/pisi/index #tmp_dir = /var/tmp/pisi #kde_dir = /usr/kde/3.5 @@ -84,6 +85,7 @@ class DirectoriesDefaults: db_dir = "/var/db/pisi" archives_dir = "/var/cache/pisi/archives" packages_dir = "/var/cache/pisi/packages" + compiled_packages_dir = "/var/cache/pisi/packages" index_dir = "/var/lib/pisi/index" tmp_dir = "/var/pisi" kde_dir = "/usr/kde/3.5" diff --git a/pisi/util.py b/pisi/util.py index 6ff47413..f41b5c5c 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -468,6 +468,8 @@ def uncompress(patchFile, compressType="gz", targetDir=None): os.path.basename(patchFile)) else: filePath = os.path.basename(patchFile) + # remove suffix from file cause its uncompressed now + filePath = filePath.split(".%s" % compressType)[0] if compressType == "gz": from gzip import GzipFile From 3576c434f4760fa2eaaaa62cc8956b1b6f07f723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 8 Apr 2007 20:11:30 +0000 Subject: [PATCH 047/212] missing bits --- pisi/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pisi/config.py b/pisi/config.py index a962f884..863f0075 100644 --- a/pisi/config.py +++ b/pisi/config.py @@ -99,6 +99,9 @@ class Config(object): def packages_dir(self): return self.subdir(self.values.dirs.packages_dir) + def compiled_packages_dir(self): + return self.subdir(self.values.dirs.compiled_packages_dir) + def index_dir(self): return self.subdir(self.values.dirs.index_dir) From 9e2cb30b50d090a25f11f76ff6695ca7971495bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 23 Apr 2007 13:06:38 +0000 Subject: [PATCH 048/212] add a parameter to point where to look pyc files --- pisi/actionsapi/pythonmodules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index b2a01007..bbd658f7 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -65,9 +65,9 @@ def run(parameters = ''): if system('python %s' % (parameters)): raise RunTimeError, _('Running %s failed.') % parameters -def fixCompiledPy(): +def fixCompiledPy(lookInto = "/usr/lib/%s/" % get.curPYTHON()): ''' cleans *.py[co] from packages ''' - for root, dirs, files in os.walk("%s/usr/lib/%s/" % (get.installDIR(), get.curPYTHON())): + for root, dirs, files in os.walk("%s/%s" % (get.installDIR(),lookInto)): for compiledFile in files: if compiledFile.endswith(".pyc") or compiledFile.endswith(".pyo"): if can_access_file("%s/%s" % (root,compiledFile)): From 1c2e697b54734b5d875586b54b7273bba2c5522f Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 07:24:45 +0000 Subject: [PATCH 049/212] [MERGE] From-Import-Removal in specfile.py --- pisi/specfile.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pisi/specfile.py b/pisi/specfile.py index 6354a91e..ecd63dc7 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -21,15 +21,14 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext # standard python modules -from os.path import basename +import os.path # pisi modules -from pisi.pxml.xmlfile import XmlFile +import pisi.pxml.xmlfile as xmlfile import pisi.pxml.autoxml as autoxml import pisi.context as ctx -from pisi.dependency import Dependency -from pisi.conflict import Conflict import pisi.dependency +import pisi.conflict import pisi.component as component import pisi.util as util @@ -135,7 +134,7 @@ class Archive: a_sha1sum =[ autoxml.String, autoxml.mandatory ] def decode_hook(self, node, errs, where): - self.name = basename(self.uri) + self.name = os.path.basename(self.uri) def __str__(self): s = _('URI: %s, type: %s, sha1sum: %s') % (self.uri, self.type, self.sha1sum) @@ -154,7 +153,7 @@ class Source: t_Description = [autoxml.LocalText, autoxml.optional] t_Icon = [ autoxml.String, autoxml.optional] t_Archive = [Archive, autoxml.mandatory ] - t_BuildDependencies = [ [Dependency], autoxml.optional] + t_BuildDependencies = [ [pisi.dependency.Dependency], autoxml.optional] t_Patches = [ [Patch], autoxml.optional] t_Version = [ autoxml.String, autoxml.optional] t_Release = [ autoxml.String, autoxml.optional] @@ -170,10 +169,10 @@ class Package: t_PartOf = [autoxml.String, autoxml.optional] t_License = [ [autoxml.String], autoxml.optional] t_Icon = [ autoxml.String, autoxml.optional] - t_PackageDependencies = [ [Dependency], autoxml.optional, "RuntimeDependencies/Dependency"] + t_PackageDependencies = [ [pisi.dependency.Dependency], autoxml.optional, "RuntimeDependencies/Dependency"] t_ComponentDependencies = [ [autoxml.String], autoxml.optional, "RuntimeDependencies/Component"] t_Files = [ [Path], autoxml.optional] - t_Conflicts = [ [Conflict], autoxml.optional, "Conflicts/Package"] + t_Conflicts = [ [pisi.conflict.Conflict], autoxml.optional, "Conflicts/Package"] t_ProvidesComar = [ [ComarProvide], autoxml.optional, "Provides/COMAR"] #t_RequiresComar = [ [autoxml.String], autoxml.mandatory, "Requires/COMAR"] t_AdditionalFiles = [ [AdditionalFile], autoxml.optional] @@ -222,7 +221,7 @@ class Package: return s + '\n' -class SpecFile(XmlFile): +class SpecFile(xmlfile.XmlFile): __metaclass__ = autoxml.autoxml #needed when we specify a superclass tag = "PISI" From cbcbbea18ea01f7eccce93f2dde1d14bf868401b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 07:36:28 +0000 Subject: [PATCH 050/212] [MERGE] From-Import-Removal --- pisi/configfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pisi/configfile.py b/pisi/configfile.py index cadaa0b8..f3b28f3f 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -45,7 +45,7 @@ #qt_dir = /usr/qt/3 import os -from ConfigParser import ConfigParser, NoSectionError +import ConfigParser import gettext __trans = gettext.translation('pisi', fallback=True) @@ -137,25 +137,25 @@ class ConfigurationSection(object): class ConfigurationFile(object): """Parse and get configuration values from the configuration file""" def __init__(self, filePath): - parser = ConfigParser() + parser = ConfigParser.ConfigParser() self.filePath = filePath parser.read(self.filePath) try: generalitems = parser.items("general") - except NoSectionError: + except ConfigParser.NoSectionError: generalitems = [] self.general = ConfigurationSection("general", generalitems) try: builditems = parser.items("build") - except NoSectionError: + except ConfigParser.NoSectionError: builditems = [] self.build = ConfigurationSection("build", builditems) try: dirsitems = parser.items("directories") - except NoSectionError: + except ConfigParser.NoSectionError: dirsitems = [] self.dirs = ConfigurationSection("directories", dirsitems) From ef8762d5f0ac4f0169be8d1b5b00892425b9f9fb Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 07:39:13 +0000 Subject: [PATCH 051/212] [MERGE] From-Import-Removal --- pisi/dependency.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pisi/dependency.py b/pisi/dependency.py index 99c79db5..a6388b33 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -18,7 +18,7 @@ _ = __trans.ugettext import pisi.context as ctx #import pisi.packagedb as packagedb -from pisi.version import Version +import pisi.version import pisi.pxml.autoxml as autoxml import pisi.itembyrepodb @@ -53,20 +53,20 @@ class Dependency: def satisfies(self, pkg_name, version, release): """determine if a package ver. satisfies given dependency spec""" ret = True - v = Version(version) + v = pisi.version.Version(version) if self.version: - ret &= v == Version(self.version) + ret &= v == pisi.version.Version(self.version) if self.versionFrom: - ret &= v >= Version(self.versionFrom) + ret &= v >= pisi.version.Version(self.versionFrom) if self.versionTo: - ret &= v <= Version(self.versionTo) - r = Version(release) + ret &= v <= pisi.version.Version(self.versionTo) + r = pisi.version.Version(release) if self.release: - ret &= r == Version(self.release) + ret &= r == pisi.version.Version(self.release) if self.releaseFrom: - ret &= r >= Version(self.releaseFrom) + ret &= r >= pisi.version.Version(self.releaseFrom) if self.releaseTo: - ret &= r <= Version(self.releaseTo) + ret &= r <= pisi.version.Version(self.releaseTo) return ret def dict_satisfies_dep(dict, depinfo): From e67219588b0d1a7eb160546c46cec7977be35310 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 07:56:57 +0000 Subject: [PATCH 052/212] =?UTF-8?q?[MERGE]=C2=A0From-Import-Removal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/conflict.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pisi/conflict.py b/pisi/conflict.py index acf7b45f..e7723a46 100644 --- a/pisi/conflict.py +++ b/pisi/conflict.py @@ -17,7 +17,7 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi.context as ctx -from pisi.version import Version +import pisi.version import pisi.pxml.autoxml as autoxml import pisi.itembyrepodb @@ -52,20 +52,20 @@ class Conflict: def conflicts(self, pkg_name, version, release): """determine if a package ver. conflicts with given conflicting spec""" ret = True - v = Version(version) + v = pisi.version.Version(version) if self.version: - ret &= v == Version(self.version) + ret &= v == pisi.version.Version(self.version) if self.versionFrom: - ret &= v >= Version(self.versionFrom) + ret &= v >= pisi.version.Version(self.versionFrom) if self.versionTo: - ret &= v <= Version(self.versionTo) - r = Version(release) + ret &= v <= pisi.version.Version(self.versionTo) + r = pisi.version.Version(release) if self.release: - ret &= r == Version(self.release) + ret &= r == pisi.version.Version(self.release) if self.releaseFrom: - ret &= r >= Version(self.releaseFrom) + ret &= r >= pisi.version.Version(self.releaseFrom) if self.releaseTo: - ret &= r <= Version(self.releaseTo) + ret &= r <= pisi.version.Version(self.releaseTo) return ret def installed_package_conflicts(confinfo): From 8a016fe29988e4c3aa5b7de82a0a5656192f46d1 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 08:00:13 +0000 Subject: [PATCH 053/212] [MERGE] From-Import-Removal --- pisi/delta.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pisi/delta.py b/pisi/delta.py index e9dd29fb..d0e81ba9 100644 --- a/pisi/delta.py +++ b/pisi/delta.py @@ -10,14 +10,14 @@ # Please read the COPYING file. import os -from sets import Set as set +import sets import gettext __trans = gettext.translation("pisi", fallback=True) _ = __trans.ugettext import pisi.context as ctx -from pisi.package import Package +import pisi.package import pisi.util as util import pisi.archive as archive @@ -27,8 +27,8 @@ def create_delta_package(old_package, new_package): ctx.ui.error(_("Cannot create delta for same package!")) return - oldpkg = Package(old_package, "r") - newpkg = Package(new_package, "r") + oldpkg = pisi.package.Package(old_package, "r") + newpkg = pisi.package.Package(new_package, "r") newmd = newpkg.get_metadata() oldmd = oldpkg.get_metadata() @@ -55,7 +55,7 @@ def create_delta_package(old_package, new_package): if outdir: deltaname = util.join_path(outdir, deltaname) - deltapkg = Package(deltaname, "w") + deltapkg = pisi.package.Package(deltaname, "w") c = os.getcwd() os.chdir(newpkg_path) @@ -102,8 +102,8 @@ def find_delta(oldfiles, newfiles): for file in newfiles.list: hashto_files.setdefault(file.hash, []).append(file) - files_new = set(map(lambda x:x.hash, newfiles.list)) - files_old = set(map(lambda x:x.hash, oldfiles.list)) + files_new = sets.Set(map(lambda x:x.hash, newfiles.list)) + files_old = sets.Set(map(lambda x:x.hash, oldfiles.list)) files_delta = files_new - files_old deltas = [] From d3e9b813a16b92ab8f716ca510de0664835533be Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 08:26:59 +0000 Subject: [PATCH 054/212] [MERGE] From-Import-Removal --- pisi/config.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pisi/config.py b/pisi/config.py index 863f0075..373b2dce 100644 --- a/pisi/config.py +++ b/pisi/config.py @@ -16,7 +16,7 @@ regular PiSi configurations. """ import os -from copy import deepcopy +import copy import gettext __trans = gettext.translation('pisi', fallback=True) @@ -24,9 +24,8 @@ _ = __trans.ugettext import pisi import pisi.context as ctx -from pisi.configfile import ConfigurationFile +import pisi.configfile import pisi.util -from pisi.util import join_path as join class Error(pisi.Error): pass @@ -46,14 +45,14 @@ class Config(object): def __init__(self, options = Options()): self.options = options - self.values = ConfigurationFile("/etc/pisi/pisi.conf") + self.values = pisi.configfile.ConfigurationFile("/etc/pisi/pisi.conf") destdir = self.get_option('destdir') if destdir: if destdir.strip().startswith('/'): self.destdir = destdir else: - self.destdir = join(os.getcwd(), destdir) + self.destdir = pisi.util.join_path(os.getcwd(), destdir) else: self.destdir = self.values.general.destinationdirectory @@ -63,7 +62,7 @@ class Config(object): # get the initial environment variables. this is needed for # build process. - self.environ = deepcopy(os.environ) + self.environ = copy.deepcopy(os.environ) def set_option(self, opt, val): setattr(self.options, opt, val) @@ -83,7 +82,7 @@ class Config(object): return self.destdir def subdir(self, path): - dir = join(self.dest_dir(), path) + dir = pisi.util.join_path(self.dest_dir(), path) pisi.util.check_dir(dir) return dir From a04b783cdc9a6a2182714dd11fa0c33a9a91b613 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 08:39:17 +0000 Subject: [PATCH 055/212] [MERGE] From-Import-Removal --- pisi/file.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pisi/file.py b/pisi/file.py index ffe233f5..a40d71a1 100644 --- a/pisi/file.py +++ b/pisi/file.py @@ -27,9 +27,9 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi -from pisi.uri import URI -from pisi.util import join_path as join -from pisi.fetcher import fetch_url +import pisi.uri +import pisi.util +import pisi.fetcher import pisi.context as ctx class AlreadyHaveException(pisi.Exception): @@ -61,8 +61,8 @@ class File: def make_uri(uri): "handle URI arg" if type(uri) == types.StringType or type(uri) == types.UnicodeType: - uri = URI(uri) - elif not isinstance(uri, URI): + uri = pisi.uri.URI(uri) + elif not isinstance(uri, pisi.uri.URI): raise Error(_("uri must have type either URI or string")) return uri @@ -93,15 +93,15 @@ class File: def download(uri, transfer_dir = "/tmp", sha1sum = False, compress = None, sign = None, copylocal = False): - assert isinstance(uri, URI) + assert isinstance(uri, pisi.uri.URI) if sha1sum: - sha1filename = File.download(URI(uri.get_uri() + '.sha1sum'), transfer_dir) + sha1filename = File.download(pisi.uri.URI(uri.get_uri() + '.sha1sum'), transfer_dir) sha1f = file(sha1filename) newsha1 = sha1f.read().split("\n")[0] if uri.is_remote_file() or copylocal: - localfile = join(transfer_dir, uri.filename()) + localfile = pisi.util.join_path(transfer_dir, uri.filename()) # TODO: code to use old .sha1sum file, is this a necessary optimization? #oldsha1fn = localfile + '.sha1sum' @@ -115,10 +115,10 @@ class File: if uri.is_remote_file(): ctx.ui.info(_("Fetching %s") % uri.get_uri(), verbose=True) - fetch_url(uri, transfer_dir, ctx.ui.Progress) + pisi.fetcher.fetch_url(uri, transfer_dir, ctx.ui.Progress) else: # copy to transfer dir, - localfile = join(transfer_dir, uri.filename()) + localfile = pisi.util.join_path(transfer_dir, uri.filename()) ctx.ui.info(_("Copying %s to transfer dir") % uri.get_uri(), verbose=True) shutil.copy(uri.get_uri(), transfer_dir) else: @@ -127,7 +127,7 @@ class File: raise IOError(_("File '%s' not found.") % localfile) if not os.access(localfile, os.W_OK): oldfn = localfile - localfile = join(transfer_dir, os.path.basename(localfile)) + localfile = pisi.util.join_path(transfer_dir, os.path.basename(localfile)) shutil.copy(oldfn, localfile) if sha1sum: @@ -208,7 +208,7 @@ class File: def check_signature(uri, transfer_dir, sign=detached): if sign==File.detached: try: - sigfilename = File.download(URI(uri + '.sig'), transfer_dir) + sigfilename = File.download(pisi.uri.URI(uri + '.sig'), transfer_dir) except KeyboardInterrupt: raise except Exception, e: #FIXME: what exception could we catch here, replace with that. From 97d38e253799b774b9b849c1b3142f6047d87ef0 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 09:04:16 +0000 Subject: [PATCH 056/212] [MERGE] From-Import-Removal --- pisi/cli/__init__.py | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index 826bb203..f2b69f5f 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -20,11 +20,9 @@ _ = __trans.ugettext import pisi import pisi.context as ctx -from pisi.ui import UI -import pisi.ui as ui -import pisi.util as util -from pisi.cli.colors import colorize - +import pisi.ui +import pisi.util +import pisi.cli.colors as colors class Error(pisi.Error): pass @@ -44,14 +42,14 @@ def printu(obj, err = False): out.write(obj.encode('utf-8')) out.flush() -class CLI(UI): +class CLI(pisi.ui.UI): "Command Line Interface" def __init__(self, show_debug = False, show_verbose = False): super(CLI, self).__init__(show_debug, show_verbose) def close(self): - util.xterm_title_reset() + pisi.util.xterm_title_reset() def output(self, msg, err = False, verbose = False): if (verbose and self.show_verbose) or (not verbose): @@ -78,7 +76,7 @@ class CLI(UI): if ctx.get_option('no_color'): self.output(_('Warning: ') + msg + '\n', err=True, verbose=verbose) else: - self.output(colorize(msg + '\n', 'brightred'), err=True, verbose=verbose) + self.output(colors.colorize(msg + '\n', 'brightred'), err=True, verbose=verbose) def error(self, msg): msg = unicode(msg) @@ -87,21 +85,21 @@ class CLI(UI): if ctx.get_option('no_color'): self.output(_('Error: ') + msg + '\n', err=True) else: - self.output(colorize(msg + '\n', 'red'), err=True) + self.output(colors.colorize(msg + '\n', 'red'), err=True) def action(self, msg, verbose = False): #TODO: this seems quite redundant? msg = unicode(msg) if ctx.log: ctx.log.info(msg) - self.output(colorize(msg + '\n', 'green')) + self.output(colors.colorize(msg + '\n', 'green')) def choose(self, msg, opts): print msg for i in range(0,len(opts)): print i + 1, opts(i) while True: - s = raw_input(msg + colorize('1-%d' % len(opts), 'red')) + s = raw_input(msg + colors.colorize('1-%d' % len(opts), 'red')) try: opt = int(s) if 1 <= opt and opt <= len(opts): @@ -117,7 +115,7 @@ class CLI(UI): import re yesexpr = re.compile(locale.nl_langinfo(locale.YESEXPR)) - prompt = msg + colorize(_(' (yes/no)'), 'red') + prompt = msg + colors.colorize(_(' (yes/no)'), 'red') s = raw_input(prompt.encode('utf-8')) if yesexpr.search(s): return True @@ -138,28 +136,28 @@ class CLI(UI): self.output("\r%s (%d%%)" % (info, percent)) if percent == 100: - self.output(colorize(_(' [complete]\n'), 'gray')) + self.output(colors.colorize(_(' [complete]\n'), 'gray')) def status(self, msg = None): if msg: msg = unicode(msg) - self.output(colorize(msg + '\n', 'brightgreen')) - util.xterm_title(msg) + self.output(colors.colorize(msg + '\n', 'brightgreen')) + pisi.util.xterm_title(msg) def notify(self, event, **keywords): - if event == ui.installed: + if event == pisi.ui.installed: msg = _('Installed %s') % keywords['package'].name - elif event == ui.removed: + elif event == pisi.ui.removed: msg = _('Removed %s') % keywords['package'].name - elif event == ui.upgraded: + elif event == pisi.ui.upgraded: msg = _('Upgraded %s') % keywords['package'].name - elif event == ui.configured: + elif event == pisi.ui.configured: msg = _('Configured %s') % keywords['package'].name - elif event == ui.extracting: + elif event == pisi.ui.extracting: msg = _('Extracting the files of %s') % keywords['package'].name else: msg = None if msg: - self.output(colorize(msg + '\n', 'cyan')) + self.output(colors.colorize(msg + '\n', 'cyan')) if ctx.log: ctx.log.info(msg) From c7b4cf16d8e35895f34de98fe15147b5879ef0b7 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 12:19:45 +0000 Subject: [PATCH 057/212] [MERGE] From-Import-Removal --- pisi/uri.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/uri.py b/pisi/uri.py index f582cfda..06b92767 100644 --- a/pisi/uri.py +++ b/pisi/uri.py @@ -13,8 +13,8 @@ """Simplifies working with URLs, purl module provides common URL parsing and processing""" -from urlparse import urlparse -from os.path import basename +import urlparse +import os.path import gettext __trans = gettext.translation('pisi', fallback=True) @@ -49,11 +49,11 @@ class URI(object): def set_uri(self, uri): # (scheme, location, path, params, query, fragment) uri = str(uri) - u = urlparse(uri, "file") + u = urlparse.urlparse(uri, "file") self.__scheme = u[0] self.__location = u[1] self.__path = u[2] - self.__filename = basename(self.__path) + self.__filename = os.path.basename(self.__path) self.__params = u[3] self.__query = u[4] self.__fragment = u[5] From 4cc7a6f3e8e9a8ac737e7d3c99b9fcec57d2559d Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 12:31:51 +0000 Subject: [PATCH 058/212] [MERGE] From-Import-Removal and yield sum(meren) --- pisi/util.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pisi/util.py b/pisi/util.py index f41b5c5c..68228639 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -291,21 +291,19 @@ def dir_size(dir): # being true. Using 'du' command (like Debian does) can be a # better solution :(. # Not really, du calculates size on disk, this is much better -- exa - from os.path import getsize, islink, isdir, exists - join = join_path - if exists(dir) and (not isdir(dir) and not islink(dir)): + if os.path.exists(dir) and (not os.path.isdir(dir) and not os.path.islink(dir)): #so, this is not a directory but file.. - return getsize(dir) + return os.path.getsize(dir) - if islink(dir): + if os.path.islink(dir): return long(len(os.readlink(dir))) def sizes(): for root, dirs, files in os.walk(dir): - yield sum([getsize(join(root, name)) for name in files if not islink(join(root,name))]) - yield sum([long(len(os.readlink((join(root, name))))) for name in files if islink(join(root,name))]) - return sum( sizes() ) + yield sum([os.path.getsize(join_path(root, name)) for name in files if not os.path.islink(join_path(root, name))]) + yield sum([long(len(os.readlink((join_path(root, name))))) for name in files if os.path.islink(join_path(root, name))]) + return sum(sizes()) def copy_file(src,dest): """Copy source file to the destination file.""" @@ -472,11 +470,11 @@ def uncompress(patchFile, compressType="gz", targetDir=None): filePath = filePath.split(".%s" % compressType)[0] if compressType == "gz": - from gzip import GzipFile - obj = GzipFile(patchFile) + import gzip + obj = gzip.GzipFile(patchFile) elif compressType == "bz2": - from bz2 import BZ2File - obj = BZ2File(patchFile) + import bz2 + obj = bz2.BZ2File(patchFile) open(filePath, "w").write(obj.read()) return filePath @@ -662,7 +660,7 @@ def filter_latest_packages(package_paths): """ For a given pisi package paths list where there may also be multiple versions of the same package, filters only the latest versioned ones """ - from pisi.version import Version + import pisi.version latest = {} for path in package_paths: @@ -671,7 +669,7 @@ def filter_latest_packages(package_paths): name, version = parse_package_name(os.path.basename(path[:-len(ctx.const.package_suffix)])) if latest.has_key(name): - if Version(latest[name][2]) < Version(version): + if pisi.version.Version(latest[name][2]) < pisi.version.Version(version): latest[name] = (root, name, version) else: if version: From 5d4a0af2987cbf9b80ad5c2d838ce9b33c6906e6 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 13:09:07 +0000 Subject: [PATCH 059/212] [MERGE] From-Import-Removal --- pisi/sourcearchive.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py index e98dbb0f..394a26c0 100644 --- a/pisi/sourcearchive.py +++ b/pisi/sourcearchive.py @@ -11,9 +11,7 @@ # python standard library -from os.path import join, basename -from os import access, R_OK - +import os import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext @@ -22,10 +20,10 @@ _ = __trans.ugettext import pisi import pisi.util as util import pisi.context as ctx -from pisi.archive import Archive -from pisi.uri import URI -from pisi.fetcher import fetch_url -from pisi.mirrors import Mirrors +import pisi.archive +import pisi.uri +import pisi.fetcher +import pisi.mirrors class Error(pisi.Error): pass @@ -34,9 +32,9 @@ class SourceArchive: """source archive. this is a class responsible for fetching and unpacking a source archive""" def __init__(self, spec, pkg_work_dir): - self.url = URI(spec.source.archive.uri) + self.url = pisi.uri.URI(spec.source.archive.uri) self.pkg_work_dir = pkg_work_dir - self.archiveFile = join(ctx.config.archives_dir(), self.url.filename()) + self.archiveFile = os.path.join(ctx.config.archives_dir(), self.url.filename()) self.archive = spec.source.archive def fetch(self, interactive=True): @@ -50,7 +48,7 @@ class SourceArchive: if self.url.get_uri().startswith("mirrors://"): self.fetch_from_mirror() else: - fetch_url(self.url, ctx.config.archives_dir(), self.progress) + pisi.fetcher.fetch_url(self.url, ctx.config.archives_dir(), self.progress) except pisi.fetcher.FetchError: if ctx.config.values.build.fallback: self.fetch_from_fallback() @@ -58,10 +56,10 @@ class SourceArchive: raise def fetch_from_fallback(self): - archive = basename(self.url.get_uri()) - src = join(ctx.config.values.build.fallback, archive) + archive = os.path.basename(self.url.get_uri()) + src = os.path.join(ctx.config.values.build.fallback, archive) ctx.ui.warning(_('Trying fallback address: %s') % src) - fetch_url(src, ctx.config.archives_dir(), self.progress) + pisi.fetcher.fetch_url(src, ctx.config.archives_dir(), self.progress) def fetch_from_mirror(self): uri = self.url.get_uri() @@ -69,15 +67,15 @@ class SourceArchive: name = sep.pop(0) archive = "/".join(sep) - mirrors = Mirrors().get_mirrors(name) + mirrors = pisi.mirrors.Mirrors().get_mirrors(name) if not mirrors: raise Error(_("%s mirrors are not defined.") % name) for mirror in mirrors: try: - url = join(mirror, archive) + url = os.path.join(mirror, archive) ctx.ui.warning(_('Fetching source from mirror: %s') % url) - fetch_url(url, ctx.config.archives_dir(), self.progress) + pisi.fetcher.fetch_url(url, ctx.config.archives_dir(), self.progress) return except pisi.fetcher.FetchError: pass @@ -85,7 +83,7 @@ class SourceArchive: raise pisi.fetcher.FetchError(_('Could not fetch source from %s mirrors.') % name); def is_cached(self, interactive=True): - if not access(self.archiveFile, R_OK): + if not os.access(self.archiveFile, os.R_OK): return False # check hash @@ -102,5 +100,5 @@ class SourceArchive: if not util.check_file_hash(self.archiveFile, self.archive.sha1sum): raise Error, _("unpack: check_file_hash failed") - archive = Archive(self.archiveFile, self.archive.type) + archive = pisi.archive.Archive(self.archiveFile, self.archive.type) archive.unpack(self.pkg_work_dir, clean_dir) From 1376d140147e8db3a1d6ed68191c4156d13b4a1a Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 13:09:56 +0000 Subject: [PATCH 060/212] [MERGE] we don' need to calculate the size of a symlink. --- pisi/util.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pisi/util.py b/pisi/util.py index 68228639..5fd4b6b8 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -302,7 +302,6 @@ def dir_size(dir): def sizes(): for root, dirs, files in os.walk(dir): yield sum([os.path.getsize(join_path(root, name)) for name in files if not os.path.islink(join_path(root, name))]) - yield sum([long(len(os.readlink((join_path(root, name))))) for name in files if os.path.islink(join_path(root, name))]) return sum(sizes()) def copy_file(src,dest): @@ -312,7 +311,7 @@ def copy_file(src,dest): shutil.copyfile(src, dest) def is_ar_file(file_path): - return open(file_path).readline().strip() == '!' + return open(file_path).readline().strip() == '!' def clean_ar_timestamps(ar_file): """Zero all timestamps in the ar files.""" From e24c7652880aada8a98a4bbebbe137e17f293223 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 13:22:07 +0000 Subject: [PATCH 061/212] [MERGE] colors to constants, colorize to util module. --- pisi/cli/__init__.py | 17 ++++++------ pisi/cli/colors.py | 64 -------------------------------------------- pisi/cli/commands.py | 10 +++---- pisi/constants.py | 41 ++++++++++++++++++++++++++++ pisi/util.py | 8 ++++++ 5 files changed, 61 insertions(+), 79 deletions(-) delete mode 100644 pisi/cli/colors.py diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index f2b69f5f..9b35e399 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -22,7 +22,6 @@ import pisi import pisi.context as ctx import pisi.ui import pisi.util -import pisi.cli.colors as colors class Error(pisi.Error): pass @@ -76,7 +75,7 @@ class CLI(pisi.ui.UI): if ctx.get_option('no_color'): self.output(_('Warning: ') + msg + '\n', err=True, verbose=verbose) else: - self.output(colors.colorize(msg + '\n', 'brightred'), err=True, verbose=verbose) + self.output(pisi.util.colorize(msg + '\n', 'brightred'), err=True, verbose=verbose) def error(self, msg): msg = unicode(msg) @@ -85,21 +84,21 @@ class CLI(pisi.ui.UI): if ctx.get_option('no_color'): self.output(_('Error: ') + msg + '\n', err=True) else: - self.output(colors.colorize(msg + '\n', 'red'), err=True) + self.output(pisi.util.colorize(msg + '\n', 'red'), err=True) def action(self, msg, verbose = False): #TODO: this seems quite redundant? msg = unicode(msg) if ctx.log: ctx.log.info(msg) - self.output(colors.colorize(msg + '\n', 'green')) + self.output(pisi.util.colorize(msg + '\n', 'green')) def choose(self, msg, opts): print msg for i in range(0,len(opts)): print i + 1, opts(i) while True: - s = raw_input(msg + colors.colorize('1-%d' % len(opts), 'red')) + s = raw_input(msg + pisi.util.colorize('1-%d' % len(opts), 'red')) try: opt = int(s) if 1 <= opt and opt <= len(opts): @@ -115,7 +114,7 @@ class CLI(pisi.ui.UI): import re yesexpr = re.compile(locale.nl_langinfo(locale.YESEXPR)) - prompt = msg + colors.colorize(_(' (yes/no)'), 'red') + prompt = msg + pisi.util.colorize(_(' (yes/no)'), 'red') s = raw_input(prompt.encode('utf-8')) if yesexpr.search(s): return True @@ -136,12 +135,12 @@ class CLI(pisi.ui.UI): self.output("\r%s (%d%%)" % (info, percent)) if percent == 100: - self.output(colors.colorize(_(' [complete]\n'), 'gray')) + self.output(pisi.util.colorize(_(' [complete]\n'), 'gray')) def status(self, msg = None): if msg: msg = unicode(msg) - self.output(colors.colorize(msg + '\n', 'brightgreen')) + self.output(pisi.util.colorize(msg + '\n', 'brightgreen')) pisi.util.xterm_title(msg) def notify(self, event, **keywords): @@ -158,6 +157,6 @@ class CLI(pisi.ui.UI): else: msg = None if msg: - self.output(colors.colorize(msg + '\n', 'cyan')) + self.output(pisi.util.colorize(msg + '\n', 'cyan')) if ctx.log: ctx.log.info(msg) diff --git a/pisi/cli/colors.py b/pisi/cli/colors.py deleted file mode 100644 index e7d37171..00000000 --- a/pisi/cli/colors.py +++ /dev/null @@ -1,64 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2005 - 2007, TUBITAK/UEKAE -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. -# -# Please read the COPYING file. -# - -"""Colors module provides some color codes for console output.""" - -import pisi.context as ctx - -colors = {'black' : "\033[30m", - 'red' : "\033[31m", - 'green' : "\033[32m", - 'yellow' : "\033[33m", - 'blue' : "\033[34m", - 'purple' : "\033[35m", - 'cyan' : "\033[36m", - 'white' : "\033[37m", - 'brightblack' : "\033[01;30m", - 'brightred' : "\033[01;31m", - 'brightgreen' : "\033[01;32m", - 'brightyellow' : "\033[01;33m", - 'brightblue' : "\033[01;34m", - 'brightmagenta' : "\033[01;35m", - 'brightcyan' : "\033[01;36m", - 'brightwhite' : "\033[01;37m", - 'underlineblack' : "\033[04;30m", - 'underlinered' : "\033[04;31m", - 'underlinegreen' : "\033[04;32m", - 'underlineyellow' : "\033[04;33m", - 'underlineblue' : "\033[04;34m", - 'underlinemagenta' : "\033[04;35m", - 'underlinecyan' : "\033[04;36m", - 'underlinewhite' : "\033[04;37m", - 'blinkingblack' : "\033[05;30m", - 'blinkingred' : "\033[05;31m", - 'blinkinggreen' : "\033[05;32m", - 'blinkingyellow' : "\033[05;33m", - 'blinkingblue' : "\033[05;34m", - 'blinkingmagenta' : "\033[05;35m", - 'blinkingcyan' : "\033[05;36m", - 'blinkingwhite' : "\033[05;37m", - 'backgroundblack' : "\033[07;30m", - 'backgroundred' : "\033[07;31m", - 'backgroundgreen' : "\033[07;32m", - 'backgroundyellow' : "\033[07;33m", - 'backgroundblue' : "\033[07;34m", - 'backgroundmagenta' : "\033[07;35m", - 'backgroundcyan' : "\033[07;36m", - 'backgroundwhite' : "\033[07;37m", - 'default' : "\033[0m" } - -def colorize(msg, color): - """Colorize the given message for console output""" - if colors.has_key(color) and not ctx.get_option('no_color'): - return colors[color] + msg + colors['default'] - else: - return msg diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 529ca123..a144506b 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -22,8 +22,6 @@ import pisi.cli import pisi.context as ctx from pisi.uri import URI import pisi.util as util -import pisi.api as api -from colors import colorize class Error(pisi.Error): pass @@ -1367,7 +1365,7 @@ all repositories. self.init(database = True, write = False) if not (ctx.get_option('no_color') or ctx.config.get_option('uninstalled')): - ctx.ui.info(colorize(_('Installed packages are shown in this color'), 'green')) + ctx.ui.info(util.colorize(_('Installed packages are shown in this color'), 'green')) if self.args: for arg in self.args: @@ -1397,7 +1395,7 @@ all repositories. if p in installed_list: if ctx.config.get_option('uninstalled'): continue - p = colorize(p, 'green') + p = util.colorize(p, 'green') p = p + ' ' * max(0, 15 - lenp) ctx.ui.info('%s - %s ' % (p, unicode(package.summary))) @@ -1435,7 +1433,7 @@ repositories. else: lenp = len(p) #if p in installed_list: - # p = colorize(p, 'cyan') + # p = util.colorize(p, 'cyan') p = p + ' ' * max(0, 15 - lenp) ctx.ui.info('%s - %s ' % (component.name, unicode(component.summary))) self.finalize() @@ -1475,7 +1473,7 @@ Gives a brief list of sources published in the repositories. else: lenp = len(p) #if p in installed_list: - # p = colorize(p, 'cyan') + # p = util.colorize(p, 'cyan') p = p + ' ' * max(0, 15 - lenp) ctx.ui.info('%s - %s' % (sf.source.name, unicode(sf.source.summary))) self.finalize() diff --git a/pisi/constants.py b/pisi/constants.py index 619ce2fd..99a2aa25 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -101,6 +101,47 @@ class Constants: self.__c.executable = "executable" self.__c.data = "data" self.__c.localedata = "localedata" + self.__c.colors = {'black' : "\033[30m", + 'red' : "\033[31m", + 'green' : "\033[32m", + 'yellow' : "\033[33m", + 'blue' : "\033[34m", + 'purple' : "\033[35m", + 'cyan' : "\033[36m", + 'white' : "\033[37m", + 'brightblack' : "\033[01;30m", + 'brightred' : "\033[01;31m", + 'brightgreen' : "\033[01;32m", + 'brightyellow' : "\033[01;33m", + 'brightblue' : "\033[01;34m", + 'brightmagenta' : "\033[01;35m", + 'brightcyan' : "\033[01;36m", + 'brightwhite' : "\033[01;37m", + 'underlineblack' : "\033[04;30m", + 'underlinered' : "\033[04;31m", + 'underlinegreen' : "\033[04;32m", + 'underlineyellow' : "\033[04;33m", + 'underlineblue' : "\033[04;34m", + 'underlinemagenta' : "\033[04;35m", + 'underlinecyan' : "\033[04;36m", + 'underlinewhite' : "\033[04;37m", + 'blinkingblack' : "\033[05;30m", + 'blinkingred' : "\033[05;31m", + 'blinkinggreen' : "\033[05;32m", + 'blinkingyellow' : "\033[05;33m", + 'blinkingblue' : "\033[05;34m", + 'blinkingmagenta' : "\033[05;35m", + 'blinkingcyan' : "\033[05;36m", + 'blinkingwhite' : "\033[05;37m", + 'backgroundblack' : "\033[07;30m", + 'backgroundred' : "\033[07;31m", + 'backgroundgreen' : "\033[07;32m", + 'backgroundyellow' : "\033[07;33m", + 'backgroundblue' : "\033[07;34m", + 'backgroundmagenta' : "\033[07;35m", + 'backgroundcyan' : "\033[07;36m", + 'backgroundwhite' : "\033[07;37m", + 'default' : "\033[0m" } def __getattr__(self, attr): return getattr(self.__c, attr) diff --git a/pisi/util.py b/pisi/util.py index 5fd4b6b8..1b1e17b0 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -675,3 +675,11 @@ def filter_latest_packages(package_paths): latest[name] = (root, name, version) return map(lambda x:"%s/%s-%s.pisi" % x, latest.values()) + +def colorize(msg, color): + """Colorize the given message for console output""" + if ctx.const.colors.has_key(color) and not ctx.get_option('no_color'): + return ctx.const.colors[color] + msg + ctx.const.colors['default'] + else: + return msg + From 9bd38201061dcadff11ecb660be90bbd74c7f09a Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 13:33:23 +0000 Subject: [PATCH 062/212] [MERGE] From-Import-Removal --- pisi/pxml/xmlfile.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pisi/pxml/xmlfile.py b/pisi/pxml/xmlfile.py index d2de7cc7..3a46af6c 100644 --- a/pisi/pxml/xmlfile.py +++ b/pisi/pxml/xmlfile.py @@ -31,8 +31,7 @@ import exceptions import piksemel as iks import pisi -from pisi.file import File -from pisi.util import join_path as join +import pisi.file class Error(pisi.Error): pass @@ -74,9 +73,9 @@ class XmlFile(object): def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None, copylocal = False): - uri = File.make_uri(uri) + uri = pisi.file.File.make_uri(uri) #try: - localpath = File.download(uri, tmpDir, sha1sum=sha1sum, + localpath = pisi.file.File.download(uri, tmpDir, sha1sum=sha1sum, compress=compress,sign=sign, copylocal=copylocal) #except IOError, e: # raise Error(_("Cannot read URI %s: %s") % (uri, unicode(e)) ) @@ -87,7 +86,7 @@ class XmlFile(object): raise Error(_("File '%s' has invalid XML") % (localpath) ) def writexml(self, uri, tmpDir = '/tmp', sha1sum=False, compress=None, sign=None): - f = File(uri, File.write, sha1sum=sha1sum, compress=compress, sign=sign) + f = pisi.file.File(uri, pisi.file.File.write, sha1sum=sha1sum, compress=compress, sign=sign) f.write(self.doc.toPrettyString()) f.close() From 45aaee141ea1f9cc7c4e2793e44961f74db9d6d6 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 19:36:57 +0000 Subject: [PATCH 063/212] [MERGE] From-Import-Removal --- pisi/pxml/autoxml.py | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py index 712064fd..00cf3bb9 100644 --- a/pisi/pxml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -25,7 +25,7 @@ import codecs import types import formatter import sys -from StringIO import StringIO +import StringIO import gettext __trans = gettext.translation('pisi', fallback=True) @@ -33,8 +33,8 @@ _ = __trans.ugettext # PiSi import pisi -from pisi.pxml.xmlext import * -from pisi.pxml.xmlfile import XmlFile +import pisi.pxml.xmlext as xmlext +import pisi.pxml.xmlfile as xmlfile import pisi.context as ctx import pisi.util as util import pisi.oo as oo @@ -71,15 +71,15 @@ class LocalText(dict): def decode(self, node, errs, where = ""): # flags, tag name, instance attribute assert self.tag != '' - nodes = getAllNodes(node, self.tag) + nodes = xmlext.getAllNodes(node, self.tag) if not nodes: if self.req == mandatory: errs.append(where + ': ' + _("At least one '%s' tag should have local text") % self.tag ) else: for node in nodes: - lang = getNodeAttribute(node, 'xml:lang') - c = getNodeText(node) + lang = xmlext.getNodeAttribute(node, 'xml:lang') + c = xmlext.getNodeText(node) if not c: errs.append(where + ': ' + _("'%s' language of tag '%s' is empty") % (lang, self.tag)) @@ -91,9 +91,9 @@ class LocalText(dict): def encode(self, node, errs): assert self.tag != '' for key in self.iterkeys(): - newnode = addNode(node, self.tag) - setNodeAttribute(newnode, 'xml:lang', key) - addText(newnode, '', self[key]) + newnode = xmlext.addNode(node, self.tag) + xmlext.setNodeAttribute(newnode, 'xml:lang', key) + xmlext.addText(newnode, '', self[key]) #FIXME: maybe more appropriate for pisi.util @staticmethod @@ -249,7 +249,7 @@ class autoxml(oo.autosuper, oo.autoprop): # standard initialization super(autoxml, cls).__init__(name, bases, dict) - xmlfile_support = XmlFile in bases + xmlfile_support = xmlfile.XmlFile in bases cls.autoxml_bases = filter(lambda base: isinstance(base, autoxml), bases) @@ -320,9 +320,9 @@ class autoxml(oo.autosuper, oo.autoprop): **args): if xmlfile_support: if args.has_key('tag'): - XmlFile.__init__(self, tag = args['tag']) + xmlfile.XmlFile.__init__(self, tag = args['tag']) else: - XmlFile.__init__(self, tag = cls.tag) + xmlfile.XmlFile.__init__(self, tag = cls.tag) for base in cls.autoxml_bases: base.__init__(self) for init in inits: @@ -393,7 +393,7 @@ class autoxml(oo.autosuper, oo.autoprop): cls.print_text = print_text if not dict.has_key('__str__'): def str(self): - strfile = StringIO() + strfile = StringIO.StringIO() self.print_text(strfile) str = strfile.getvalue() strfile.close() @@ -489,10 +489,10 @@ class autoxml(oo.autosuper, oo.autoprop): tag_type = spec[0] assert type(tag_type) == type(type) def readtext(node, attr): - return getNodeAttribute(node, attr) + return xmlext.getNodeAttribute(node, attr) def writetext(node, attr, text): #print 'write attr', attr, text - setNodeAttribute(node, attr, text) + xmlext.setNodeAttribute(node, attr, text) anonfuns = cls.gen_anon_basic(attr, spec, readtext, writetext) return cls.gen_named_comp(attr, spec, anonfuns) @@ -510,10 +510,10 @@ class autoxml(oo.autosuper, oo.autoprop): autoxml.basic_cons_map.has_key(tag_type): def readtext(node, tagpath): #print 'read tag', node, tagpath - return getNodeText(node, tagpath) + return xmlext.getNodeText(node, tagpath) def writetext(node, tagpath, text): #print 'write tag', node, tagpath, text - addText(node, tagpath, text) + xmlext.addText(node, tagpath, text) return cls.gen_anon_basic(tag, spec, readtext, writetext) elif type(tag_type) is types.ListType: return cls.gen_list_tag(tag, spec) @@ -532,9 +532,9 @@ class autoxml(oo.autosuper, oo.autoprop): assert type(tag_type) == type(type) def readtext(node, blah): #node.normalize() # piksemel doesn't have this - return getNodeText(node) + return xmlext.getNodeText(node) def writetext(node, blah, text): - addText(node, "", text) + xmlext.addText(node, "", text) anonfuns = cls.gen_anon_basic(token, spec, readtext, writetext) return cls.gen_named_comp(token, spec, anonfuns) @@ -692,7 +692,7 @@ class autoxml(oo.autosuper, oo.autoprop): return make_object() def decode(node, errs, where): - node = getNode(node, tag) + node = xmlext.getNode(node, tag) if node: try: obj = make_object() @@ -709,9 +709,9 @@ class autoxml(oo.autosuper, oo.autoprop): if node and obj: try: #FIXME: this doesn't look pretty - classnode = newNode(node, tag) + classnode = xmlext.newNode(node, tag) obj.encode(classnode, errs) - addNode(node, '', classnode) + xmlext.addNode(node, '', classnode) except Error: if req == mandatory: # note: we can receive an error if obj has no content @@ -750,14 +750,14 @@ class autoxml(oo.autosuper, oo.autoprop): def decode(node, errs, where): l = [] - nodes = getAllNodes(node, path) + nodes = xmlext.getAllNodes(node, path) #print node, tag + '/' + comp_tag, nodes if len(nodes)==0 and req==mandatory: errs.append(where + ': ' + _('Mandatory list "%s" under "%s" node is empty.') % (path, node.name())) ix = 1 for node in nodes: - dummy = newNode(node, "Dummy") - addNode(dummy, '', node) + dummy = xmlext.newNode(node, "Dummy") + xmlext.addNode(dummy, '', node) l.append(decode_item(dummy, errs, where + unicode("[%s]" % ix))) #l.append(decode_item(node, errs, where + unicode("[%s]" % ix))) ix += 1 @@ -767,7 +767,7 @@ class autoxml(oo.autosuper, oo.autoprop): if l and len(l) > 0: for item in l: if list_tagpath: - listnode = addNode(node, list_tagpath, branch = False) + listnode = xmlext.addNode(node, list_tagpath, branch = False) else: listnode = node encode_item(listnode, item, errs) From 06d6fd768703321973e6d754b0a38828f93df39f Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 19:43:19 +0000 Subject: [PATCH 064/212] [MERGE] From-Import-Removal --- pisi/pxml/autoxml.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py index 00cf3bb9..443697e5 100644 --- a/pisi/pxml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -26,6 +26,8 @@ import types import formatter import sys import StringIO +import inspect +import re import gettext __trans = gettext.translation('pisi', fallback=True) @@ -274,13 +276,9 @@ class autoxml(oo.autosuper, oo.autoprop): # read declaration order from source # code contributed by bahadir kandemir try: - from inspect import getsourcelines - from itertools import ifilter - import re - fn = re.compile('\s*([tas]_[a-zA-Z]+).*').findall - lines = filter(fn, getsourcelines(cls)[0]) + lines = filter(fn, inspect.getsourcelines(cls)[0]) decl_order = map(lambda x:x.split()[0], lines) except IOError: decl_order = dict.keys() From 21801043996b2ce8d85a68ef15019ec1a56397e2 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 19:57:55 +0000 Subject: [PATCH 065/212] autoxml.XmlFile -> autoxml.xmlfile.XmlFile --- pisi/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/files.py b/pisi/files.py index ecdc6c5d..aed0614d 100644 --- a/pisi/files.py +++ b/pisi/files.py @@ -38,7 +38,7 @@ class FileInfo: return s -class Files(autoxml.XmlFile): +class Files(autoxml.xmlfile.XmlFile): __metaclass__ = autoxml.autoxml From 792464c472f068163fb66fdeed774d3762a7a4e6 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 20:05:53 +0000 Subject: [PATCH 066/212] =?UTF-8?q?[MERGE]=C2=A0From-Import-Removal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/pgraph.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pisi/pgraph.py b/pisi/pgraph.py index ca1c8413..52894096 100644 --- a/pisi/pgraph.py +++ b/pisi/pgraph.py @@ -14,11 +14,12 @@ import string -from graph import * +import pisi +import graph # Cache the results from packagedb queries in a graph -class PGraph(Digraph): +class PGraph(graph.Digraph): def __init__(self, packagedb, repo = pisi.itembyrepodb.repos): super(PGraph, self).__init__() From 547fe821bdcad65ece877aedf946e1d5993a642d Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 20:10:05 +0000 Subject: [PATCH 067/212] [MERGE] From-Import-Removal --- pisi/package.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pisi/package.py b/pisi/package.py index 2ee46aef..ebadd386 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -12,7 +12,7 @@ """package abstraction methods to add/remove files, extract control files""" -from os.path import join, exists, basename, dirname, getsize +import os.path import gettext __trans = gettext.translation('pisi', fallback=True) @@ -25,6 +25,7 @@ from pisi.uri import URI from pisi.metadata import MetaData from pisi.files import Files import pisi.util as util +import fetcher class Error(pisi.Error): pass @@ -43,13 +44,12 @@ class Package: self.impl = archive.ArchiveZip(self.filepath, 'zip', mode) def fetch_remote_file(self, url): - from fetcher import fetch_url dest = ctx.config.packages_dir() - self.filepath = join(dest, url.filename()) + self.filepath = os.path.join(dest, url.filename()) - if not exists(self.filepath): + if not os.path.exists(self.filepath): try: - fetch_url(url, dest, ctx.ui.Progress) + fetcher.fetch_url(url, dest, ctx.ui.Progress) except pisi.fetcher.FetchError: # Bug 3465 if ctx.get_option('reinstall'): @@ -87,7 +87,7 @@ class Package: def extract_install(self, outdir): if self.impl.has_file(ctx.const.install_tar_lzma): self.extract_file(ctx.const.install_tar_lzma, ctx.config.tmp_dir()) - tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), 'tarlzma', False, False) + tar = archive.ArchiveTar(os.path.join(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), 'tarlzma', False, False) tar.unpack_dir(outdir) else: self.extract_dir_flat('install', outdir) @@ -129,14 +129,14 @@ class Package: self.extract_pisi_files(outdir) self.metadata = MetaData() - self.metadata.read( join(outdir, ctx.const.metadata_xml) ) + self.metadata.read( os.path.join(outdir, ctx.const.metadata_xml) ) errs = self.metadata.errors() if errs: util.print_errors(errs) raise Error, _("MetaData format wrong") self.files = Files() - self.files.read( join(outdir, ctx.const.files_xml) ) + self.files.read( os.path.join(outdir, ctx.const.files_xml) ) if self.files.errors(): raise Error, _("Invalid %s") % ctx.const.files_xml @@ -145,7 +145,7 @@ class Package: + self.metadata.package.version + '-' \ + self.metadata.package.release - return join( ctx.config.lib_dir(), 'package', packageDir) + return os.path.join( ctx.config.lib_dir(), 'package', packageDir) def comar_dir(self): - return join(self.pkg_dir(), ctx.const.comar_dir) + return os.path.join(self.pkg_dir(), ctx.const.comar_dir) From 06b984fe300e5d1e6c953c81de35c14be4c0c828 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 20:12:16 +0000 Subject: [PATCH 068/212] [MERGE] From-Import-Removal --- pisi/package.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pisi/package.py b/pisi/package.py index ebadd386..0e1a3d4e 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -21,9 +21,9 @@ _ = __trans.ugettext import pisi import pisi.context as ctx import pisi.archive as archive -from pisi.uri import URI -from pisi.metadata import MetaData -from pisi.files import Files +import pisi.uri +import pisi.metadata +import pisi.files import pisi.util as util import fetcher @@ -36,7 +36,7 @@ class Package: file).""" def __init__(self, packagefn, mode='r'): self.filepath = packagefn - url = URI(packagefn) + url = pisi.uri.URI(packagefn) if url.is_remote_file(): self.fetch_remote_file(url) @@ -111,13 +111,13 @@ class Package: def get_metadata(self): """reads metadata.xml from the PiSi package and returns MetaData object""" - md = MetaData() + md = pisi.metadata.MetaData() md.parse(self.impl.read_file(ctx.const.metadata_xml)) return md def get_files(self): """reads files.xml from the PiSi package and returns Files object""" - files = Files() + files = pisi.files.Files() files.parse(self.impl.read_file(ctx.const.files_xml)) return files @@ -128,14 +128,14 @@ class Package: # extract control files self.extract_pisi_files(outdir) - self.metadata = MetaData() + self.metadata = pisi.metadata.MetaData() self.metadata.read( os.path.join(outdir, ctx.const.metadata_xml) ) errs = self.metadata.errors() if errs: util.print_errors(errs) raise Error, _("MetaData format wrong") - self.files = Files() + self.files = pisi.files.Files() self.files.read( os.path.join(outdir, ctx.const.files_xml) ) if self.files.errors(): raise Error, _("Invalid %s") % ctx.const.files_xml From 61d8d9452cfe8dca82d696ebe1b0581608507ecd Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 06:45:56 +0000 Subject: [PATCH 069/212] [MERGE] * From-Import-Removal * get history from PackageDB. trunk was filling pkg.history = packagedb.get_history... but this was also missing here.. --- pisi/operations.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index 9dbfa432..6829a945 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -18,8 +18,8 @@ __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi +import pisi.package import pisi.context as ctx -from pisi.uri import URI import pisi.util as util import pisi.dependency as dependency import pisi.conflict @@ -27,11 +27,9 @@ import pisi.pgraph as pgraph import pisi.packagedb as packagedb import pisi.repodb import pisi.installdb -from pisi.index import Index import pisi.cli import pisi.atomicoperations as atomicoperations import pisi.ui as ui -from pisi.version import Version class Error(pisi.Error): pass @@ -79,10 +77,6 @@ def install(packages, reinstall = False, ignore_file_conflicts=False): if not ctx.get_option('ignore_file_conflicts'): ctx.set_option('ignore_file_conflicts', ignore_file_conflicts) - # FIXME: this function name "install" makes impossible to import - # and use install module directly. - from pisi.atomicoperations import Error as InstallError - # determine if this is a list of files/urls or names if packages and packages[0].endswith(ctx.const.package_suffix): # they all have to! return install_pkg_files(packages) @@ -105,7 +99,6 @@ def reorder_base_packages(order): def install_pkg_files(package_URIs): """install a number of pisi package files""" - from package import Package ctx.ui.debug('A = %s' % str(package_URIs)) @@ -124,7 +117,7 @@ def install_pkg_files(package_URIs): d_t = {} dfn = {} for x in package_URIs: - package = Package(x) + package = pisi.package.Package(x) package.read() name = str(package.metadata.package.name) d_t[name] = package.metadata.package @@ -291,7 +284,7 @@ def is_upgradable(name, ignore_build = False): except Exception, e: #FIXME: what exception could we catch here, replace with that. return False if ignore_build or (not build) or (not pkg.build): - return Version(release) < Version(pkg.release) + return pisi.version.Version(release) < pisi.version.Version(pkg.release) else: return build < pkg.build @@ -442,12 +435,13 @@ def upgrade_pkg_names(A = []): continue if security_only: - updates = [i for i in pkg.history if Version(i.release) > Version(release)] + history = ctx.packageDB.get_history(x) + updates = [i for i in history if pisi.version.Version(i.release) > pisi.version.Version(release)] if not pisi.util.any(lambda i:i.type == 'security', updates): continue if ignore_build or (not build) or (not pkg.build): - if Version(release) < Version(pkg.release): + if pisi.version.Version(release) < pisi.version.Version(pkg.release): Ap.append(x) else: ctx.ui.info(_('Package %s is already at the latest release %s.') From 4f94121ab02d928f99e1975a40515cb7a94ea69f Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 06:49:16 +0000 Subject: [PATCH 070/212] [MERGE] From-Import-Removal --- pisi/mirrors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/mirrors.py b/pisi/mirrors.py index e0c75386..b17e1b42 100644 --- a/pisi/mirrors.py +++ b/pisi/mirrors.py @@ -10,8 +10,8 @@ # Please read the COPYING file. import os.path +import pisi import pisi.context as ctx -from pisi import Error import gettext __trans = gettext.translation('pisi', fallback=True) @@ -43,5 +43,5 @@ class Mirrors: (name, url) = mirror self._add_mirror(name, url) else: - raise Error(_('Mirrors file %s does not exist. Could not resolve mirrors://') % config) + raise pisi.Error(_('Mirrors file %s does not exist. Could not resolve mirrors://') % config) From 0b3126248d409c1873e955958123429863485b06 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 06:53:33 +0000 Subject: [PATCH 071/212] [MERGE] From-Import-Removal --- pisi/index.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pisi/index.py b/pisi/index.py index d9776c78..279a9394 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -26,19 +26,17 @@ import pisi.metadata as metadata import pisi.packagedb as packagedb import pisi.sourcedb as sourcedb import pisi.util as util -from pisi.package import Package -from pisi.pxml.xmlfile import XmlFile -from pisi.file import File +import pisi.package +import pisi.pxml.xmlfile as xmlfile +import pisi.file import pisi.pxml.autoxml as autoxml -from pisi.uri import URI import pisi.component as component import pisi.specfile as specfile - class Error(pisi.Error): pass -class Index(XmlFile): +class Index(xmlfile.XmlFile): __metaclass__ = autoxml.autoxml tag = "PISI" @@ -54,7 +52,7 @@ class Index(XmlFile): def read_uri(self, uri, tmpdir, force = False): self.read(uri, tmpDir=tmpdir, sha1sum=not force, - compress=File.auto, sign=File.detached, copylocal = True) + compress=pisi.file.File.auto, sign=pisi.file.File.detached, copylocal = 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): @@ -82,7 +80,7 @@ class Index(XmlFile): def check_signature(self, filename, repo): tmpdir = os.path.join(ctx.config.index_dir(), repo) - File.check_signature(filename, tmpdir) + pisi.file.File.check_signature(filename, tmpdir) def index(self, repo_uri, skip_sources=False): self.repo_dir = repo_uri @@ -140,7 +138,7 @@ class Index(XmlFile): update_progress() def add_package(self, path, deltas, repo_uri): - package = Package(path, 'r') + package = pisi.package.Package(path, 'r') md = package.get_metadata() md.package.packageSize = os.path.getsize(path) md.package.packageHash = util.sha1_file(path) From 29edefe5ea07d7e01492066035ef58ee8d161ee8 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 07:22:19 +0000 Subject: [PATCH 072/212] [MERGE] From-Import-Removal --- pisi/fetcher.py | 53 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/pisi/fetcher.py b/pisi/fetcher.py index 7e9ae626..a52fa61f 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -22,12 +22,12 @@ import ftplib import os import socket import sys -from mimetypes import guess_type -from mimetools import Message -from base64 import encodestring -from shutil import move -from time import time -from time import gmtime +import mimetypes +import mimetools +import base64 +import shutil +import time +import httplib import gettext __trans = gettext.translation('pisi', fallback=True) @@ -37,7 +37,7 @@ _ = __trans.ugettext import pisi import pisi.util as util import pisi.context as ctx -from pisi.uri import URI +import pisi.uri class FetchError(pisi.Error): pass @@ -57,8 +57,8 @@ class Fetcher: """Fetcher can fetch a file from various sources using various protocols.""" def __init__(self, url, destdir, resume = True): - if not isinstance(url, URI): - url = URI(url) + if not isinstance(url, pisi.uri.URI): + url = pisi.uri.URI(url) if ctx.config.get_option("authinfo"): url.set_auth_info(ctx.config.get_option("authinfo")) @@ -99,17 +99,17 @@ class Fetcher: os.remove(partial_file) self.err(_('A problem occured. Please check the archive address and/or permissions again.')) - move(partial_file, archive_file) + shutil.move(partial_file, archive_file) return archive_file def _do_grab(self, fileURI, dest, total_size): - bs, tt, = 1024, int(time()) - s_time = time() - Tdiff = lambda: time() - s_time + bs, tt, = 1024, int(time.time()) + s_time = time.time() + Tdiff = lambda: time.time() - s_time downloaded_size = exist_size = self.exist_size symbol = 'B/s' - st = time() + st = time.time() chunk = fileURI.read(bs) downloaded_size += len(chunk) @@ -122,17 +122,17 @@ class Fetcher: dest.write(chunk) chunk = fileURI.read(bs) downloaded_size += len(chunk) - ct = time() + ct = time.time() if int(tt) != int(ct): self.rate = (downloaded_size - exist_size) / (ct - st) if self.percent: self.eta = '%02d:%02d:%02d' %\ - tuple([i for i in gmtime((Tdiff() * (100 - self.percent)) / self.percent)[3:6]]) + tuple([i for i in time.gmtime((Tdiff() * (100 - self.percent)) / self.percent)[3:6]]) self.rate, symbol = util.human_readable_rate(self.rate) - tt = time() + tt = time.time() if self.progress: if p.update(downloaded_size): @@ -163,7 +163,6 @@ class Fetcher: self._do_grab(fileObj, dest, total_size) def fetchRemoteFile (self, archive_file): - from httplib import HTTPException if os.path.exists(archive_file) and self.resume: if self.scheme == 'http' or self.scheme == 'https' or self.scheme == 'ftp': @@ -194,7 +193,7 @@ class Fetcher: self.err(_('Please check your network connections and try again. (%s)') % e[-1][-1]) except OSError, e: self.err(_('Cannot fetch %s; %s') % (uri, e)) - except HTTPException, e: + except httplib.HTTPException, e: self.err(_('Cannot fetch %s; (%s): %s') % (uri, e.__class__.__name__, e)) finally: if flag: @@ -212,7 +211,7 @@ class Fetcher: def formatRequest(self, request): if self.url.auth_info(): - enc = encodestring('%s:%s' % self.url.auth_info()) + enc = base64.encodestring('%s:%s' % self.url.auth_info()) request.add_header('Authorization', 'Basic %s' % enc) range_handlers = { @@ -230,15 +229,15 @@ class Fetcher: if ctx.config.values.general.http_proxy and self.url.scheme() == "http": http_proxy = ctx.config.values.general.http_proxy - proxy_handler = urllib2.ProxyHandler({URI(http_proxy).scheme(): http_proxy}) + proxy_handler = urllib2.ProxyHandler({pisi.uri.URI(http_proxy).scheme(): http_proxy}) elif ctx.config.values.general.https_proxy and self.url.scheme() == "https": https_proxy = ctx.config.values.general.https_proxy - proxy_handler = urllib2.ProxyHandler({URI(https_proxy): https_proxy}) + proxy_handler = urllib2.ProxyHandler({pisi.uri.URI(https_proxy): https_proxy}) elif ctx.config.values.general.ftp_proxy and self.url.scheme() == "ftp": ftp_proxy = ctx.config.values.general.ftp_proxy - proxy_handler = urllib2.ProxyHandler({URI(http_proxy): ftp_proxy}) + proxy_handler = urllib2.ProxyHandler({pisi.uri.URI(http_proxy): ftp_proxy}) if proxy_handler: ctx.ui.info(_("Proxy configuration has been found for '%s' protocol") % self.url.scheme()) @@ -312,18 +311,18 @@ class FTPRangeHandler(urllib2.FTPHandler): raise RangeError headers = '' - mtype = guess_type(req.get_full_url())[0] + mtype = mimetypes.guess_type(req.get_full_url())[0] if mtype: headers += 'Content-Type: %s\n' % mtype if retrlen is not None and retrlen >= 0: headers += 'Content-Length: %d\n' % retrlen try: - from cStringIO import StringIO + import cStringIO as StringIO except ImportError, msg: - from StringIO import StringIO + import StringIO - return urllib.addinfourl(fp, Message(StringIO(headers)), req.get_full_url()) + return urllib.addinfourl(fp, mimetools.Message(StringIO.StringIO(headers)), req.get_full_url()) except ftplib.all_errors, msg: raise IOError, (_('ftp error'), msg), sys.exc_info()[2] From fa46a226ccab9a7ff5da466df0b7a1ed5597f580 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 07:35:59 +0000 Subject: [PATCH 073/212] [MERGE] From-Import-Removal --- pisi/lockeddbshelve.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pisi/lockeddbshelve.py b/pisi/lockeddbshelve.py index 64da9c33..67b073e4 100644 --- a/pisi/lockeddbshelve.py +++ b/pisi/lockeddbshelve.py @@ -25,8 +25,7 @@ _ = __trans.ugettext import pisi import pisi.context as ctx from pisi.util import join_path - -from pisi.version import Version +import pisi.version class Error(pisi.Error): pass @@ -40,8 +39,8 @@ def check_dbversion(versionfile, ver, write=False, update=False): if os.path.exists(verfn): verfile = file(verfn, 'r') ls = verfile.readlines() - currver = Version(ls[0]) - dbver = Version(ver) + currver = pisi.version.Version(ls[0]) + dbver = pisi.version.Version(ver) if currver < dbver: if not update: raise Error(_('Database version for %s insufficient. Please run rebuild-db command.') % versionfile) From 8b9e5cfd57f7f8e14f3b6c179f14a129256350de Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 08:17:44 +0000 Subject: [PATCH 074/212] [MERGE] From-Import-Removal --- pisi/build.py | 194 +++++++++++++++++++++++++------------------------- 1 file changed, 96 insertions(+), 98 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 7649e282..d8b665cd 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -15,30 +15,28 @@ import os import sys import glob -from copy import deepcopy -from os.path import basename, dirname -from stat import S_IMODE -from pwd import getpwnam -from grp import getgrnam +import copy +import stat +import pwd +import grp import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi -from pisi.specfile import SpecFile -import pisi.util as util -from pisi.util import join_path as join, parenturi -from pisi.file import File +import pisi.specfile +import pisi.util +import pisi.file import pisi.context as ctx import pisi.dependency as dependency import pisi.operations as operations -from pisi.sourcearchive import SourceArchive -from pisi.files import Files, FileInfo -from pisi.fetcher import fetch_url -from pisi.uri import URI -from pisi.metadata import MetaData -from pisi.package import Package +import pisi.sourcearchive +import pisi.files +import pisi.fetcher +import pisi.uri +import pisi.metadata +import pisi.package import pisi.component as component import pisi.archive as archive import pisi.actionsapi.variables @@ -53,7 +51,7 @@ def get_file_type(path, pinfo_list, install_dir): """Return the file type of a path according to the given PathInfo list""" - Match = lambda x: [match for match in glob.glob(install_dir + x) if join(install_dir, path).find(match) > -1] + Match = lambda x: [match for match in glob.glob(install_dir + x) if pisi.util.join_path(install_dir, path).find(match) > -1] def Sort(x): x.sort(reverse=True) @@ -83,7 +81,7 @@ def check_path_collision(package, pkgList): # don't throw collision error for these files. # we'll handle this in gen_files_xml.. continue - if util.subpath(pinfo.path, path.path): + if pisi.util.subpath(pinfo.path, path.path): collisions.append(path.path) ctx.ui.debug(_('Path %s belongs in multiple packages') % path.path) @@ -102,7 +100,7 @@ class Builder: src = sf.source if src: - src_uri = URI(src.sourceURI) + src_uri = pisi.uri.URI(src.sourceURI) if src_uri.is_absolute_path(): src_path = str(src_uri) else: @@ -120,8 +118,8 @@ class Builder: def __init__(self, specuri): # process args - if not isinstance(specuri, URI): - specuri = URI(specuri) + if not isinstance(specuri, pisi.uri.URI): + specuri = pisi.uri.URI(specuri) # read spec file, we'll need it :) self.set_spec_file(specuri) @@ -129,9 +127,9 @@ class Builder: if specuri.is_remote_file(): self.specdir = self.fetch_files() else: - self.specdir = dirname(self.specuri.get_uri()) + self.specdir = os.path.dirname(self.specuri.get_uri()) - self.sourceArchive = SourceArchive(self.spec, self.pkg_work_dir()) + self.sourceArchive = pisi.sourcearchive.SourceArchive(self.spec, self.pkg_work_dir()) self.set_environment_vars() @@ -141,9 +139,9 @@ class Builder: def set_spec_file(self, specuri): if not specuri.is_remote_file(): - specuri = URI(os.path.realpath(specuri.get_uri())) # FIXME: doesn't work for file:// + specuri = pisi.uri.URI(os.path.realpath(specuri.get_uri())) # FIXME: doesn't work for file:// self.specuri = specuri - spec = SpecFile() + spec = pisi.specfile.SpecFile() spec.read(specuri, ctx.config.tmp_dir()) self.spec = spec @@ -155,7 +153,7 @@ class Builder: "package build directory" packageDir = self.spec.source.name + '-' + \ self.spec.getSourceVersion() + '-' + self.spec.getSourceRelease() - return util.join_path(ctx.config.dest_dir(), ctx.config.values.dirs.tmp_dir, + return pisi.util.join_path(ctx.config.dest_dir(), ctx.config.values.dirs.tmp_dir, packageDir) def pkg_work_dir(self): @@ -168,11 +166,11 @@ class Builder: return self.pkg_dir() + ctx.const.install_dir_suffix def set_state(self, state): - stateFile = util.join_path(self.pkg_work_dir(), "pisiBuildState") + stateFile = pisi.util.join_path(self.pkg_work_dir(), "pisiBuildState") open(stateFile, "w").write(state) def get_state(self): - stateFile = util.join_path(self.pkg_work_dir(), "pisiBuildState") + stateFile = pisi.util.join_path(self.pkg_work_dir(), "pisiBuildState") if not os.path.exists(stateFile): # no state return None return open(stateFile, "r").read() @@ -236,10 +234,10 @@ class Builder: ctx.ui.info(_("CCache detected...")) def fetch_files(self): - self.specdiruri = dirname(self.specuri.get_uri()) - pkgname = basename(self.specdiruri) - self.destdir = join(ctx.config.tmp_dir(), pkgname) - #self.location = dirname(self.url.uri) + self.specdiruri = os.path.dirname(self.specuri.get_uri()) + pkgname = os.path.basename(self.specdiruri) + self.destdir = pisi.util.join_path(ctx.config.tmp_dir(), pkgname) + #self.location = os.path.dirname(self.url.uri) self.fetch_actionsfile() self.fetch_patches() @@ -249,51 +247,51 @@ class Builder: return self.destdir def fetch_actionsfile(self): - actionsuri = join(self.specdiruri, ctx.const.actions_file) + actionsuri = pisi.util.join_path(self.specdiruri, ctx.const.actions_file) self.download(actionsuri, self.destdir) def fetch_patches(self): spec = self.spec for patch in spec.source.patches: - file_name = basename(patch.filename) - dir_name = dirname(patch.filename) - patchuri = join(self.specdiruri, + file_name = os.path.basename(patch.filename) + dir_name = os.path.dirname(patch.filename) + patchuri = pisi.util.join_path(self.specdiruri, ctx.const.files_dir, dir_name, file_name) - self.download(patchuri, join(self.destdir, ctx.const.files_dir, dir_name)) + self.download(patchuri, pisi.util.join_path(self.destdir, ctx.const.files_dir, dir_name)) def fetch_comarfiles(self): spec = self.spec for package in spec.packages: for pcomar in package.providesComar: - comaruri = join(self.specdiruri, + comaruri = pisi.util.join_path(self.specdiruri, ctx.const.comar_dir, pcomar.script) - self.download(comaruri, join(self.destdir, ctx.const.comar_dir)) + self.download(comaruri, pisi.util.join_path(self.destdir, ctx.const.comar_dir)) def fetch_additionalFiles(self): spec = self.spec for pkg in spec.packages: for afile in pkg.additionalFiles: - file_name = basename(afile.filename) - dir_name = dirname(afile.filename) - afileuri = join(self.specdiruri, + file_name = os.path.basename(afile.filename) + dir_name = os.path.dirname(afile.filename) + afileuri = pisi.util.join_path(self.specdiruri, ctx.const.files_dir, dir_name, file_name) - self.download(afileuri, join(self.destdir, ctx.const.files_dir, dir_name)) + self.download(afileuri, pisi.util.join_path(self.destdir, ctx.const.files_dir, dir_name)) def download(self, uri, transferdir): # fix auth info and download - uri = File.make_uri(uri) - File.download(uri, transferdir) + uri = pisi.file.File.make_uri(uri) + pisi.file.File.download(uri, transferdir) def fetch_component(self): if not self.spec.source.partOf: ctx.ui.warning(_('PartOf tag not defined, looking for component')) - diruri = parenturi(self.specuri.get_uri()) - parentdir = parenturi(diruri) - url = util.join_path(parentdir, 'component.xml') + diruri = pisi.util.parenturi(self.specuri.get_uri()) + parentdir = pisi.util.parenturi(diruri) + url = pisi.util.join_path(parentdir, 'component.xml') progress = ctx.ui.Progress - if URI(url).is_remote_file(): - fetch_url(url, self.pkg_work_dir(), progress) - path = util.join_path(self.pkg_work_dir(), 'component.xml') + if pisi.uri.URI(url).is_remote_file(): + pisi.fetcher.fetch_url(url, self.pkg_work_dir(), progress) + path = pisi.util.join_path(self.pkg_work_dir(), 'component.xml') else: if not os.path.exists(url): raise Exception(_('Cannot find component.xml in upper directory')) @@ -335,7 +333,7 @@ class Builder: # Before install make sure install_dir is clean if os.path.exists(self.pkg_install_dir()): - util.clean_dir(self.pkg_install_dir()) + pisi.util.clean_dir(self.pkg_install_dir()) # install function is mandatory! self.run_action_function(ctx.const.install_func, True) @@ -356,7 +354,7 @@ class Builder: for root, dirs, files in os.walk(install_dir): for file_ in files: already_in_package = False - fpath = util.join_path(root, file_) + fpath = pisi.util.join_path(root, file_) for path in all_paths_in_packages: if not fpath.find(path): already_in_package = True @@ -367,7 +365,7 @@ class Builder: def compile_action_script(self): """Compiles given actions.py to check syntax error in it and sets the actionLocals and actionGlobals""" - fname = util.join_path(self.specdir, ctx.const.actions_file) + fname = pisi.util.join_path(self.specdir, ctx.const.actions_file) try: localSymbols = globalSymbols = {} buf = open(fname).read() @@ -385,7 +383,7 @@ class Builder: """Compiles comar scripts to check syntax errors""" for package in self.spec.packages: for pcomar in package.providesComar: - fname = util.join_path(self.specdir, ctx.const.comar_dir, + fname = pisi.util.join_path(self.specdir, ctx.const.comar_dir, pcomar.script) try: @@ -403,7 +401,7 @@ class Builder: except KeyError: workdir = self.spec.source.name + "-" + self.spec.getSourceVersion() - return util.join_path(self.pkg_work_dir(), workdir) + return pisi.util.join_path(self.pkg_work_dir(), workdir) def run_action_function(self, func, mandatory=False): """Calls the corresponding function in actions.py. @@ -437,7 +435,7 @@ class Builder: extra_names = filter(lambda x: not ctx.installdb.is_installed(x), extra_names) if extra_names: ctx.ui.warning(_('Safety switch: following extra packages in system.devel will be installed: ') + - util.strlist(extra_names)) + pisi.util.strlist(extra_names)) extra_deps = [dependency.Dependency(package = x) for x in extra_names] build_deps.extend(extra_deps) else: @@ -453,7 +451,7 @@ class Builder: if dep_unsatis: ctx.ui.info(_("Unsatisfied Build Dependencies:") + ' ' - + util.strlist([str(x) for x in dep_unsatis]) ) + + pisi.util.strlist([str(x) for x in dep_unsatis]) ) def fail(): raise Error(_('Cannot build package due to unsatisfied build dependencies')) @@ -477,33 +475,33 @@ class Builder: def patch_exists(self): """check existence of patch files declared in PSPEC""" - files_dir = os.path.abspath(util.join_path(self.specdir, + files_dir = os.path.abspath(pisi.util.join_path(self.specdir, ctx.const.files_dir)) for patch in self.spec.source.patches: - patchFile = util.join_path(files_dir, patch.filename) + patchFile = pisi.util.join_path(files_dir, patch.filename) if not os.access(patchFile, os.F_OK): raise Error(_("Patch file is missing: %s\n") % patch.filename) def apply_patches(self): - files_dir = os.path.abspath(util.join_path(self.specdir, + files_dir = os.path.abspath(pisi.util.join_path(self.specdir, ctx.const.files_dir)) for patch in self.spec.source.patches: - patchFile = util.join_path(files_dir, patch.filename) + patchFile = pisi.util.join_path(files_dir, patch.filename) if patch.compressionType: - patchFile = util.uncompress(patchFile, + patchFile = pisi.util.uncompress(patchFile, compressType=patch.compressionType, targetDir=ctx.config.tmp_dir()) ctx.ui.action(_("* Applying patch: %s") % patch.filename) - util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) + pisi.util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) def generate_static_package_object(self): ar_files = [] for root, dirs, files in os.walk(self.pkg_install_dir()): for f in files: - if f.endswith(ctx.const.ar_file_suffix) and util.is_ar_file(util.join_path(root, f)): - ar_files.append(util.join_path(root, f)) + if f.endswith(ctx.const.ar_file_suffix) and pisi.util.is_ar_file(pisi.util.join_path(root, f)): + ar_files.append(pisi.util.join_path(root, f)) if not len(ar_files): return None @@ -529,7 +527,7 @@ class Builder: for root, dirs, files in os.walk(self.pkg_debug_dir()): for f in files: if f.endswith(ctx.const.debug_file_suffix): - debug_files.append(util.join_path(root, f)) + debug_files.append(pisi.util.join_path(root, f)) if not len(debug_files): return None @@ -557,16 +555,16 @@ class Builder: install_dir = self.pkg_install_dir() try: nostrip = self.actionGlobals['NoStrip'] - util.strip_directory(install_dir, nostrip) + pisi.util.strip_directory(install_dir, nostrip) except KeyError: - util.strip_directory(install_dir) + pisi.util.strip_directory(install_dir) def gen_metadata_xml(self, package, build_no=None): """Generate the metadata.xml file for build source. metadata.xml is composed of the information from specfile plus some additional information.""" - metadata = MetaData() + metadata = pisi.metadata.MetaData() metadata.from_spec(self.spec.source, package, self.spec.history) metadata.package.distribution = ctx.config.values.general.distribution @@ -585,7 +583,7 @@ class Builder: def gen_files_xml(self, package): """Generates files.xml using the path definitions in specfile and the files produced by the build system.""" - files = Files() + files = pisi.files.Files() if package.debug_package: install_dir = self.pkg_debug_dir() @@ -604,34 +602,34 @@ class Builder: d = {} def add_path(path): # add the files under material path - for fpath, fhash in util.get_file_hashes(path, collisions, install_dir): + for fpath, fhash in pisi.util.get_file_hashes(path, collisions, install_dir): if ctx.get_option('create_static') \ and fpath.endswith(ctx.const.ar_file_suffix) \ and not package.name.endswith(ctx.const.static_name_suffix) \ - and util.is_ar_file(fpath): + and pisi.util.is_ar_file(fpath): # if this is an ar file, and this package is not a static package, # don't include this file into the package. continue - frpath = util.removepathprefix(install_dir, fpath) # relative path + frpath = pisi.util.removepathprefix(install_dir, fpath) # relative path ftype, permanent = get_file_type(frpath, package.files, install_dir) - fsize = util.dir_size(fpath) + fsize = pisi.util.dir_size(fpath) if not os.path.islink(fpath): st = os.stat(fpath) else: st = os.lstat(fpath) - d[frpath] = FileInfo(path=frpath, type=ftype, permanent=permanent, + d[frpath] = pisi.files.FileInfo(path=frpath, type=ftype, permanent=permanent, size=fsize, hash=fhash, uid=str(st.st_uid), gid=str(st.st_gid), - mode=oct(S_IMODE(st.st_mode))) + mode=oct(stat.S_IMODE(st.st_mode))) for pinfo in package.files: - wildcard_path = util.join_path(install_dir, pinfo.path) + wildcard_path = pisi.util.join_path(install_dir, pinfo.path) for path in glob.glob(wildcard_path): add_path(path) for (p, fileinfo) in d.iteritems(): files.append(fileinfo) - files_xml_path = util.join_path(self.pkg_dir(), ctx.const.files_xml) + files_xml_path = pisi.util.join_path(self.pkg_dir(), ctx.const.files_xml) files.write(files_xml_path) self.files = files @@ -649,10 +647,10 @@ class Builder: # find previous build in packages dir found = [] def locate_old_package(old_package_fn): - if util.is_package_name(os.path.basename(old_package_fn), package_name): + if pisi.util.is_package_name(os.path.basename(old_package_fn), package_name): try: - old_pkg = Package(old_package_fn, 'r') - old_pkg.read(util.join_path(ctx.config.tmp_dir(), 'oldpkg')) + old_pkg = pisi.package.Package(old_package_fn, 'r') + old_pkg.read(pisi.util.join_path(ctx.config.tmp_dir(), 'oldpkg')) ctx.ui.info(_('(found old version %s)') % old_package_fn) if str(old_pkg.metadata.package.name) != package_name: ctx.ui.warning(_('Skipping %s with wrong pkg name ') % @@ -665,12 +663,12 @@ class Builder: for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()): for file in files: - locate_old_package(join(root,file)) + locate_old_package(pisi.util.join_path(root,file)) outdir=ctx.get_option('output_dir') if not outdir: outdir = '.' - for file in [join(outdir,entry) for entry in os.listdir(outdir)]: + for file in [pisi.util.join_path(outdir,entry) for entry in os.listdir(outdir)]: if os.path.isfile(file): locate_old_package(file) @@ -784,18 +782,18 @@ class Builder: for afile in package.additionalFiles: src = os.path.join(ctx.const.files_dir, afile.filename) dest = os.path.join(install_dir + os.path.dirname(afile.target), os.path.basename(afile.target)) - util.copy_file(src, dest) + pisi.util.copy_file(src, dest) if afile.permission: # mode is octal! os.chmod(dest, int(afile.permission, 8)) if afile.owner: try: - os.chown(dest, getpwnam(afile.owner)[2], -1) + os.chown(dest, pwd.getpwnam(afile.owner)[2], -1) except KeyError: ctx.ui.warning(_("No user named '%s' found on the system") % afile.owner) if afile.group: try: - os.chown(dest, -1, getgrnam(afile.group)[2]) + os.chown(dest, -1, grp.getgrnam(afile.group)[2]) except KeyError: ctx.ui.warning(_("No group named '%s' found on the system") % afile.group) os.chdir(c) @@ -816,10 +814,10 @@ class Builder: build_no, old_build_no = self.calc_build_no(package.name) self.metadata.package.build = build_no - self.metadata.write(util.join_path(self.pkg_dir(), ctx.const.metadata_xml)) + self.metadata.write(pisi.util.join_path(self.pkg_dir(), ctx.const.metadata_xml)) # Calculate new and oldpackage names for buildfarm - name = util.package_name(package.name, + name = pisi.util.package_name(package.name, self.spec.getSourceVersion(), self.spec.getSourceRelease(), self.metadata.package.build) @@ -831,12 +829,12 @@ class Builder: ctx.ui.info(_("Creating PiSi package %s.") % name) - pkg = Package(name, 'w') + pkg = pisi.package.Package(name, 'w') # add comar files to package os.chdir(self.specdir) for pcomar in package.providesComar: - fname = util.join_path(ctx.const.comar_dir, + fname = pisi.util.join_path(ctx.const.comar_dir, pcomar.script) pkg.add_to_package(fname) @@ -848,23 +846,23 @@ class Builder: # Now it is time to add files to the packages using newly # created files.xml - files = Files() + files = pisi.files.Files() files.read(ctx.const.files_xml) if ctx.get_option('package_format') == "1.0": for finfo in files.list: - orgname = arcname = join("install", finfo.path) + orgname = arcname = pisi.util.join_path("install", finfo.path) if package.debug_package: - orgname = join("debug", finfo.path) + orgname = pisi.util.join_path("debug", finfo.path) pkg.add_to_package(orgname, arcname) pkg.close() else: # default package format is 1.1, so make it fallback. - ctx.build_leftover = join(self.pkg_dir(), ctx.const.install_tar_lzma) + ctx.build_leftover = pisi.util.join_path(self.pkg_dir(), ctx.const.install_tar_lzma) tar = archive.ArchiveTar(ctx.const.install_tar_lzma, "tarlzma") for finfo in files.list: - orgname = arcname = join("install", finfo.path) + orgname = arcname = pisi.util.join_path("install", finfo.path) if package.debug_package: - orgname = join("debug", finfo.path) + orgname = pisi.util.join_path("debug", finfo.path) tar.add_to_archive(orgname, arcname.lstrip("install")) tar.close() pkg.add_to_package(ctx.const.install_tar_lzma) @@ -889,7 +887,7 @@ class Builder: if ctx.config.values.general.autoclean is True: ctx.ui.info(_("Cleaning Build Directory...")) - util.clean_dir(self.pkg_dir()) + pisi.util.clean_dir(self.pkg_dir()) else: ctx.ui.info(_("Keeping Build Directory")) @@ -899,7 +897,7 @@ class Builder: # and left environment variables go directly into initial dict # making actionsapi.variables.exportFlags() useless... os.environ = {} - os.environ = deepcopy(ctx.config.environ) + os.environ = copy.deepcopy(ctx.config.environ) return self.new_packages, self.old_packages From bc903f1513f94c075782f7d6fd4c0e1d1a5043a5 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 08:48:26 +0000 Subject: [PATCH 075/212] [MERGE] From-Import-Removal --- pisi/atomicoperations.py | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index a0bf2943..e8b16f85 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -26,13 +26,12 @@ import pisi.packagedb as packagedb import pisi.dependency as dependency import pisi.conflict import pisi.util as util -from pisi.specfile import * -from pisi.metadata import MetaData -from pisi.files import Files -from pisi.uri import URI +import pisi.metadata +import pisi.files +import pisi.uri import pisi.ui -from pisi.version import Version -from pisi.delta import find_relocations +import pisi.version +import pisi.delta class Error(pisi.Error): pass @@ -81,7 +80,7 @@ class Install(AtomicOperation): else: pkg_uri = pkg.packageURI - uri = URI(pkg_uri) + uri = pisi.uri.URI(pkg_uri) if uri.is_absolute_path(): pkg_path = str(pkg_uri) else: @@ -203,7 +202,7 @@ class Install(AtomicOperation): ignore_build = ctx.config.options and ctx.config.options.ignore_build_no if repomismatch or (not ibuild) or (not pkg.build) or ignore_build: # we don't look at builds to compare two package versions - if Version(pkg.release) == Version(irelease): + if pisi.version.Version(pkg.release) == pisi.version.Version(irelease): self.same_ver = True else: if pkg.build == ibuild: @@ -217,10 +216,10 @@ class Install(AtomicOperation): upgrade = False # is this an upgrade? # determine and report the kind of upgrade: version, release, build - if Version(pkg.version) > Version(iversion): + if pisi.version.Version(pkg.version) > pisi.version.Version(iversion): ctx.ui.info(_('Upgrading to new upstream version')) upgrade = True - elif Version(pkg.release) > Version(irelease): + elif pisi.version.Version(pkg.release) > pisi.version.Version(irelease): ctx.ui.info(_('Upgrading to new distribution release')) upgrade = True elif ((not ignore_build) and ibuild and pkg.build @@ -231,10 +230,10 @@ class Install(AtomicOperation): # is this a downgrade? confirm this action. if self.ask_reinstall and (not upgrade): - if Version(pkg.version) < Version(iversion): + if pisi.version.Version(pkg.version) < pisi.version.Version(iversion): #x = _('Downgrade to old upstream version?') x = None - elif Version(pkg.release) < Version(irelease): + elif pisi.version.Version(pkg.release) < pisi.version.Version(irelease): x = _('Downgrade to old distribution release?') else: x = _('Downgrade to old distribution build?') @@ -323,7 +322,7 @@ class Install(AtomicOperation): # 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 find_relocations(self.old_files, self.files): + for old_file, new_file in pisi.delta.find_relocations(self.old_files, self.files): old_path, new_path = ("/" + old_file.path, "/" + new_file.path) destdir = os.path.dirname(new_path) @@ -422,7 +421,7 @@ class Install(AtomicOperation): def install_single(pkg, upgrade = False): """install a single package from URI or ID""" - url = URI(pkg) + url = pisi.uri.URI(pkg) # Check if we are dealing with a remote file or a real path of # package filename. Otherwise we'll try installing a package from # the package repository. @@ -453,7 +452,7 @@ class Remove(AtomicOperation): # for some reason file was deleted, we still allow removes! ctx.ui.error(unicode(e)) ctx.ui.warning(_('File list could not be read for package %s, continuing removal.') % package_name) - self.files = Files() + self.files = pisi.files.Files() def run(self): """Remove a single package""" @@ -576,14 +575,12 @@ def virtual_install(metadata, files, txn): def resurrect_package(package_fn, write_files, txn = None): """Resurrect the package from xml files""" - from os.path import exists - metadata_xml = util.join_path(ctx.config.lib_dir(), 'package', package_fn, ctx.const.metadata_xml) - if not exists(metadata_xml): + if not os.path.exists(metadata_xml): raise Error, _("Metadata XML '%s' cannot be found") % metadata_xml - metadata = MetaData() + metadata = pisi.metadata.MetaData() metadata.read(metadata_xml) errs = metadata.errors() @@ -596,10 +593,10 @@ def resurrect_package(package_fn, write_files, txn = None): if write_files: files_xml = util.join_path(ctx.config.lib_dir(), 'package', package_fn, ctx.const.files_xml) - if not exists(files_xml): + if not os.path.exists(files_xml): raise Error, _("Files XML '%s' cannot be found") % files_xml - files = Files() + files = pisi.files.Files() files.read(files_xml) if files.errors(): raise Error, _("Invalid %s") % ctx.const.files_xml From 9960d86b5382a02154805afa26f588b207fc3ba7 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 08:55:33 +0000 Subject: [PATCH 076/212] * missed bit --- pisi/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index d8b665cd..f0091820 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -685,8 +685,8 @@ class Builder: old_build = a[-1][1] # compare old files.xml with the new one.. - old_pkg = Package(old_package_fn, 'r') - old_pkg.read(util.join_path(ctx.config.tmp_dir(), 'oldpkg')) + old_pkg = pisi.package.Package(old_package_fn, 'r') + old_pkg.read(pisi.util.join_path(ctx.config.tmp_dir(), 'oldpkg')) changed = False fnew = self.files.list From 25611fd6e2a0d6dfb92d276a5ce2f23f2d379bee Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 09:03:09 +0000 Subject: [PATCH 077/212] remove unused --- pisi/dbshelve.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pisi/dbshelve.py b/pisi/dbshelve.py index d3eb0f70..78668ef0 100644 --- a/pisi/dbshelve.py +++ b/pisi/dbshelve.py @@ -61,10 +61,6 @@ class DBShelf: #def __del__(self): # self.close() - allowed_chars = string.letters + string.digits + '-' - def check_key(key): - return pisi.util.all(lambda x: x in allowed_chars, key) - def has_key(self, key, txn = None): if txn: return self.db.has_key(key, txn) From bc2781ca1b62974d4e9525d2bc1e4bf9d301e8cb Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 12:31:25 +0000 Subject: [PATCH 078/212] [MERGE] * From-Import-Removal * api functions should be in api initial quick fix --- pisi/api.py | 154 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 54 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index a2b2ed83..54e85b43 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -22,35 +22,31 @@ _ = __trans.ugettext import pisi import pisi.context as ctx -from pisi.uri import URI -import pisi.util as util +import pisi.uri +import pisi.util import pisi.dependency as dependency import pisi.pgraph as pgraph -import pisi.operations as operations -import pisi.packagedb as packagedb +import pisi.packagedb import pisi.repodb import pisi.installdb import pisi.sourcedb -import pisi.component as component -from pisi.index import Index -import pisi.cli -from pisi.config import Options -from pisi.operations import install, remove, upgrade, emerge -from pisi.operations import plan_install_pkg_names as plan_install -from pisi.operations import plan_remove, plan_upgrade, upgrade_base, calculate_conflicts, reorder_base_packages -from pisi.build import build_until -from pisi.atomicoperations import resurrect_package, build -from pisi.metadata import MetaData -from pisi.files import Files -from pisi.file import File -import pisi.lockeddbshelve as shelve -from pisi.version import Version +import pisi.lockeddbshelve +import pisi.index +import pisi.config +import pisi.metadata +import pisi.file +import pisi.version +import pisi.operations +import pisi.build +import pisi.atomicoperations +import pisi.delta +import pisi.comariface class Error(pisi.Error): pass def init(database = True, write = True, - options = Options(), ui = None, comar = True, + options = pisi.config.Options(), ui = None, comar = True, stdout = None, stderr = None, comar_sockname = None, signal_handling = True): @@ -64,11 +60,12 @@ def init(database = True, write = True, # UI comes first if ui is None: - from pisi.cli import CLI + # FIXME: api importing and using pisi.cli ???? + import pisi.cli if options: - ctx.ui = CLI(options.debug, options.verbose) + ctx.ui = pisi.cli.CLI(options.debug, options.verbose) else: - ctx.ui = CLI() + ctx.ui = pisi.cli.CLI() else: ctx.ui = ui @@ -91,7 +88,6 @@ def init(database = True, write = True, if stderr: ctx.stderr = stderr - import pisi.config ctx.config = pisi.config.Config(options) if signal_handling: @@ -105,12 +101,12 @@ def init(database = True, write = True, # initialize repository databases ctx.database = database if database: - shelve.init_dbenv(write=write) + pisi.db.lockeddbshelve.init_dbenv(write=write) ctx.repodb = pisi.repodb.init() ctx.installdb = pisi.installdb.init() ctx.filesdb = pisi.files.FilesDB() ctx.componentdb = pisi.component.ComponentDB() - ctx.packagedb = packagedb.init_db() + ctx.packagedb = pisi.packagedb.init_db() ctx.sourcedb = pisi.sourcedb.init() else: ctx.repodb = None @@ -139,7 +135,7 @@ def finalize(): ctx.componentdb.close() ctx.componentdb = None if ctx.packagedb: - packagedb.finalize_db() + pisi.packagedb.finalize_db() ctx.packagedb = None if ctx.sourcedb: pisi.sourcedb.finalize() @@ -270,18 +266,17 @@ def configure_pending(): A = ctx.installdb.list_pending() order = generate_pending_order(A) try: - import pisi.comariface as comariface for x in order: if ctx.installdb.is_installed(x): pkginfo = A[x] - pkgname = util.package_name(x, pkginfo.version, + pkgname = pisi.util.package_name(x, pkginfo.version, pkginfo.release, False, False) - pkg_path = util.join_path(ctx.config.lib_dir(), + pkg_path = pisi.util.join_path(ctx.config.lib_dir(), 'package', pkgname) - m = MetaData() - metadata_path = util.join_path(pkg_path, ctx.const.metadata_xml) + m = pisi.metadata.MetaData() + metadata_path = pisi.util.join_path(pkg_path, ctx.const.metadata_xml) m.read(metadata_path) # FIXME: we need a full package info here! pkginfo.name = x @@ -289,9 +284,9 @@ def configure_pending(): pisi.comariface.post_install( pkginfo.name, m.package.providesComar, - util.join_path(pkg_path, ctx.const.comar_dir), - util.join_path(pkg_path, ctx.const.metadata_xml), - util.join_path(pkg_path, ctx.const.files_xml), + pisi.util.join_path(pkg_path, ctx.const.comar_dir), + pisi.util.join_path(pkg_path, ctx.const.metadata_xml), + pisi.util.join_path(pkg_path, ctx.const.files_xml), ) ctx.ui.notify(pisi.ui.configured, package = pkginfo, files = None) ctx.installdb.clear_pending(x) @@ -305,12 +300,11 @@ def info(package, installed = False): return info_name(package, installed) def info_file(package_fn): - from package import Package if not os.path.exists(package_fn): raise Error (_('File %s not found') % package_fn) - package = Package(package_fn) + package = pisi.package.Package(package_fn) package.read() return package.metadata, package.files @@ -320,10 +314,8 @@ def info_name(package_name, installed=False): package = ctx.packagedb.get_package(package_name, pisi.itembyrepodb.installed) else: package, repo = ctx.packagedb.get_package_repo(package_name, pisi.itembyrepodb.repos) - repostr = repo - from pisi.metadata import MetaData - metadata = MetaData() + metadata = pisi.metadata.MetaData() metadata.package = package #FIXME: get it from sourcedb if available metadata.source = None @@ -366,7 +358,7 @@ def check(package): and not os.path.islink('/' + file.path): ctx.ui.info(_("Checking /%s ") % file.path, noln=True, verbose=True) try: - if file.hash != util.sha1_file('/' + file.path): + if file.hash != pisi.util.sha1_file('/' + file.path): corrupt.append(file) ctx.ui.error(_("\nCorrupt file: %s") % file) else: @@ -377,7 +369,7 @@ def check(package): def index(dirs=None, output='pisi-index.xml', skip_sources=False, skip_signing=False): """Accumulate PiSi XML files in a directory, and write an index.""" - index = Index() + index = pisi.index.Index() index.distribution = None if not dirs: dirs = ['.'] @@ -387,16 +379,16 @@ def index(dirs=None, output='pisi-index.xml', skip_sources=False, skip_signing=F index.index(repo_dir, skip_sources) if skip_signing: - index.write(output, sha1sum=True, compress=File.bz2, sign=None) + index.write(output, sha1sum=True, compress=pisi.file.File.bz2, sign=None) else: - index.write(output, sha1sum=True, compress=File.bz2, sign=File.detached) + index.write(output, sha1sum=True, compress=pisi.file.File.bz2, sign=pisi.file.File.detached) ctx.ui.info(_('* Index file written')) def add_repo(name, indexuri, at = None): if ctx.repodb.has_repo(name): raise Error(_('Repo %s already present.') % name) else: - repo = pisi.repodb.Repo(URI(indexuri)) + repo = pisi.repodb.Repo(pisi.uri.URI(indexuri)) ctx.repodb.add_repo(name, repo, at = at) ctx.ui.info(_('Repo %s added to system.') % name) @@ -415,7 +407,7 @@ def list_repos(): def update_repo(repo, force=False): ctx.ui.info(_('* Updating repository: %s') % repo) ctx.ui.notify(pisi.ui.updatingrepo, name = repo) - index = Index() + index = pisi.index.Index() if ctx.repodb.has_repo(repo): repouri = ctx.repodb.get_repo(repo).indexuri.get_uri() try: @@ -439,17 +431,17 @@ def update_repo(repo, force=False): raise Error(_('No repository named %s found.') % repo) def delete_cache(): - util.clean_dir(ctx.config.packages_dir()) - util.clean_dir(ctx.config.archives_dir()) - util.clean_dir(ctx.config.tmp_dir()) + pisi.util.clean_dir(ctx.config.packages_dir()) + pisi.util.clean_dir(ctx.config.archives_dir()) + pisi.util.clean_dir(ctx.config.tmp_dir()) def rebuild_repo(repo): ctx.ui.info(_('* Rebuilding \'%s\' named repo... ') % repo) if ctx.repodb.has_repo(repo): - repouri = URI(ctx.repodb.get_repo(repo).indexuri.get_uri()) + repouri = pisi.uri.URI(ctx.repodb.get_repo(repo).indexuri.get_uri()) indexname = repouri.filename() - index = Index() + index = pisi.index.Index() indexpath = pisi.util.join_path(ctx.config.index_dir(), repo, indexname) tmpdir = os.path.join(ctx.config.tmp_dir(), 'index') pisi.util.clean_dir(tmpdir) @@ -474,9 +466,9 @@ def rebuild_db(files=False): i_version = {} # installed versions replica = [] for pkg in os.listdir(pisi.util.join_path(pisi.api.ctx.config.lib_dir(), 'package')): - (name, ver) = util.parse_package_name(pkg) + (name, ver) = pisi.util.parse_package_name(pkg) if i_version.has_key(name): - if Version(ver) > Version(i_version[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 @@ -544,5 +536,59 @@ def rebuild_db(files=False): # construct new database init(database=True, options=options, ui=ui, comar=comar) clean_duplicates() - reload_packages(files, None) - reload_indices(None) + txn = ctx.dbenv.txn_begin() + reload_packages(files, txn) + reload_indices(txn) + txn.commit() + +############# FIXME: this was a quick fix. ############################## + +# api was importing other module's functions and providing them as api functions. This is wrong. +# these are quick fixes for this problem. The api functions should be in this module. + +# from pisi.operations import install, remove, upgrade, emerge +# from pisi.operations import plan_install_pkg_names as plan_install +# from pisi.operations import plan_remove, plan_upgrade, upgrade_base, calculate_conflicts, reorder_base_packages +# from pisi.build import build_until +# from pisi.atomicoperations import resurrect_package, build + +def install(*args, **kw): + pisi.operations.install(*args, **kw) + +def remove(*args, **kw): + pisi.operations.remove(*args, **kw) + +def upgrade(*args, **kw): + pisi.operations.upgrade(*args, **kw) + +def emerge(*args, **kw): + pisi.operations.emerge(*args, **kw) + +def plan_install(*args, **kw): + pisi.operations.plan_install_pkg_names(*args, **kw) + +def plan_remove(*args, **kw): + pisi.operations.plan_remove(*args, **kw) + +def plan_upgrade(*args, **kw): + pisi.operations.plan_upgrade(*args, **kw) + +def upgrade_base(*args, **kw): + pisi.operations.upgrade_base(*args, **kw) + +def calculate_conflicts(*args, **kw): + pisi.operations.calculate_conflicts(*args, **kw) + +def reorder_base_packages(*args, **kw): + pisi.operations.reorder_base_packages(*args, **kw) + +def build_until(*args, **kw): + pisi.build.build_until(*args, **kw) + +def build(*args, **kw): + pisi.atomicoperations.build(*args, **kw) + +def resurrect_package(*args, **kw): + pisi.atomicoperations.resurrect_package(*args, **kw) + +######################################################################## From 0b48824937d2a5ebbec9289dc728400b87690828 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 12:34:49 +0000 Subject: [PATCH 079/212] * no pisi.db in branch --- pisi/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/api.py b/pisi/api.py index 54e85b43..5d087a91 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -101,7 +101,7 @@ def init(database = True, write = True, # initialize repository databases ctx.database = database if database: - pisi.db.lockeddbshelve.init_dbenv(write=write) + pisi.lockeddbshelve.init_dbenv(write=write) ctx.repodb = pisi.repodb.init() ctx.installdb = pisi.installdb.init() ctx.filesdb = pisi.files.FilesDB() From a413bab45886a677c7d64a4f37d2b523d822900b Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:09:39 +0000 Subject: [PATCH 080/212] * twisted import problems --- pisi/api.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 5d087a91..f02834d2 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -30,7 +30,7 @@ import pisi.packagedb import pisi.repodb import pisi.installdb import pisi.sourcedb -import pisi.lockeddbshelve +import pisi.lockeddbshelve as shelve import pisi.index import pisi.config import pisi.metadata @@ -41,6 +41,7 @@ import pisi.build import pisi.atomicoperations import pisi.delta import pisi.comariface +import pisi.signalhandler class Error(pisi.Error): pass @@ -88,6 +89,8 @@ def init(database = True, write = True, if stderr: ctx.stderr = stderr + # FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py + import pisi.config ctx.config = pisi.config.Config(options) if signal_handling: @@ -101,7 +104,7 @@ def init(database = True, write = True, # initialize repository databases ctx.database = database if database: - pisi.lockeddbshelve.init_dbenv(write=write) + shelve.init_dbenv(write=write) ctx.repodb = pisi.repodb.init() ctx.installdb = pisi.installdb.init() ctx.filesdb = pisi.files.FilesDB() @@ -519,12 +522,12 @@ def rebuild_db(files=False): # check db schema versions try: - pisi.lockeddbshelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) + shelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) except KeyboardInterrupt: raise except Exception, e: #FIXME: what exception could we catch here, replace with that. files = True # exception means the files db version was wrong - pisi.lockeddbshelve.init_dbenv(write=True, writeversion=True) + shelve.init_dbenv(write=True, writeversion=True) destroy(files) # bye bye # save parameters and shutdown pisi From 75e3081c525551b564213f516cae36b4c1e31e8c Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:29:26 +0000 Subject: [PATCH 081/212] From-Import-Removal - was not in trunk --- pisi/component.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pisi/component.py b/pisi/component.py index 43223995..f1c4adcc 100644 --- a/pisi/component.py +++ b/pisi/component.py @@ -19,8 +19,7 @@ import pisi.context as ctx import pisi.pxml.xmlfile as xmlfile import pisi.pxml.autoxml as autoxml import pisi.lockeddbshelve as shelve -from pisi.itembyrepodb import ItemByRepoDB -import pisi.itembyrepodb as itembyrepodb +import pisi.itembyrepodb class Error(pisi.Error): pass @@ -87,7 +86,7 @@ class ComponentDB(object): """a database of components""" def __init__(self): - self.d = ItemByRepoDB('component') + self.d = pisi.itembyrepodb.ItemByRepoDB('component') def close(self): self.d.close() From ef4bc91d21aa78dcc851cd4a85ecc191af19bb69 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:31:11 +0000 Subject: [PATCH 082/212] From-Import-Removal - not merged? --- pisi/installdb.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pisi/installdb.py b/pisi/installdb.py index d3a97087..6c826085 100644 --- a/pisi/installdb.py +++ b/pisi/installdb.py @@ -25,15 +25,12 @@ _ = __trans.ugettext import pisi import pisi.context as ctx import pisi.lockeddbshelve as shelve -from pisi.files import Files -import pisi.util as util -from pisi.util import join_path as join - +import pisi.files +import pisi.util class InstallDBError(pisi.Error): pass - class InstallInfo: # some data is replicated from packagedb # we store as an object, hey, we can waste O(1) space. @@ -74,7 +71,7 @@ class InstallDB: def __init__(self): self.d = shelve.LockedDBShelf('install') self.dp = shelve.LockedDBShelf('configpending') - self.files_dir = join(ctx.config.db_dir(), 'files') + self.files_dir = pisi.util.join_path(ctx.config.db_dir(), 'files') def close(self): self.d.close() @@ -82,17 +79,17 @@ class InstallDB: def files_name(self, pkg, version, release): pkg_dir = self.pkg_dir(pkg, version, release) - return join(pkg_dir, ctx.const.files_xml) + return pisi.util.join_path(pkg_dir, ctx.const.files_xml) def files(self, pkg): pkg = str(pkg) pkginfo = self.d[pkg] - files = Files() + files = pisi.files.Files() files.read(self.files_name(pkg,pkginfo.version,pkginfo.release)) return files def pkg_dir(self, pkg, version, release): - return join(ctx.config.lib_dir(), 'package', + return pisi.util.join_path(ctx.config.lib_dir(), 'package', pkg + '-' + version + '-' + release) def is_recorded(self, pkg, txn = None): @@ -166,7 +163,7 @@ class InstallDB: ctime = time.localtime() else: files_xml = self.files_name(pkg, version, release) - ctime = util.creation_time(files_xml) + ctime = pisi.util.creation_time(files_xml) self.d.put(pkg, InstallInfo(state, version, release, build, distro, ctime), txn) From ea69727c6f78b4e1314babf4844f31c6e84f8e7d Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:33:08 +0000 Subject: [PATCH 083/212] From-Import-Removal - not merged? --- pisi/lockeddbshelve.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/lockeddbshelve.py b/pisi/lockeddbshelve.py index 67b073e4..cde9e5a9 100644 --- a/pisi/lockeddbshelve.py +++ b/pisi/lockeddbshelve.py @@ -24,7 +24,7 @@ _ = __trans.ugettext import pisi import pisi.context as ctx -from pisi.util import join_path +import pisi.util import pisi.version class Error(pisi.Error): @@ -34,7 +34,7 @@ class Error(pisi.Error): # if write is given it knows it has write access # if force is given it updates the specified db version def check_dbversion(versionfile, ver, write=False, update=False): - verfn = join_path(pisi.context.config.db_dir(), versionfile) + verfn = pisi.util.join_path(pisi.context.config.db_dir(), versionfile) firsttime = False if os.path.exists(verfn): verfile = file(verfn, 'r') @@ -63,7 +63,7 @@ def check_dbversion(versionfile, ver, write=False, update=False): raise Error(_('Database version %s not present.') % versionfile) def lock_dbenv(): - ctx.dbenv_lock = file(join_path(pisi.context.config.db_dir(), 'dbenv.lock'), 'w') + ctx.dbenv_lock = file(pisi.util.join_path(pisi.context.config.db_dir(), 'dbenv.lock'), 'w') try: fcntl.flock(ctx.dbenv_lock, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError: @@ -103,7 +103,7 @@ class LockedDBShelf(shelve.DBShelf): if dbenv == None: dbenv = ctx.dbenv shelve.DBShelf.__init__(self, dbenv) - filename = join_path(pisi.context.config.db_dir(), dbname + '.bdb') + filename = pisi.util.join_path(pisi.context.config.db_dir(), dbname + '.bdb') if dbenv and os.access(os.path.dirname(filename), os.W_OK): flags = 'w' elif os.access(filename, os.R_OK): From 25592f9a55effeecb50d6bb1728933c1e6895dfd Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:35:23 +0000 Subject: [PATCH 084/212] From-Import-Removal - not merged? --- pisi/packagedb.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pisi/packagedb.py b/pisi/packagedb.py index abc569fd..8f557bd4 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -29,8 +29,7 @@ import pisi import pisi.util as util import pisi.context as ctx import pisi.lockeddbshelve as shelve -from pisi.itembyrepodb import ItemByRepoDB -import pisi.itembyrepodb as itembyrepodb +import pisi.itembyrepodb class Error(pisi.Error): pass @@ -45,8 +44,8 @@ class PackageDB(object): using shelf objects""" def __init__(self): - self.d = ItemByRepoDB('package') - self.dr = ItemByRepoDB('revdep') + self.d = pisi.itembyrepodb.ItemByRepoDB('package') + self.dr = pisi.itembyrepodb.ItemByRepoDB('revdep') def close(self): self.d.close() @@ -145,10 +144,10 @@ pkgdb = None def remove_tracking_package(name, txn = None): # remove the guy from the tracking databases - if pkgdb.has_package(name, itembyrepodb.installed, txn=txn): - pkgdb.remove_package(name, itembyrepodb.installed, txn=txn) - if pkgdb.has_package(name, itembyrepodb.thirdparty, txn=txn): - pkgdb.remove_package(name, itembyrepodb.thirdparty, txn=txn) + if pkgdb.has_package(name, pisi.itembyrepodb.installed, txn=txn): + pkgdb.remove_package(name, pisi.itembyrepodb.installed, txn=txn) + if pkgdb.has_package(name, pisi.itembyrepodb.thirdparty, txn=txn): + pkgdb.remove_package(name, pisi.itembyrepodb.thirdparty, txn=txn) def init_db(): global pkgdb From 1ef32195bf88343ce06865ac0fe0f73577be9654 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:36:17 +0000 Subject: [PATCH 085/212] not used --- pisi/repodb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pisi/repodb.py b/pisi/repodb.py index 3b787f4c..c5276aa7 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -21,7 +21,6 @@ import pisi.lockeddbshelve as shelve import pisi.context as ctx import pisi.packagedb as packagedb import pisi.util as util -from pisi.uri import URI class Error(pisi.Error): pass From b3c4ddc92f36d2766b2f01237600a56c6903642f Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:37:34 +0000 Subject: [PATCH 086/212] From-Import-Removal --- pisi/sourcedb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py index a3f5f4f3..593fb5ae 100644 --- a/pisi/sourcedb.py +++ b/pisi/sourcedb.py @@ -31,7 +31,7 @@ import pisi.util as util import pisi.context as ctx import pisi.lockeddbshelve as shelve import pisi.repodb -from pisi.itembyrepodb import ItemByRepoDB +import pisi.itembyrepodb class NotfoundError(pisi.Error): pass @@ -39,8 +39,8 @@ class NotfoundError(pisi.Error): class SourceDB(object): def __init__(self): - self.d = ItemByRepoDB('source') - self.dpkgtosrc = ItemByRepoDB('pkgtosrc') + self.d = pisi.itembyrepodb.ItemByRepoDB('source') + self.dpkgtosrc = pisi.itembyrepodb.ItemByRepoDB('pkgtosrc') def close(self): self.d.close() From bbb56f12b52ab309c86a5ba4a6b3c2ba006449ac Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Apr 2007 13:45:32 +0000 Subject: [PATCH 087/212] [MERGE] info_name should return repo_name for pisi info command --- pisi/api.py | 3 ++- pisi/cli/commands.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index f02834d2..cb9506d9 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -315,6 +315,7 @@ def info_name(package_name, installed=False): """Fetch package information for the given package.""" if installed: package = ctx.packagedb.get_package(package_name, pisi.itembyrepodb.installed) + repo = None else: package, repo = ctx.packagedb.get_package_repo(package_name, pisi.itembyrepodb.repos) @@ -331,7 +332,7 @@ def info_name(package_name, installed=False): files = None else: files = None - return metadata, files + return metadata, files, repo def search_package_terms(terms, repo = pisi.itembyrepodb.all): return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index a144506b..68a0babd 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -944,7 +944,7 @@ Usage: info ... self.print_pkginfo(metadata, files) else: if ctx.installdb.is_installed(arg): - metadata, files = pisi.api.info_name(arg, True) + metadata, files, repo = pisi.api.info_name(arg, True) if self.options.short: ctx.ui.info(_('[inst] '), noln=True) else: @@ -952,11 +952,11 @@ Usage: info ... self.print_pkginfo(metadata, files,pisi.itembyrepodb.installed) if ctx.packagedb.has_package(arg): - metadata, files = pisi.api.info_name(arg, False) + metadata, files, repo = pisi.api.info_name(arg, False) if self.options.short: ctx.ui.info(_('[repo] '), noln=True) else: - ctx.ui.info(_('Package found in repository:')) + ctx.ui.info(_('Package found in %s repository:') % repo) self.print_pkginfo(metadata, files, pisi.itembyrepodb.repos) if not ctx.packagedb.has_package(arg): From 759434c438f7e342f988ed7c4f948ed944faf411 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sat, 28 Apr 2007 13:47:17 +0000 Subject: [PATCH 088/212] [MERGE] info_name change broke "pisi check" fix --- pisi/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pisi/api.py b/pisi/api.py index cb9506d9..408d291a 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -300,7 +300,8 @@ def info(package, installed = False): if package.endswith(ctx.const.package_suffix): return info_file(package) else: - return info_name(package, installed) + metadata, files, repo = info_name(package, installed) + return metadata, files def info_file(package_fn): From ab06e40cc07e4d9d54ee36b010cc471a9ea10d14 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 1 May 2007 09:06:32 +0000 Subject: [PATCH 089/212] * DOH! These should return something. --- pisi/api.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 408d291a..2a1b2972 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -558,42 +558,42 @@ def rebuild_db(files=False): # from pisi.atomicoperations import resurrect_package, build def install(*args, **kw): - pisi.operations.install(*args, **kw) + return pisi.operations.install(*args, **kw) def remove(*args, **kw): - pisi.operations.remove(*args, **kw) + return pisi.operations.remove(*args, **kw) def upgrade(*args, **kw): - pisi.operations.upgrade(*args, **kw) + return pisi.operations.upgrade(*args, **kw) def emerge(*args, **kw): - pisi.operations.emerge(*args, **kw) + return pisi.operations.emerge(*args, **kw) def plan_install(*args, **kw): - pisi.operations.plan_install_pkg_names(*args, **kw) + return pisi.operations.plan_install_pkg_names(*args, **kw) def plan_remove(*args, **kw): - pisi.operations.plan_remove(*args, **kw) + return pisi.operations.plan_remove(*args, **kw) def plan_upgrade(*args, **kw): - pisi.operations.plan_upgrade(*args, **kw) + return pisi.operations.plan_upgrade(*args, **kw) def upgrade_base(*args, **kw): - pisi.operations.upgrade_base(*args, **kw) + return pisi.operations.upgrade_base(*args, **kw) def calculate_conflicts(*args, **kw): - pisi.operations.calculate_conflicts(*args, **kw) + return pisi.operations.calculate_conflicts(*args, **kw) def reorder_base_packages(*args, **kw): - pisi.operations.reorder_base_packages(*args, **kw) + return pisi.operations.reorder_base_packages(*args, **kw) def build_until(*args, **kw): - pisi.build.build_until(*args, **kw) + return pisi.build.build_until(*args, **kw) def build(*args, **kw): - pisi.atomicoperations.build(*args, **kw) + return pisi.atomicoperations.build(*args, **kw) def resurrect_package(*args, **kw): - pisi.atomicoperations.resurrect_package(*args, **kw) + return pisi.atomicoperations.resurrect_package(*args, **kw) ######################################################################## From d1ec4832ebc93865d3eb003f46ccb8ed2f7e0a31 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 13 May 2007 20:11:58 +0000 Subject: [PATCH 090/212] * merge latest translations --- po/de.po | 844 +++++++------- po/es.po | 1300 +++++++++++---------- po/fr.po | 3144 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 3077 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 818 +++++++------- po/pisi.pot | 762 +++++++------ po/tr.po | 777 +++++++------ 7 files changed, 8639 insertions(+), 2083 deletions(-) create mode 100644 po/fr.po create mode 100644 po/it.po diff --git a/po/de.po b/po/de.po index e1ea3cfa..66799d8a 100644 --- a/po/de.po +++ b/po/de.po @@ -1,15 +1,15 @@ -# translation of de.po to +# translation of de.po to Deutsch # Copyright (C) YEAR ORGANIZATION # # Mustafa M. Ölcerman , 2006. -# Faik Uygur , 2007. msgid "" msgstr "" "Project-Id-Version: de\n" -"POT-Creation-Date: 2007-03-02 16:01+EET\n" -"PO-Revision-Date: 2007-03-02 16:05+0200\n" -"Last-Translator: Faik Uygur \n" -"Language-Team: \n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2006-12-11 21:59+0200\n" +"Last-Translator: Mustafa M. Ölcerman \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -93,7 +93,7 @@ msgstr "" "mehrdeutige Option angegeben ist.\n" " " -#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 msgid "Return a comma-separated list of option strings & metavariables." msgstr "" "Gibt eine Komma-getrennte Liste zurück, mit den Optionstexten & " @@ -107,7 +107,7 @@ msgstr "" "Formatierhilfe mit eingerückten Abschnitten.\n" " " -#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:44 +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 msgid "usage: %s\n" msgstr "Gebrauch: %s\n" @@ -567,14 +567,15 @@ msgid "Running autoheader failed." msgstr "Ausführen von autoheader fehlgeschlagen." #: pisi/actionsapi/cmaketools.py:64 +#, fuzzy msgid "No configure script found for cmake." -msgstr "Kein cmake configure-Skript gefunden." +msgstr "Kein configure-Skript gefunden." -#: pisi/actionsapi/get.py:163 +#: pisi/actionsapi/get.py:160 msgid "Util %s cannot be found" msgstr "Dienstprogramm %s konnte nicht gefunden werden." -#: pisi/actionsapi/get.py:165 +#: pisi/actionsapi/get.py:162 msgid "Warning: %s does not exist, using plain name %s" msgstr "Achtung:%s existiert nicht, klar verwendeter name %s" @@ -706,11 +707,11 @@ msgstr "ActionsAPI [copytree]: Verzeichnis %s existiert nicht." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Zugriff verweigert: %s" -#: pisi/api.py:299 pisi/comariface.py:30 +#: pisi/api.py:297 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "Comar-Paket wurde nicht vollständig installiert" -#: pisi/api.py:311 +#: pisi/api.py:309 msgid "File %s not found" msgstr "Datei %s nicht gefunden" @@ -726,7 +727,7 @@ msgstr "" "\n" "Datei korrupt: %s" -#: pisi/api.py:370 pisi/cli/commands.py:967 +#: pisi/api.py:370 pisi/cli/commands.py:1044 msgid "OK" msgstr "OK" @@ -798,31 +799,31 @@ msgstr "" msgid "Archive type not recognized" msgstr "Archiv-Typ nicht erkannt" -#: pisi/atomicoperations.py:66 +#: pisi/atomicoperations.py:67 msgid "Package %s found in repository %s" msgstr "Paket %s im Depot %s gefunden" -#: pisi/atomicoperations.py:78 +#: pisi/atomicoperations.py:90 msgid "Package URI: %s" msgstr "Paket URI: %s" -#: pisi/atomicoperations.py:82 +#: pisi/atomicoperations.py:94 msgid "Package %s not found in any active repository." msgstr "Paket %s wurde in keinem der aktuellen Depot's gefunden." -#: pisi/atomicoperations.py:101 +#: pisi/atomicoperations.py:113 msgid "Installing %s, version %s, release %s, build %s" msgstr "Installiere %s, Version %s, Release %s, Build %s" -#: pisi/atomicoperations.py:146 +#: pisi/atomicoperations.py:158 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "Anhängigkeiten für %s nicht zufriedenstellent" -#: pisi/atomicoperations.py:165 +#: pisi/atomicoperations.py:177 msgid "/%s from %s package\n" msgstr "Paket /%s von %s\n" -#: pisi/atomicoperations.py:166 +#: pisi/atomicoperations.py:178 msgid "" "File conflicts:\n" "%s" @@ -830,121 +831,123 @@ msgstr "" "Datei Konflikte:\n" "%s" -#: pisi/atomicoperations.py:201 +#: pisi/atomicoperations.py:213 msgid "Re-install same version package?" msgstr "Selbe Paket-Version erneut installieren?" -#: pisi/atomicoperations.py:202 +#: pisi/atomicoperations.py:214 msgid "Package re-install declined" msgstr "Erneute Installation des Paketes ist abgelehnt worden" -#: pisi/atomicoperations.py:208 +#: pisi/atomicoperations.py:220 msgid "Upgrading to new upstream version" msgstr "Ein Upgrade auf die neuere Version wird durchgeführt" -#: pisi/atomicoperations.py:211 +#: pisi/atomicoperations.py:223 msgid "Upgrading to new distribution release" msgstr "Ein Upgrade auf die neue Distributions-Release wird ausgeführt" -#: pisi/atomicoperations.py:215 +#: pisi/atomicoperations.py:227 msgid "Upgrading to new distribution build" msgstr "Ein Upgrade auf die neue Distributions-Build wird ausgeführt" -#: pisi/atomicoperations.py:225 +#: pisi/atomicoperations.py:237 msgid "Downgrade to old distribution release?" msgstr "Zu der alten Distribution-Release downgraden?" -#: pisi/atomicoperations.py:227 +#: pisi/atomicoperations.py:239 msgid "Downgrade to old distribution build?" msgstr "Zum alten Distribution-Build downgraden?" -#: pisi/atomicoperations.py:229 +#: pisi/atomicoperations.py:241 msgid "Package downgrade declined" msgstr "Paket-Downgrade abgelehnt" -#: pisi/atomicoperations.py:253 +#: pisi/atomicoperations.py:265 msgid "%s configuration failed." msgstr "Konfiguration von %s fehlgeschlagen." -#: pisi/atomicoperations.py:340 +#: pisi/atomicoperations.py:388 msgid "Storing %s, " msgstr "%s wird abgelegt, " -#: pisi/atomicoperations.py:343 +#: pisi/atomicoperations.py:391 msgid "Storing %s." msgstr "%s wird abgelegt" -#: pisi/atomicoperations.py:350 +#: pisi/atomicoperations.py:398 msgid "Storing %s" msgstr "%s wird abgelegt" -#: pisi/atomicoperations.py:406 +#: pisi/atomicoperations.py:454 msgid "File list could not be read for package %s, continuing removal." msgstr "" "Dateiliste für Paket %s konnte nicht gelesen werden, wird mit dem Entfernen " "fortgefahren." -#: pisi/atomicoperations.py:412 +#: pisi/atomicoperations.py:460 msgid "Removing package %s" msgstr "Paket %s wird entfernt" -#: pisi/atomicoperations.py:415 +#: pisi/atomicoperations.py:463 msgid "Trying to remove nonexistent package " msgstr "Nicht vorhandenes Paket wird versucht zu entfernen" -#: pisi/atomicoperations.py:454 +#: pisi/atomicoperations.py:502 msgid "Not removing conflicted file : %s" msgstr "Konfliktierende Datei wird nicht entfernt: %s" -#: pisi/atomicoperations.py:474 -msgid "Installed file %s is not exists on system [Probably you manually deleted]" +#: pisi/atomicoperations.py:522 +msgid "" +"Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Installierte Datei %s existiert nicht in dem System [ist wahrscheinlich per " "Hand gelöscht worden]" -#: pisi/atomicoperations.py:535 +#: pisi/atomicoperations.py:581 msgid "Metadata XML '%s' cannot be found" msgstr "XML Metadaten '%s' konnten nicht gefunden werden" -#: pisi/atomicoperations.py:543 +#: pisi/atomicoperations.py:589 msgid "MetaData format wrong (%s)" msgstr "MetaDaten Format falsch (%s)" -#: pisi/atomicoperations.py:545 +#: pisi/atomicoperations.py:591 msgid "* Adding '%s' to db... " msgstr "* '%s' wird in db hinzugefügt... " -#: pisi/atomicoperations.py:551 +#: pisi/atomicoperations.py:597 msgid "Files XML '%s' cannot be found" msgstr "XML Dateien'%s' können nicht gefunden werden" -#: pisi/atomicoperations.py:556 pisi/package.py:136 +#: pisi/atomicoperations.py:602 pisi/package.py:141 msgid "Invalid %s" msgstr "Ungültig" -#: pisi/atomicoperations.py:565 +#: pisi/atomicoperations.py:611 msgid "OK." msgstr "OK." -#: pisi/build.py:88 +#: pisi/build.py:86 msgid "Path %s belongs in multiple packages" msgstr "Pfad %s gehört zu mehreren Paketen" -#: pisi/build.py:114 +#: pisi/build.py:112 msgid "Source URI: %s" msgstr "Quell URI: %s" -#: pisi/build.py:118 +#: pisi/build.py:116 msgid "Source %s not found in any active repository." msgstr "Paket %s wurde in keinem der aktuellen Depot's gefunden." -#: pisi/build.py:183 +#: pisi/build.py:181 msgid "Building PiSi source package: %s" msgstr "PiSi Quell-Paket wird konstruiert: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." +msgstr "" +"IceCream entdeckt. Stellen Sie sicher, dass Ihr Daemon gestartet ist..." #: pisi/build.py:234 msgid "CCache detected..." @@ -987,120 +990,127 @@ msgid "Building source..." msgstr "Quelle wird konstruiert" #: pisi/build.py:328 +#, fuzzy +msgid "Testing package..." +msgstr "PiSi Paket %s wird erstellt." + +#: pisi/build.py:332 msgid "Installing..." msgstr "Wird installiert..." -#: pisi/build.py:370 +#: pisi/build.py:374 msgid "Unable to read Actions Script (%s): %s" msgstr "Nicht in der Lage, Action Skript zu lesen (%s): %s" -#: pisi/build.py:372 +#: pisi/build.py:376 msgid "SyntaxError in Actions Script (%s): %s" msgstr "Syntax-Fehler im Action Skript (%s): %s" -#: pisi/build.py:389 +#: pisi/build.py:393 msgid "Unable to read COMAR script (%s): %s" msgstr "Nicht in der Lage,das COMAR Skript zu lesen (%s):%s" -#: pisi/build.py:391 +#: pisi/build.py:395 msgid "SyntaxError in COMAR file (%s): %s" msgstr "Syntax-Fehler in der COMAR-Datei (%s): %s" -#: pisi/build.py:417 +#: pisi/build.py:421 msgid "unable to call function from actions: %s" msgstr "nicht in der Lage, die Funktion vom Vorgang aufzurufen: %s" -#: pisi/build.py:433 -msgid "Safety switch: following extra packages in system.devel will be installed: " +#: pisi/build.py:437 +msgid "" +"Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Sicherheitsschalter: Folgende extra Pakete in system.devel werden " "installiert: " -#: pisi/build.py:438 +#: pisi/build.py:442 msgid "Safety switch: system.devel is already installed" msgstr "Sicherheitsschalter: system.devel ist bereits installiert" -#: pisi/build.py:440 +#: pisi/build.py:444 msgid "Safety switch: the component system.devel cannot be found" -msgstr "Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" +msgstr "" +"Sicherheitsschalter: die Komponente system.devel konnte nicht gefunden werden" -#: pisi/build.py:449 +#: pisi/build.py:453 msgid "Unsatisfied Build Dependencies:" msgstr "Unzufriedenstellender Build-Abhängigkeit:" -#: pisi/build.py:453 +#: pisi/build.py:457 msgid "Cannot build package due to unsatisfied build dependencies" msgstr "Paket kann wegen unerfüllten Abhängigkeiten nicht erstellt werden" -#: pisi/build.py:461 +#: pisi/build.py:465 msgid "Build dependency %s cannot be satisfied" msgstr "Build-Abhängigkeit %s konnte nicht zufriedengestellt werden" -#: pisi/build.py:463 +#: pisi/build.py:467 msgid "Do you want to install the unsatisfied build dependencies" msgstr "Wollen Sie die notwendigen fehlenden Abhängigkeiten installieren" -#: pisi/build.py:464 +#: pisi/build.py:468 msgid "Installing build dependencies." msgstr "Build-Abhängigkeiten werden installiert." -#: pisi/build.py:469 +#: pisi/build.py:473 msgid "Ignoring build dependencies." msgstr "Build-Abhängigkeiten werden ignoriert." -#: pisi/build.py:479 +#: pisi/build.py:483 msgid "Patch file is missing: %s\n" msgstr "Patch-Datei fehlend: %s\n" -#: pisi/build.py:492 +#: pisi/build.py:496 msgid "* Applying patch: %s" msgstr "* Patch wird eingesetzt: %s" -#: pisi/build.py:550 +#: pisi/build.py:554 msgid "Stripping files.." msgstr "Dateien werden abgelöst.." -#: pisi/build.py:656 +#: pisi/build.py:654 msgid "(found old version %s)" msgstr "(alte Version %s gefunden)" -#: pisi/build.py:658 +#: pisi/build.py:656 msgid "Skipping %s with wrong pkg name " msgstr "Überspringe %s mit falschen pkg-Namen" -#: pisi/build.py:679 +#: pisi/build.py:677 msgid "(no previous build found, setting build no to 1.)" msgstr "(Keine vorherige Build-Version gefunden, setze Build-Nr auf 1.)" -#: pisi/build.py:724 +#: pisi/build.py:722 msgid "(old package lacks a build no, setting build no to 1.)" msgstr "(Altes Paket hat keine Build-Version, setze Build-Nr auf 1.)" -#: pisi/build.py:727 +#: pisi/build.py:725 msgid "There are changes, incrementing build no to %d" msgstr "Es gibt Änderungen, erhöhe die Build-Nr auf %d" -#: pisi/build.py:730 +#: pisi/build.py:728 msgid "There is no change from previous build %d" msgstr "Es gibt keine Änderungen seit dem vorherigen Build %d" -#: pisi/build.py:795 +#: pisi/build.py:793 msgid "No user named '%s' found on the system" msgstr "'%s' genannter Benutzer konnte auf diesem System nicht gefunden werden" -#: pisi/build.py:800 +#: pisi/build.py:798 msgid "No group named '%s' found on the system" msgstr "%s genannte Gruppe konnte auf diesem System nicht gefunden werden" -#: pisi/build.py:803 +#: pisi/build.py:801 msgid "** Building package %s" msgstr "** Paket %s wird konstruiert" -#: pisi/build.py:805 pisi/build.py:808 +#: pisi/build.py:803 pisi/build.py:806 msgid "Generating %s," msgstr "%s wird generiert," -#: pisi/build.py:814 +#: pisi/build.py:812 msgid "" "Build number is not available. For repo builds you must enable buildno in " "pisi.conf." @@ -1108,107 +1118,108 @@ msgstr "" "Build-Nr ist nicht vorhanden. Für Depot-Builds muss in pisi.conf buildno " "aktiviert sein." -#: pisi/build.py:832 +#: pisi/build.py:830 msgid "Creating PiSi package %s." msgstr "PiSi Paket %s wird erstellt." -#: pisi/build.py:877 +#: pisi/build.py:875 pisi/delta.py:93 msgid "Done." msgstr "Fertig." -#: pisi/build.py:883 +#: pisi/build.py:881 msgid "Abandoned files under the install dir (%s):" msgstr "Verlassene Dateien im Installationsverzeichnis (%s):" # gesammelt hört sich komisch an -#: pisi/build.py:887 -msgid "All of the files under the install dir (%s) has been collected by package(s)" +#: pisi/build.py:885 +msgid "" +"All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Alle Dateien unter Installationsierzeichnis (%s) wurden von den Paketen " "gesammelt" -#: pisi/build.py:891 +#: pisi/build.py:889 msgid "Cleaning Build Directory..." msgstr "Build-Verzeichnis wird geleert..." -#: pisi/build.py:894 +#: pisi/build.py:892 msgid "Keeping Build Directory" msgstr "Erhalte Build-Verzeichnis" -#: pisi/cli/__init__.py:79 +#: pisi/cli/__init__.py:76 msgid "Warning: " msgstr "Warnung:" -#: pisi/cli/__init__.py:88 +#: pisi/cli/__init__.py:85 msgid "Error: " msgstr "Fehler:" -#: pisi/cli/__init__.py:120 +#: pisi/cli/__init__.py:117 msgid " (yes/no)" msgstr "(ja/nein)" -#: pisi/cli/__init__.py:141 +#: pisi/cli/__init__.py:138 msgid " [complete]\n" msgstr " [vollständig]\n" -#: pisi/cli/__init__.py:151 +#: pisi/cli/__init__.py:148 msgid "Installed %s" msgstr "%s installiert" -#: pisi/cli/__init__.py:153 +#: pisi/cli/__init__.py:150 msgid "Removed %s" msgstr "%s entfernt" -#: pisi/cli/__init__.py:155 +#: pisi/cli/__init__.py:152 msgid "Upgraded %s" msgstr "%s aktualisiert" -#: pisi/cli/__init__.py:157 +#: pisi/cli/__init__.py:154 msgid "Configured %s" msgstr "%s konfiguriert" -#: pisi/cli/__init__.py:159 +#: pisi/cli/__init__.py:156 msgid "Extracting the files of %s" msgstr "Entpacke die Dateien aus %s" -#: pisi/cli/commands.py:94 +#: pisi/cli/commands.py:92 msgid "generic help string for any command" msgstr "Allgemeiner Hilpstext für jeden Befehl" -#: pisi/cli/commands.py:123 pisi/cli/pisicli.py:104 +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 msgid "Unrecognized command: %s" msgstr "Unerkanntes Befehl: %s" -#: pisi/cli/commands.py:145 +#: pisi/cli/commands.py:143 msgid "common options" msgstr "Gemeinsame Optionen" -#: pisi/cli/commands.py:148 +#: pisi/cli/commands.py:146 msgid "general options" msgstr "Allgemeinte Optionen" -#: pisi/cli/commands.py:151 +#: pisi/cli/commands.py:149 msgid "Change the system root for PiSi commands" msgstr "Ändere den System root für die PiSi Befehle" -#: pisi/cli/commands.py:153 +#: pisi/cli/commands.py:151 msgid "Assume yes in all yes/no queries" msgstr "Alle mit ja/nein Abfragen mit ja annehmen" -#: pisi/cli/commands.py:158 +#: pisi/cli/commands.py:156 msgid "Detailed output" msgstr "Detaillerte Ausgabe " -#: pisi/cli/commands.py:160 +#: pisi/cli/commands.py:158 msgid "Show debugging information" msgstr "Debugger Informationen zeigen" # wenn dieser Text neben einer check-box steht müsste er ok sein -#: pisi/cli/commands.py:162 +#: pisi/cli/commands.py:160 msgid "Suppresses all coloring of PiSi's output" msgstr "PiSi Meldungen ohne Farben" -#: pisi/cli/commands.py:169 +#: pisi/cli/commands.py:167 msgid "" "This is a fall back function. If the implementer module provides an\n" " options function it will be called" @@ -1216,43 +1227,43 @@ msgstr "" "Dies ist eine Notfunktion. Wenn das Interpretermodul eine\n" " Optionsfunktion hat wird diese aufgerufen" -#: pisi/cli/commands.py:181 +#: pisi/cli/commands.py:179 msgid "Destination directory %s does not exist. Creating directory.\n" msgstr "Zielverzeichnis %s existiert nicht. Erstelle Verzeichnis.\n" -#: pisi/cli/commands.py:203 +#: pisi/cli/commands.py:201 msgid "Password: " msgstr "Passwort:" -#: pisi/cli/commands.py:209 +#: pisi/cli/commands.py:207 msgid "initialize PiSi components" msgstr "Initialisiere PiSi-Komponente" -#: pisi/cli/commands.py:217 +#: pisi/cli/commands.py:215 msgid "do cleanup work for PiSi components" msgstr "Aufräumarbeiten für PiSi-Komponente ausführen" -#: pisi/cli/commands.py:231 +#: pisi/cli/commands.py:229 msgid "print help for the command" msgstr "geben Sie für den Befehl help ein" -#: pisi/cli/commands.py:237 +#: pisi/cli/commands.py:235 msgid "exit program" msgstr "programm verlassen" -#: pisi/cli/commands.py:239 +#: pisi/cli/commands.py:237 msgid "Command terminated abnormally." msgstr "Befehl unzulässig beendet." -#: pisi/cli/commands.py:249 +#: pisi/cli/commands.py:247 msgid "Command lacks name" msgstr "Befehl-Name mangelt" -#: pisi/cli/commands.py:253 +#: pisi/cli/commands.py:251 msgid "Duplicate command %s" msgstr "Befehl %s duplizieren" -#: pisi/cli/commands.py:262 +#: pisi/cli/commands.py:260 msgid "" "Prints help for given commands\n" "\n" @@ -1266,7 +1277,7 @@ msgstr "" "\n" "Wenn kein Parameter angegeben wird, wird die allgemeine Hilfe angezeigt." -#: pisi/cli/commands.py:296 +#: pisi/cli/commands.py:294 msgid "" "Clean stale locks\n" "\n" @@ -1283,7 +1294,7 @@ msgstr "" "Dieser Befehl entfernt unbenutzte Blockierdateien aus dem " "Datenbankverzeichnins." -#: pisi/cli/commands.py:315 +#: pisi/cli/commands.py:313 msgid "" "Delete cache files\n" "\n" @@ -1301,7 +1312,7 @@ msgstr "" "Verzeichnis /var gespeichert. Da sie sich dort ansammeln, können\n" "sie einen grossen Speicherplatz belegen." -#: pisi/cli/commands.py:336 +#: pisi/cli/commands.py:334 msgid "" "Graph package relations\n" "\n" @@ -1321,47 +1332,47 @@ msgstr "" "werden die Paketbeziehungen zwischen den Depot-Paketen gezeigt und \n" "im graphviz Format als 'pgraph.dot' gespeichert.\n" -#: pisi/cli/commands.py:353 +#: pisi/cli/commands.py:351 msgid "graph options" msgstr "Grafik Optionen" -#: pisi/cli/commands.py:357 +#: pisi/cli/commands.py:355 msgid "Specify a particular repository" msgstr "Geben Sie ein Depot an" -#: pisi/cli/commands.py:360 +#: pisi/cli/commands.py:358 msgid "Graph of installed packages" msgstr "Graphik von den installierten Paketen" -#: pisi/cli/commands.py:363 +#: pisi/cli/commands.py:361 msgid "Do not show installed packages" msgstr "Installierte Pakete nicht anzeigen" -#: pisi/cli/commands.py:366 +#: pisi/cli/commands.py:364 msgid "Dot output file" msgstr "Dot Ausgabe-Datei" -#: pisi/cli/commands.py:377 +#: pisi/cli/commands.py:375 msgid "Plotting packages in repository %s" msgstr "Zeichne Pakete in Depot %s" -#: pisi/cli/commands.py:383 +#: pisi/cli/commands.py:381 msgid "Plotting a graph of relations among all repository packages" msgstr "Zeichne eine Grafik der Paketbeziehungen aller Pakete des Depots" -#: pisi/cli/commands.py:390 +#: pisi/cli/commands.py:388 msgid "Plotting a graph of relations among all installed packages" msgstr "Zeichne eine Grafik der Paketbeziehungen aller installierten Pakete" -#: pisi/cli/commands.py:402 +#: pisi/cli/commands.py:400 msgid "Do not take build no into account." msgstr "Build-Nr nicht auswerten." -#: pisi/cli/commands.py:407 +#: pisi/cli/commands.py:405 msgid "Do not take dependency information into account" msgstr "Information der Abhängigkeiten nicht auswerten" -#: pisi/cli/commands.py:411 +#: pisi/cli/commands.py:409 msgid "" "Build PiSi packages\n" "\n" @@ -1383,28 +1394,34 @@ msgstr "" "Eine andere Möglichkeit ist die Angabe des Namens eines Quellpaketes\n" "aus einem Depot, welches Quellcode enthält.\n" -#: pisi/cli/commands.py:434 +#: pisi/cli/commands.py:432 msgid "build options" msgstr "Build-Optionen" -#: pisi/cli/commands.py:442 +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 msgid "Output directory for produced packages" msgstr "Zielverzeichnis für erzeugte Pakete" -#: pisi/cli/commands.py:445 +#: pisi/cli/commands.py:443 msgid "Bypass errors from ActionsAPI" msgstr "Fehler von ActionsAPI umgehen" -#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 msgid "Bypass safety switch" msgstr "Sicherheitsschalter umgehen" +#: pisi/cli/commands.py:447 +#, fuzzy +msgid "Bypass testing step" +msgstr "Sicherheitsschalter umgehen" + #: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Eine statisches Paket mit ar Dateien erstellen" #: pisi/cli/commands.py:451 -msgid "Do not install build dependencies, fail if a build dependency is present" +msgid "" +"Do not install build dependencies, fail if a build dependency is present" msgstr "" "Build - Abhängigkeiten nicht installieren, Fehler bei Anwesenheit einer " "Build-Abhängigkeit" @@ -1438,26 +1455,49 @@ msgid "Break build after running compile step" msgstr "Konstruktion nach dem Kompilierungs-Step abbrechen" #: pisi/cli/commands.py:466 +#, fuzzy +msgid "Break build after running check step" +msgstr "Konstruktion nach dem Kompilierungs-Step abbrechen" + +#: pisi/cli/commands.py:468 msgid "Break build after running install step" msgstr "Konstruktion nach dem Installations-Step abbrechen" -#: pisi/cli/commands.py:468 +#: pisi/cli/commands.py:470 msgid "create PiSi package" msgstr "PiSi Paket erstellen" -#: pisi/cli/commands.py:482 +#: pisi/cli/commands.py:484 msgid "package_format must be one of %s " msgstr "Paket_format muss von %s sein" -#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 msgid "Output directory: %s" msgstr "Ausgabe-Verzeichnis: %s" -#: pisi/cli/commands.py:487 +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 msgid "Outputting packages in the working directory." msgstr "Pakete werden in das Arbeitsverzeichnis ausgegeben." -#: pisi/cli/commands.py:498 +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +#, fuzzy +msgid "delta options" +msgstr "Index Optionen" + +#: pisi/cli/commands.py:549 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1477,35 +1517,35 @@ msgstr "" "\n" "Sie können auch den Namen von der Komponente angeben.\n" -#: pisi/cli/commands.py:517 +#: pisi/cli/commands.py:568 msgid "emerge options" msgstr "emerge Optionen" -#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 msgid "Ignore file conflicts" msgstr "Datei-Konflikte ignorieren" -#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 msgid "Ignore package conflicts" msgstr "Paket-Konflikte ignorieren" -#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 msgid "Bypass comar configuration agent" msgstr "Comar Konfigurations-Agent umgehen" -#: pisi/cli/commands.py:536 +#: pisi/cli/commands.py:587 msgid "Outputting binary packages in the package cache." msgstr "Sende binäres Paket in den Zielcache." -#: pisi/cli/commands.py:544 +#: pisi/cli/commands.py:595 msgid "Abstract package operation command" msgstr "Abstrakter Befehl für Paketoperation" -#: pisi/cli/commands.py:557 +#: pisi/cli/commands.py:608 msgid "Do not perform any action, just show what would be done" msgstr "Nicht machen, nur zeigen was gemacht würde" -#: pisi/cli/commands.py:568 +#: pisi/cli/commands.py:619 msgid "" "Install PiSi packages\n" "\n" @@ -1527,23 +1567,23 @@ msgstr "" "Es können auch Komponenten statt Paketnamen angegeben werden, die zu\n" "Paketnamen expandiert werden.\n" -#: pisi/cli/commands.py:586 +#: pisi/cli/commands.py:637 msgid "install options" msgstr "Installier Optionen" -#: pisi/cli/commands.py:591 +#: pisi/cli/commands.py:642 msgid "Reinstall already installed packages" msgstr "Bereits installierte Pakete erneut installieren." -#: pisi/cli/commands.py:597 +#: pisi/cli/commands.py:648 msgid "Install component's and recursive components' packages" msgstr "Komponente installieren und Pakete der Komponenten rekursivieren" -#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 msgid "Fetch upgrades but do not install." msgstr "Upgrades abrufen aber nicht installieren" -#: pisi/cli/commands.py:622 +#: pisi/cli/commands.py:677 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1579,25 +1619,25 @@ msgstr "" "Man kann statt Paketnamen auch Komponenten angeben, die\n" "zu Paketnamen erweitert werden.\n" -#: pisi/cli/commands.py:648 +#: pisi/cli/commands.py:703 msgid "upgrade options" msgstr "Optionen verbessern" -#: pisi/cli/commands.py:653 +#: pisi/cli/commands.py:708 msgid "Security related package upgrades only" msgstr "Nur sicherheitsrelevante Aktualisierungen" -#: pisi/cli/commands.py:655 +#: pisi/cli/commands.py:710 msgid "Do not update repositories" msgstr "Quellen nicht aktualisieren" -#: pisi/cli/commands.py:661 +#: pisi/cli/commands.py:716 msgid "Upgrade component's and recursive components' packages" msgstr "" "Upgrade für die Komponente durchführen und Pakete der Komponente " "rekursivieren" -#: pisi/cli/commands.py:665 +#: pisi/cli/commands.py:720 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1605,7 +1645,7 @@ msgstr "" "Beim Upgrade des Systemes, der Pakete und Komponenten mit gleichem " "Basisnamen ignorieren." -#: pisi/cli/commands.py:667 +#: pisi/cli/commands.py:722 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1613,15 +1653,15 @@ msgstr "" "Beim Upgrade des Systemes, der Pakete und Komponenten ignorieren, deren " "Basisnamen in der Datei enthalten ist." -#: pisi/cli/commands.py:707 +#: pisi/cli/commands.py:766 msgid "Updating repositories" msgstr "Depots-Upgrade wird durchgeführt" -#: pisi/cli/commands.py:712 +#: pisi/cli/commands.py:771 msgid "Will not update repositories" msgstr "Depots werden nicht aktualisiert" -#: pisi/cli/commands.py:734 +#: pisi/cli/commands.py:796 msgid "" "Remove PiSi packages\n" "\n" @@ -1641,15 +1681,15 @@ msgstr "" "Es Kann statt der Paketnamen auch die Komponenten angegeben werden, die\n" "zu den entsprechenden Paketnamen ergänzt werden.\n" -#: pisi/cli/commands.py:751 +#: pisi/cli/commands.py:813 msgid "remove options" msgstr "Optionen entfernen" -#: pisi/cli/commands.py:754 +#: pisi/cli/commands.py:816 msgid "Remove component's and recursive components' packages" msgstr "Komponente entfernen und Pakete der Komponente rekursivieren" -#: pisi/cli/commands.py:776 +#: pisi/cli/commands.py:838 msgid "" "Configure pending packages\n" "\n" @@ -1665,11 +1705,11 @@ msgstr "" "of packages waiting to be configured. This command\n" "configures those packages.\n" -#: pisi/cli/commands.py:792 +#: pisi/cli/commands.py:854 msgid "configure-pending options" msgstr "Optionen configure-pending" -#: pisi/cli/commands.py:804 +#: pisi/cli/commands.py:866 msgid "" "Display package information\n" "\n" @@ -1683,63 +1723,64 @@ msgstr "" "\n" " ist ein Paketname oder eine .pisi Datei,\n" -#: pisi/cli/commands.py:819 +#: pisi/cli/commands.py:881 msgid "info options" msgstr "Info Optionen" -#: pisi/cli/commands.py:826 +#: pisi/cli/commands.py:888 msgid "Show a list of package files." msgstr "Liste der Paket-Dateien anzeigen." -#: pisi/cli/commands.py:828 +#: pisi/cli/commands.py:890 msgid "Info about the given component" msgstr "Info über die angegebene Komponente" -#: pisi/cli/commands.py:831 +#: pisi/cli/commands.py:893 msgid "Show only paths." msgstr "Nur Pfad anzeigen." -#: pisi/cli/commands.py:833 +#: pisi/cli/commands.py:895 msgid "Do not show details" msgstr "Details nicht anzeigen" -#: pisi/cli/commands.py:835 +#: pisi/cli/commands.py:897 msgid "Output in xml format" msgstr "Ausgabe in xml-Format" -#: pisi/cli/commands.py:881 +#: pisi/cli/commands.py:943 msgid "Package file: %s" msgstr "Paket-Datei: %s" -#: pisi/cli/commands.py:887 +#: pisi/cli/commands.py:949 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:889 +#: pisi/cli/commands.py:951 msgid "Installed package:" msgstr "Installierte Pakete:" -#: pisi/cli/commands.py:895 +#: pisi/cli/commands.py:957 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:897 -msgid "Package found in repository:" +#: pisi/cli/commands.py:959 +#, fuzzy +msgid "Package found in %s repository:" msgstr "Paket im Depot gefunden:" -#: pisi/cli/commands.py:901 +#: pisi/cli/commands.py:963 msgid "%s is not found in repositories" msgstr "%s wurde in den Depots nicht gefunden" -#: pisi/cli/commands.py:904 +#: pisi/cli/commands.py:966 msgid "%s is not installed" msgstr "%s ist nicht installiert worden" -#: pisi/cli/commands.py:917 +#: pisi/cli/commands.py:979 msgid "Reverse Dependencies:" msgstr "Rückabhängigkeiten:" -#: pisi/cli/commands.py:920 +#: pisi/cli/commands.py:982 msgid "" "\n" "Files:" @@ -1747,11 +1788,11 @@ msgstr "" "\n" "Dateien:" -#: pisi/cli/commands.py:928 +#: pisi/cli/commands.py:990 msgid "File information not available" msgstr "Datei-Informationen nicht vorhanden" -#: pisi/cli/commands.py:934 +#: pisi/cli/commands.py:996 msgid "" "Verify installation\n" "\n" @@ -1779,15 +1820,25 @@ msgstr "" "Wenn kein Paketname angegeben wird, werden alle installierten Pakete " "überprüft.\n" -#: pisi/cli/commands.py:958 +#: pisi/cli/commands.py:1016 +#, fuzzy +msgid "check options" +msgstr "Optionen suchen" + +#: pisi/cli/commands.py:1018 +#, fuzzy +msgid "Check installed packages under given component" +msgstr "Installierte Pakete unter angegebenem Komponent auflisten" + +#: pisi/cli/commands.py:1034 msgid "Checking all installed packages" msgstr "Prüfe alle installierten Pakete" -#: pisi/cli/commands.py:961 +#: pisi/cli/commands.py:1038 msgid "* Checking %s... " msgstr "* %s wird überprüft... " -#: pisi/cli/commands.py:965 +#: pisi/cli/commands.py:1042 msgid "" "\n" "Package %s is corrupt." @@ -1795,11 +1846,11 @@ msgstr "" "\n" "Paket %s ist korrupt." -#: pisi/cli/commands.py:969 +#: pisi/cli/commands.py:1046 msgid "Package %s not installed" msgstr "Paket %s nicht installiert" -#: pisi/cli/commands.py:974 +#: pisi/cli/commands.py:1051 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1826,31 +1877,31 @@ msgstr "" "arbeiten, aber\n" "er setzt dann alles in eine einzelne Index-Datei.\n" -#: pisi/cli/commands.py:995 +#: pisi/cli/commands.py:1072 msgid "index options" msgstr "Index Optionen" -#: pisi/cli/commands.py:999 +#: pisi/cli/commands.py:1076 msgid "Store absolute links for indexed files." msgstr "Absolute Links für indizierte Dateien speichern." -#: pisi/cli/commands.py:1002 +#: pisi/cli/commands.py:1079 msgid "Index output file" msgstr "Ausgabe-Datei indizieren" -#: pisi/cli/commands.py:1005 +#: pisi/cli/commands.py:1082 msgid "Do not index PiSi spec files." msgstr "PiSi spezifierte Dateien nicht indizieren." -#: pisi/cli/commands.py:1008 +#: pisi/cli/commands.py:1085 msgid "Do not sign index." msgstr "Index nicht signieren." -#: pisi/cli/commands.py:1021 +#: pisi/cli/commands.py:1098 msgid "Indexing current directory." msgstr "Aktuelles Verzeichnis wird indiziert" -#: pisi/cli/commands.py:1029 +#: pisi/cli/commands.py:1106 msgid "" "Print the list of all installed packages\n" "\n" @@ -1860,29 +1911,31 @@ msgstr "" "\n" "Verwendung: list-installed\n" -#: pisi/cli/commands.py:1043 +#: pisi/cli/commands.py:1120 msgid "list-installed options" msgstr "Optionen list-installed " -#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 -#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 -#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 msgid "Show in long format" msgstr "Langes Format anzeigen" -#: pisi/cli/commands.py:1048 +#: pisi/cli/commands.py:1125 msgid "List installed packages under given component" msgstr "Installierte Pakete unter angegebenem Komponent auflisten" -#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 msgid "Show detailed install info" msgstr "Detaillierte Installationsinfo anzeigen" -#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 -msgid "Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "Paketname |St| Version| Rel.| Build| Distro| Datum" +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 +msgid "" +"Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "" +"Paketname |St| Version| Rel.| Build| Distro| Datum" -#: pisi/cli/commands.py:1082 +#: pisi/cli/commands.py:1159 msgid "" "Rebuild Databases\n" "\n" @@ -1902,19 +1955,19 @@ msgstr "" "Wenn die Paketnamen angegeben werden, sollten sie den Paketverzeichnisnamen\n" "unter /var/lib/pisi sein\n" -#: pisi/cli/commands.py:1100 +#: pisi/cli/commands.py:1177 msgid "rebuild-db options" msgstr "Optionen rebuild-db" -#: pisi/cli/commands.py:1103 +#: pisi/cli/commands.py:1180 msgid "Rebuild files database" msgstr "Rekonstruiere Datenbank der Dateien" -#: pisi/cli/commands.py:1114 +#: pisi/cli/commands.py:1191 msgid "Rebuild PiSi databases?" msgstr "PiSi Datenbank rekonstruieren ?" -#: pisi/cli/commands.py:1121 +#: pisi/cli/commands.py:1198 msgid "" "Update repository databases\n" "\n" @@ -1934,15 +1987,15 @@ msgstr "" "Synchronsiert die PiSi Datenbank mit dem aktuellen Depot.\n" "Wenn kein Depot angegeben wird, werden alle Depots aktualisiert.\n" -#: pisi/cli/commands.py:1139 +#: pisi/cli/commands.py:1216 msgid "update-repo options" msgstr "Optionen update-repo" -#: pisi/cli/commands.py:1143 +#: pisi/cli/commands.py:1220 msgid "Update database in any case" msgstr "Datenbank auf jeden Fall aktualisieren" -#: pisi/cli/commands.py:1161 +#: pisi/cli/commands.py:1238 msgid "" "Add a repository\n" "\n" @@ -1969,23 +2022,23 @@ msgstr "" "Anm.: Momentan werden nur lokale Dateien (z.B., /a/b/c) und http:// URIs " "unterstützt\n" -#: pisi/cli/commands.py:1181 +#: pisi/cli/commands.py:1258 msgid "add-repo options" msgstr "Optionen add-repo " -#: pisi/cli/commands.py:1184 +#: pisi/cli/commands.py:1261 msgid "Add repository at given position (0 is first)" msgstr "Depot in angegebener Positioin hinzufügen (0 ist erste)" -#: pisi/cli/commands.py:1198 +#: pisi/cli/commands.py:1275 msgid "Update PiSi database for repository %s?" msgstr "PiSi Datenbank für Depot %s aktualisieren ?" -#: pisi/cli/commands.py:1202 +#: pisi/cli/commands.py:1279 msgid "%s repository could not be reached. Removing %s from system." msgstr "Depot %s konnte nicht kontaktiert werden. Entferne %s vom System." -#: pisi/cli/commands.py:1211 +#: pisi/cli/commands.py:1288 msgid "" "Remove repositories\n" "\n" @@ -1999,7 +2052,7 @@ msgstr "" "\n" "Entfernt die gesamte Information der Depots vom System.\n" -#: pisi/cli/commands.py:1237 +#: pisi/cli/commands.py:1314 msgid "" "List repositories\n" "\n" @@ -2013,7 +2066,7 @@ msgstr "" "\n" "Listet die momentan beobachteten Depots.\n" -#: pisi/cli/commands.py:1260 +#: pisi/cli/commands.py:1337 msgid "" "List available packages in the repositories\n" "\n" @@ -2031,27 +2084,27 @@ msgstr "" "Wenn kein Depot angegeben wird, werden in der Liste die Pakete\n" "aller Depots ausgegeben.\n" -#: pisi/cli/commands.py:1277 +#: pisi/cli/commands.py:1354 msgid "list-available options" msgstr "Optionen list-available" -#: pisi/cli/commands.py:1281 +#: pisi/cli/commands.py:1358 msgid "List available packages under given component" msgstr "Listet vorhandene Pakete unter einer gegebenen Komponente" -#: pisi/cli/commands.py:1283 +#: pisi/cli/commands.py:1360 msgid "Show uninstalled packages only" msgstr "Nur installierte Pakete anzeigen" -#: pisi/cli/commands.py:1291 +#: pisi/cli/commands.py:1368 msgid "Installed packages are shown in this color" msgstr "Installierte Pakete werden in dieser Farbe dargestellt" -#: pisi/cli/commands.py:1299 +#: pisi/cli/commands.py:1376 msgid "Repository : %s\n" msgstr "Quelle : %s\n" -#: pisi/cli/commands.py:1326 +#: pisi/cli/commands.py:1403 msgid "" "List available components\n" "\n" @@ -2067,11 +2120,11 @@ msgstr "" "Gieine kurze liste der PiSi-Komponenten in den \n" "Depots.\n" -#: pisi/cli/commands.py:1341 +#: pisi/cli/commands.py:1418 msgid "list-components options" msgstr "optionen list-components " -#: pisi/cli/commands.py:1366 +#: pisi/cli/commands.py:1443 msgid "" "List available sources\n" "\n" @@ -2085,11 +2138,11 @@ msgstr "" "\n" "Gives a brief list of sources published in the repositories.\n" -#: pisi/cli/commands.py:1380 +#: pisi/cli/commands.py:1457 msgid "list-sources options" msgstr "Optionen list-sources" -#: pisi/cli/commands.py:1405 +#: pisi/cli/commands.py:1482 msgid "" "List packages to be upgraded\n" "\n" @@ -2103,19 +2156,19 @@ msgstr "" "\n" "Listet die Pakete die aktualisiert werden.\n" -#: pisi/cli/commands.py:1419 +#: pisi/cli/commands.py:1496 msgid "list-upgrades options" msgstr "liste -Upgrades Optionen auf" -#: pisi/cli/commands.py:1424 +#: pisi/cli/commands.py:1501 msgid "List upgradable packages under given component" msgstr "Listet aktualisierbare Pakete unter der angegebenen Komponente" -#: pisi/cli/commands.py:1441 pisi/operations.py:466 +#: pisi/cli/commands.py:1518 pisi/operations.py:460 msgid "No packages to upgrade." msgstr "Es gibt keine Pakete zu aktualisieren." -#: pisi/cli/commands.py:1461 +#: pisi/cli/commands.py:1538 msgid "" "List pending packages\n" "\n" @@ -2125,11 +2178,11 @@ msgstr "" "\n" "Listet Pakete die noch zu konfigurieren sind.\n" -#: pisi/cli/commands.py:1483 +#: pisi/cli/commands.py:1560 msgid "There are no packages waiting to be configured" msgstr "Es sind keine Pakete da, die auf die Konfiguration warten" -#: pisi/cli/commands.py:1488 +#: pisi/cli/commands.py:1565 msgid "" "Search packages\n" "\n" @@ -2145,23 +2198,19 @@ msgstr "" "Sucht Pakete die die angegebenen Suchworte in den Feldern\n" "Zusammenfassung, Beschreibung oder Paketname enthalten.\n" -#: pisi/cli/commands.py:1503 +#: pisi/cli/commands.py:1580 msgid "search options" msgstr "Optionen suchen" -#: pisi/cli/commands.py:1506 -msgid "Set search language" -msgstr "Sprache für Suchfunktion einrichten" - -#: pisi/cli/commands.py:1511 +#: pisi/cli/commands.py:1586 msgid "Show details" msgstr "Details anzeigen" -#: pisi/cli/commands.py:1523 +#: pisi/cli/commands.py:1598 msgid "%s packages found" msgstr "%s Pakete gefunden" -#: pisi/cli/commands.py:1532 +#: pisi/cli/commands.py:1607 msgid "" "Search for a file\n" "\n" @@ -2175,35 +2224,35 @@ msgstr "" "\n" "Sucht das installierte Paket welches die angegebene Datei enthält.\n" -#: pisi/cli/commands.py:1546 +#: pisi/cli/commands.py:1621 msgid "search-file options" msgstr "Optionen search-file" -#: pisi/cli/commands.py:1550 +#: pisi/cli/commands.py:1625 msgid "Fuzzy search" msgstr "Fuzzy Suche" -#: pisi/cli/commands.py:1552 +#: pisi/cli/commands.py:1627 msgid "Show only package name" msgstr "Nur Paketnamen anzeigen" -#: pisi/cli/commands.py:1573 +#: pisi/cli/commands.py:1648 msgid "Package %s has file %s" msgstr "Paket %s hat Datei %s" -#: pisi/cli/commands.py:1575 +#: pisi/cli/commands.py:1650 msgid "Type: %s, Hash: %s" msgstr "Typ: %s, Hash: %s" -#: pisi/cli/commands.py:1578 +#: pisi/cli/commands.py:1653 msgid "Path '%s' does not belong to an installed package" msgstr "Dateipfad '%s' gehört zu keinem installierten Paket" -#: pisi/cli/commands.py:1591 +#: pisi/cli/commands.py:1666 msgid "Searching for %s" msgstr "Suche %s" -#: pisi/cli/commands.py:1601 +#: pisi/cli/commands.py:1676 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2215,7 +2264,7 @@ msgstr "" "wobei einer von:\n" "\n" -#: pisi/cli/commands.py:1607 +#: pisi/cli/commands.py:1682 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2291,19 +2340,19 @@ msgstr "Vor-Entfernen Steuerungsprogramm wird aufgerufen" msgid "Unregistering comar scripts" msgstr "Comar-Skripte werden entfernt" -#: pisi/component.py:106 pisi/component.py:112 +#: pisi/component.py:105 pisi/component.py:111 msgid "Component %s not found" msgstr "Komponente %s nicht gefunden" -#: pisi/component.py:208 pisi/component.py:234 +#: pisi/component.py:207 pisi/component.py:233 msgid "Information for component %s not available" msgstr "Information fÑur Komponente %s nicht vorhanden" -#: pisi/config.py:61 +#: pisi/config.py:60 msgid "Destination directory %s does not exist. Creating it." msgstr "Zielverzeichnis %s existiert nicht. Wird neu erstellt." -#: pisi/configfile.py:105 +#: pisi/configfile.py:107 msgid "No section by name '%s'" msgstr "Kein Abschnitt mi Namen '%s' " @@ -2339,6 +2388,16 @@ msgstr "Konstante kann nicht neu eingebunden werden: %s" msgid "Can't unbind constant: %s" msgstr "Konstene %s kann nicht geändert werden" +#: pisi/delta.py:27 +#, fuzzy +msgid "Cannot create delta for same package!" +msgstr "Verzeichnis %s konnte nicht erstellt werden" + +#: pisi/delta.py:41 +#, fuzzy +msgid "Creating delta PiSi package between %s %s" +msgstr "PiSi Paket %s wird erstellt." + #: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "Abhängigkeit %s von %s ist nicht zufriedenstellend" @@ -2360,7 +2419,8 @@ msgid "Access denied to destination file: \"%s\"" msgstr "Zugriff verweigert für Zielddatei: \"%s\"" #: pisi/fetcher.py:100 -msgid "A problem occured. Please check the archive address and/or permissions again." +msgid "" +"A problem occured. Please check the archive address and/or permissions again." msgstr "" "Es ist ein Problem aufgetreten. Bitte die Adresse der Datei und/oder Rechte " "überprüfen." @@ -2369,33 +2429,33 @@ msgstr "" msgid "No such file or no permission to read" msgstr "Datei nicht vorhanden oder keine Leseerlaubnis" -#: pisi/fetcher.py:183 +#: pisi/fetcher.py:182 msgid "Requested range not satisfiable, starting again." msgstr "Geforderter Bereich nicht erfüllbar, starte wieder neu." -#: pisi/fetcher.py:190 +#: pisi/fetcher.py:189 msgid "Cannot fetch %s; value error: %s" msgstr "%s konnte nicht abrufen; Wert-Fehler: %s" -#: pisi/fetcher.py:192 pisi/fetcher.py:196 +#: pisi/fetcher.py:191 pisi/fetcher.py:195 msgid "Cannot fetch %s; %s" msgstr "Konnte nicht abrufen %s;%s" -#: pisi/fetcher.py:194 +#: pisi/fetcher.py:193 msgid "Please check your network connections and try again. (%s)" msgstr "" "Bitte überprüfen Sie Ihre Netzwerkverbindungen und versuchen Sie es noch " "einmal. (%s)" -#: pisi/fetcher.py:198 +#: pisi/fetcher.py:197 msgid "Cannot fetch %s; (%s): %s" msgstr "Konnte nicht abrufen %s;(%s): %s" -#: pisi/fetcher.py:244 +#: pisi/fetcher.py:243 msgid "Proxy configuration has been found for '%s' protocol" msgstr "Für das '%s' Protokoll wurde eine Proxy-Konfiguration entdeckt" -#: pisi/fetcher.py:328 pisi/fetcher.py:349 pisi/fetcher.py:362 +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 msgid "ftp error" msgstr "ftp Fehler" @@ -2443,43 +2503,43 @@ msgstr "ERROR: gpg --detach-sig %s fehlgeschlagen" msgid "Encountered cycle %s" msgstr "Zusammengetroffener Zyklus %s" -#: pisi/index.py:96 +#: pisi/index.py:100 msgid "Adding %s to component index" msgstr "%s wird zum Komponente-Index hinzugefügt" -#: pisi/index.py:108 +#: pisi/index.py:112 msgid "Adding %s to package index" msgstr "%s wird zum Paket-Index hinzugefügt" -#: pisi/index.py:122 +#: pisi/index.py:126 msgid "Updating package database of %s" msgstr "Aktualisiere Paket-Datenbank von %s" -#: pisi/index.py:150 +#: pisi/index.py:154 msgid "Package %s: metadata corrupt, skipping..." msgstr "Paket %s: Metadata korrupt, wird übersprungen..." -#: pisi/index.py:178 +#: pisi/index.py:193 msgid "Adding %s to source index" msgstr "%s wird zu Quell-Index hinzugefügt" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed" msgstr "installiert" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed-pending" msgstr "installed-pending" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "purged" msgstr "gereinigt" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "removed" msgstr "entfernt" -#: pisi/installdb.py:62 +#: pisi/installdb.py:59 msgid "" "State: %s\n" "Version: %s, Release: %s, Build: %s\n" @@ -2487,11 +2547,11 @@ msgstr "" "Status: %s\n" "Version: %s, Release: %s, Build: %s\n" -#: pisi/installdb.py:67 +#: pisi/installdb.py:64 msgid "Distribution: %s, Install Time: %s\n" msgstr "Distribution: %s, Installationszeit: %s\n" -#: pisi/installdb.py:154 +#: pisi/installdb.py:151 msgid "Already installed" msgstr "Bereits installiert" @@ -2507,27 +2567,28 @@ msgstr "Schlüssel %s nicht gefunden" msgid "Key %s in repo %s not found" msgstr "Schlüssel %s in Depot %s nicht gefunden" -#: pisi/lockeddbshelve.py:47 +#: pisi/lockeddbshelve.py:46 msgid "Database version for %s insufficient. Please run rebuild-db command." msgstr "" "Datenbankversion für %s nicht ausreichend. Bitte führen Sie den Befehl " "rebuild-db aus." -#: pisi/lockeddbshelve.py:51 -msgid "Database version for %s greater than PiSi version. You need a newer PiSi." +#: pisi/lockeddbshelve.py:50 +msgid "" +"Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Datenbankversion %s ist grösser als PiSi-Version. Sie benötigen ein neueres " "PiSi." -#: pisi/lockeddbshelve.py:62 +#: pisi/lockeddbshelve.py:61 msgid "Cannot attain write access to database environment" msgstr "Schreib-Zugang zur Datenbank-Umgebung konnte nicht erreicht werden" -#: pisi/lockeddbshelve.py:64 +#: pisi/lockeddbshelve.py:63 msgid "Database version %s not present." msgstr "Datenbank Version %s nicht vorhanden." -#: pisi/lockeddbshelve.py:71 pisi/lockeddbshelve.py:153 +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 msgid "" "Another instance of PiSi is running. Only one instance is allowed to modify " "the PiSi database at a time." @@ -2535,11 +2596,11 @@ msgstr "" "Eine andere Programminstanz von PiSi ist schon aktiv. Nur eine der Instanzen " "kann die PiSi Datenbank modifizieren." -#: pisi/lockeddbshelve.py:81 +#: pisi/lockeddbshelve.py:80 msgid "Cannot attain read access to database environment" msgstr "Lese-Zugang zur Datenbank-Umgebung konnte nicht erreicht werden" -#: pisi/lockeddbshelve.py:95 +#: pisi/lockeddbshelve.py:94 msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." @@ -2547,23 +2608,24 @@ msgstr "" "Schreib-Zugang zur PiSi-Datenbank konnte nicht erlangt werden. Sie müssen " "für diesen Vorgang der root sein." -#: pisi/lockeddbshelve.py:113 +#: pisi/lockeddbshelve.py:112 msgid "Cannot attain read or write access to database %s" msgstr "" "Schreib- oder Lese-Zugang zur Datenbank-Umgebung %s konnte nicht erreicht " "werden" -#: pisi/lockeddbshelve.py:139 -msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +#: pisi/lockeddbshelve.py:138 +msgid "" +"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Flagge sollte eine von 'r', 'w', 'c' oder 'n' sein oder die bsddb.db.DB_* " "Flaggen benutzen" -#: pisi/metadata.py:58 +#: pisi/metadata.py:74 msgid "Distribution: %s, Dist. Release: %s\n" msgstr "Distribution: %s, Dist. Release: %s\n" -#: pisi/metadata.py:60 +#: pisi/metadata.py:76 msgid "Architecture: %s, Installed Size: %s" msgstr "Architektur: %s, Installierte Grösse: %s" @@ -2571,11 +2633,11 @@ msgstr "Architektur: %s, Installierte Grösse: %s" msgid "Mirrors file %s does not exist. Could not resolve mirrors://" msgstr "Mirrors-Datei %s existiert nicht. Konnte mirrors:// nicht auflösen" -#: pisi/operations.py:114 +#: pisi/operations.py:107 msgid "Mixing file names and package names not supported yet." msgstr "Mischen von Dateinamen und Paketnamen wird noch nicht unterstützt." -#: pisi/operations.py:156 +#: pisi/operations.py:149 msgid "" "The following packages will be installed\n" "in the respective order to satisfy extra dependencies:\n" @@ -2583,35 +2645,35 @@ msgstr "" "Die folgenden Pakete werden in der angegebenen \n" "Reihenfolge installiert um die zusätzlichen Abhängigkeiten zu erfüllen:\n" -#: pisi/operations.py:159 pisi/operations.py:621 +#: pisi/operations.py:152 pisi/operations.py:615 msgid "Do you want to continue?" msgstr "Wollen Sie fortfahren?" -#: pisi/operations.py:160 +#: pisi/operations.py:153 msgid "External dependencies not satisfied" msgstr "Externe Abhängigkeiten werden nicht erfüllt" -#: pisi/operations.py:172 pisi/operations.py:339 +#: pisi/operations.py:165 pisi/operations.py:332 msgid "No packages to install." msgstr "Keine zu installierenden Pakete." -#: pisi/operations.py:203 +#: pisi/operations.py:196 msgid "Installation order: " msgstr "Installation's Ordner:" -#: pisi/operations.py:257 pisi/operations.py:279 +#: pisi/operations.py:250 pisi/operations.py:272 msgid "Conflicts remain" msgstr "Es gibt immer noch Konflikte" -#: pisi/operations.py:267 +#: pisi/operations.py:260 msgid "Selected packages [%s] are in conflict with each other." msgstr "Markierte Pakete [%s] sind in Konflikt miteinander." -#: pisi/operations.py:273 +#: pisi/operations.py:266 msgid "[%s conflicts with: %s]\n" msgstr "[%s in Konflikt mit: %s]\n" -#: pisi/operations.py:275 +#: pisi/operations.py:268 msgid "" "The following packages have conflicts:\n" "%s" @@ -2619,23 +2681,26 @@ msgstr "" "Die folgenden Pakete haben Konflikte:\n" "%s" -#: pisi/operations.py:278 +#: pisi/operations.py:271 msgid "Remove the following conflicting packages?" msgstr "Folgende widersprüchliche Pakete entfernen ?" -#: pisi/operations.py:305 +#: pisi/operations.py:298 msgid "Safety switch: Following packages in system.base will be installed: " -msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" +msgstr "" +"Sicherheitsschalter: Die folgenden Pakete in system.base serden installiert:" -#: pisi/operations.py:311 +#: pisi/operations.py:304 msgid "Safety switch: Following packages in system.base will be upgraded: " -msgstr "Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" +msgstr "" +"Sicherheitsschalter: Die folgenden Pakete in system.base werden aktualisiert:" -#: pisi/operations.py:317 pisi/operations.py:597 +#: pisi/operations.py:310 pisi/operations.py:591 msgid "Safety switch: the component system.base cannot be found" -msgstr "Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" +msgstr "" +"Sicherheitsschalter: Die Komponente system.base kann nicht gefunden werden" -#: pisi/operations.py:334 +#: pisi/operations.py:327 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" @@ -2643,7 +2708,7 @@ msgstr "" "Die folgenden Pakete sind schon installiert und werden nicht noch einmal " "installiert:\n" -#: pisi/operations.py:355 +#: pisi/operations.py:348 msgid "" "Following packages will be installed in the respective order to satisfy " "dependencies:\n" @@ -2651,67 +2716,67 @@ msgstr "" "Die folgenden Pakete werden in der angegebenen Reihenfolge installiert um " "die Abhängigkeiten zu erfüllen:\n" -#: pisi/operations.py:360 pisi/operations.py:491 +#: pisi/operations.py:353 pisi/operations.py:485 msgid "Total size of package(s): %.2f %s" msgstr "Gesamtgrösse der Pakete: %.2f %s" -#: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 msgid "There are extra packages due to dependencies. Do you want to continue?" msgstr "" "Es gibt zusätzliche Pakete auf Grund von Abhängigkeiten. Möchten Sie " "fortfahren ?" -#: pisi/operations.py:432 +#: pisi/operations.py:425 msgid "Warning: package *name* ends with '.pisi'" msgstr "Warnung: Paket *name* endet mit '.pisi'" -#: pisi/operations.py:435 +#: pisi/operations.py:428 msgid "Package %s is not installed." msgstr "Paket %s ist nicht installiert." -#: pisi/operations.py:441 +#: pisi/operations.py:434 msgid "Package %s is not available in repositories." msgstr "Paket %s ist in den Depots nicht vorhanden." -#: pisi/operations.py:453 +#: pisi/operations.py:447 msgid "Package %s is already at the latest release %s." msgstr "Paket %s ist schon mit der letzten Release %s." -#: pisi/operations.py:459 +#: pisi/operations.py:453 msgid "Package %s is already at the latest build %s." msgstr "Paket %s ist schon in der letzten Build-Version %s." -#: pisi/operations.py:486 +#: pisi/operations.py:480 msgid "The following packages will be upgraded: " msgstr "Folgende Pakete werden aktualisiert:" -#: pisi/operations.py:552 +#: pisi/operations.py:546 msgid "Dependency %s of %s cannot be satisfied" msgstr "Abhängigkeit %s von %s kann nicht erfüllt werden" -#: pisi/operations.py:553 +#: pisi/operations.py:547 msgid "Upgrade is not possible." msgstr "Upgrade ist nicht möglich." -#: pisi/operations.py:568 +#: pisi/operations.py:562 msgid "Reverse dependency %s of %s cannot be satisfied" msgstr "Rückabhängigkeit %s von %s kann nicht zufriedenstellend sein" -#: pisi/operations.py:593 +#: pisi/operations.py:587 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "" "Sicherheitsschalter: Kann die folgenden Pakete aus system.base nicht " "entfernen:" -#: pisi/operations.py:604 +#: pisi/operations.py:598 msgid "Package %s does not exist. Cannot remove." msgstr "Packat %s existiert nicht. Kann nicht entfernt werden." -#: pisi/operations.py:608 +#: pisi/operations.py:602 msgid "No packages to remove." msgstr "Es gibt keine Pakete zum entfernen." -#: pisi/operations.py:617 +#: pisi/operations.py:611 msgid "" "The following minimal list of packages will be removed\n" "in the respective order to satisfy dependencies:\n" @@ -2719,19 +2784,19 @@ msgstr "" "Die folgende minimale Paketliste wird aus dem Depot in der\n" "angegebenen Reihenfolge entfernt um die Abhängigkeiten zu erfüllen:\n" -#: pisi/operations.py:622 +#: pisi/operations.py:616 msgid "Package removal declined" msgstr "Paket-Entfernung abgelehnt" -#: pisi/operations.py:634 +#: pisi/operations.py:628 msgid "Package %s is not installed. Cannot remove." msgstr "Paket %s ist nicht installiert. Kann nicht entfernt werden." -#: pisi/operations.py:683 +#: pisi/operations.py:677 msgid "No packages to emerge." msgstr "Keine Pakete zu emerge." -#: pisi/operations.py:698 +#: pisi/operations.py:692 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" @@ -2739,7 +2804,7 @@ msgstr "" "Die folgende minimale Paketliste wird aus dem Depot in der\n" "angegebenen Reihenfolge installiert um die Abhängigkeiten zu erfüllen:\n" -#: pisi/operations.py:701 +#: pisi/operations.py:695 msgid "" "The following minimal list of packages will be built and\n" "installed in the respective order to satisfy dependencies:\n" @@ -2747,7 +2812,7 @@ msgstr "" "Die folgende minimale Paketliste wird in der angegebenen\n" "Reihenfolge build und installiert um die Abhängigkeiten zu erfüllen:\n" -#: pisi/operations.py:743 +#: pisi/operations.py:737 msgid "Cannot find source package: %s" msgstr "Nicht gefunden Quellcode Paket: %s" @@ -2760,33 +2825,33 @@ msgstr "" "Das Paket kann upgradet worden sein. Bitte versuchen Sie das Paket zu " "upgraden." -#: pisi/package.py:60 pisi/sourcearchive.py:94 +#: pisi/package.py:60 pisi/sourcearchive.py:92 msgid "%s [cached]" msgstr "%s [cached]" -#: pisi/package.py:131 +#: pisi/package.py:136 msgid "MetaData format wrong" msgstr "Format der Metadaten ist inkorrekt" -#: pisi/packagedb.py:66 +#: pisi/packagedb.py:65 msgid "Package %s not found" msgstr "Paket %s nicht gefunden" -#: pisi/pxml/autoxml.py:77 +#: pisi/pxml/autoxml.py:79 msgid "At least one '%s' tag should have local text" msgstr "Mindestens ein '%s' Tag sollte lokalen Text enthalten" -#: pisi/pxml/autoxml.py:84 +#: pisi/pxml/autoxml.py:86 msgid "'%s' language of tag '%s' is empty" msgstr "Sprache '%s' des Tags '%s' ist leer" -#: pisi/pxml/autoxml.py:112 +#: pisi/pxml/autoxml.py:114 msgid "LocalText: unable to get either current or default locale" msgstr "" "LocalText: nicht in der Lage, aktuelle oder standard Lokalisierung zu " "erkennen" -#: pisi/pxml/autoxml.py:118 pisi/pxml/autoxml.py:133 +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 msgid "" "Tag should have at least the current locale, or failing that an English or " "Turkish version" @@ -2794,64 +2859,64 @@ msgstr "" "Der Tag sollte mindestens die aktuelle Lokale haben, oder anderenfalls eine " "englische oder türkische Version" -#: pisi/pxml/autoxml.py:374 +#: pisi/pxml/autoxml.py:372 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' Fehler" -#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: String '%s' hat Fehler" -#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Datei '%s' hat Fehler" -#: pisi/pxml/autoxml.py:467 +#: pisi/pxml/autoxml.py:465 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: Objekt Validation ist fehlgeschlagen" -#: pisi/pxml/autoxml.py:475 +#: pisi/pxml/autoxml.py:473 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: Dateikodierung '%s' hat Fehler" -#: pisi/pxml/autoxml.py:525 +#: pisi/pxml/autoxml.py:523 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: unbekannter Tag Typ %s in Spec" -#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 msgid "Mandatory variable %s not available" msgstr "obligatirische Variable %s nicht vorhanden" -#: pisi/pxml/autoxml.py:654 +#: pisi/pxml/autoxml.py:652 msgid "Type mismatch: read text cannot be decoded" msgstr "Falscher Typ: read text kann nicht dekodiert werden" -#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 msgid "Mandatory token %s not available" msgstr "Zwingend erforderliches Zeichen %s ist nicht verfügbar" -#: pisi/pxml/autoxml.py:672 +#: pisi/pxml/autoxml.py:670 msgid "Type mismatch. Expected %s, got %s" msgstr "Falscher Typ. Erwartet %s, erhalten %s" -#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 msgid "Type mismatch: DOM cannot be decoded" msgstr "Falscher Typ: DOM kann nicht dekodiert werden" -#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 -#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 msgid "Mandatory argument not available" msgstr "Obligatorisches Element nicht vorhanden" -#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 msgid "Object cannot be encoded" msgstr "Objekt kann nicht kodiert werden" -#: pisi/pxml/autoxml.py:743 +#: pisi/pxml/autoxml.py:741 msgid "List type must contain only one element" msgstr "Listentyp darf nur ein Element enthalten" -#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "Obligatirische Liste \"%s\" unter Knoten \"%s\" ist leer." @@ -2859,23 +2924,23 @@ msgstr "Obligatirische Liste \"%s\" unter Knoten \"%s\" ist leer." msgid "getNodeText: Expected text node, got something else!" msgstr "getNodeText: Text Knoten erwartet, aber etwas anderes erhalten!" -#: pisi/pxml/xmlfile.py:64 +#: pisi/pxml/xmlfile.py:63 msgid "String '%s' has invalid XML" msgstr "String '%s' hat ungültiges XML" -#: pisi/pxml/xmlfile.py:72 pisi/pxml/xmlfile.py:87 +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 msgid "File '%s' has invalid XML" msgstr "Datei '%s' hat ungültiges XML" -#: pisi/repodb.py:74 +#: pisi/repodb.py:73 msgid "No repository named %s exists" msgstr "Es existiert kein %s genanntes Depot" -#: pisi/repodb.py:83 +#: pisi/repodb.py:82 msgid "Repository %s already exists" msgstr "Quelle %s existiert bereits" -#: pisi/repodb.py:90 +#: pisi/repodb.py:89 msgid "Cannot add repository at position %s" msgstr "No posible agregar Depot en Position %s" @@ -2891,23 +2956,23 @@ msgstr "Repo hat schon ein Paket mit dem Namen %s." msgid "Repo does not have package named %s." msgstr "Repo enthält kein Paket mit Namen %s." -#: pisi/sourcearchive.py:63 +#: pisi/sourcearchive.py:61 msgid "Trying fallback address: %s" msgstr "Versuche Ersatz-Adresse: %s" -#: pisi/sourcearchive.py:74 +#: pisi/sourcearchive.py:72 msgid "%s mirrors are not defined." msgstr "%s Mirrors sind nicht definiert." -#: pisi/sourcearchive.py:79 +#: pisi/sourcearchive.py:77 msgid "Fetching source from mirror: %s" msgstr "Quelle wird vom Mirror abgerufen: %s" -#: pisi/sourcearchive.py:85 +#: pisi/sourcearchive.py:83 msgid "Could not fetch source from %s mirrors." msgstr "Could not fetch source from %s mirrors." -#: pisi/sourcearchive.py:103 +#: pisi/sourcearchive.py:101 msgid "unpack: check_file_hash failed" msgstr "unpack: check_file_hash fehlgeschlagen" @@ -2915,31 +2980,31 @@ msgstr "unpack: check_file_hash fehlgeschlagen" msgid "Source package %s not found" msgstr "Quell-code Paket %s nicht gefunden" -#: pisi/specfile.py:141 +#: pisi/specfile.py:140 msgid "URI: %s, type: %s, sha1sum: %s" msgstr "URI: %s, Typ: %s, Sha1sum: %s" -#: pisi/specfile.py:208 +#: pisi/specfile.py:207 msgid "Name: %s, version: %s, release: %s, build %s\n" msgstr "Name: %s, Version: %s, Release: %s, Build %s\n" -#: pisi/specfile.py:210 +#: pisi/specfile.py:209 msgid "Summary: %s\n" msgstr "Zusammenfassung: %s\n" -#: pisi/specfile.py:211 +#: pisi/specfile.py:210 msgid "Description: %s\n" msgstr "Beschreibung: %s\n" -#: pisi/specfile.py:212 +#: pisi/specfile.py:211 msgid "Component: %s\n" msgstr "Kommentar: %s\n" -#: pisi/specfile.py:213 +#: pisi/specfile.py:212 msgid "Provides: " msgstr "Bietet:" -#: pisi/specfile.py:217 +#: pisi/specfile.py:216 msgid "Dependencies: " msgstr "Abhängigkeiten:" @@ -2955,43 +3020,43 @@ msgstr "Läuft" msgid "return value for \"%s\" is %s" msgstr "Rückgabewert für \"%s\" ist %s" -#: pisi/util.py:364 +#: pisi/util.py:361 msgid "Including external link '%s'" msgstr "Externer Link '%s' wird eingebunden" -#: pisi/util.py:366 +#: pisi/util.py:363 msgid "Including directory '%s'" msgstr "Verzeichnis '%s' wird eingebunden" -#: pisi/util.py:440 +#: pisi/util.py:448 msgid "I/O Error: Cannot calculate SHA1 hash of %s" msgstr "I/O Error: Nicht möglich SHA1-Hash von %s zu berechnen" -#: pisi/util.py:451 +#: pisi/util.py:459 msgid "Cannot calculate SHA1 hash of given data" msgstr "Kann SHA1-Hash mit den vorhandenen Daten nicht berechnen" -#: pisi/util.py:488 +#: pisi/util.py:498 msgid "ERROR: patch (%s) failed" msgstr "ERROR: Patch (%s) fehlgeschlagen" -#: pisi/util.py:490 +#: pisi/util.py:500 msgid "ERROR: patch (%s) failed: %s" msgstr "ERROR: Patch (%s) fehlgeschlagen: %s" -#: pisi/util.py:536 +#: pisi/util.py:546 msgid "strip command failed for file '%s'!" msgstr "strip Befehl für die Datei '%s' fehlgeschlagen!" -#: pisi/util.py:543 +#: pisi/util.py:553 msgid "objcopy (keep-debug) command failed for file '%s'!" msgstr "Befehl objcopy (keep-debug) fehlgeschlagen für Datei '%s'!" -#: pisi/util.py:549 +#: pisi/util.py:559 msgid "objcopy (add-debuglink) command failed for file '%s'!" msgstr "Befehl objcopy (add-debuglink) fehlgeschlagen für Datei '%s'!" -#: pisi/util.py:610 +#: pisi/util.py:620 msgid "Updating environment..." msgstr "Aktualisiere Umgebungsvariablen..." @@ -3016,7 +3081,8 @@ msgstr "" "%s\n" #: scripts/repostats.py:371 -msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgid "" +"Developer '%s <%s>' has another mail address '%s' in source package '%s'" msgstr "" "Entwickler '%s <%s>' hat eina andere email adresse '%s' im Quelltext-Paket '%" "s'" @@ -3045,3 +3111,17 @@ msgstr "Suche im Quellcode - Depot...\n" msgid "Scanning binary packages...\n" msgstr "Suche im Binär - Depot...\n" +#~ msgid "Set search language" +#~ msgstr "Sprache für Suchfunktion einrichten" + +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Unbekannter Datentyp '%s' in Paket '%s'" + +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Quellcode-Paket '%s' hat falsches Datumsformat '%s'" + +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%d Fehler gefunden ! Bitte umgehend korrigieren !\n" + +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "Folgende Abhängigkeiten sind nicht im Depot vorhanden:\n" diff --git a/po/es.po b/po/es.po index 130625f0..4a185170 100644 --- a/po/es.po +++ b/po/es.po @@ -2,20 +2,24 @@ # Copyright (C) YEAR ORGANIZATION # # Klemens Häckel , 2007. -# Faik Uygur , 2007. +# Christian Faure , 2007. +# klemens , 2007. msgid "" msgstr "" "Project-Id-Version: es\n" -"POT-Creation-Date: 2007-03-02 16:01+EET\n" -"PO-Revision-Date: 2007-03-02 16:06+0200\n" -"Last-Translator: Faik Uygur \n" -"Language-Team: \n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2007-04-18 22:25-0400\n" +"Last-Translator: Christian Faure \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "X-Generator: KBabel 1.11.4\n" +# ...Optik; ver http:.... +# "Parser" por "analizador de sintaxis"? +# analizador? #: /usr/lib/python2.4/optparse.py:1 msgid "" "optparse - a powerful, extensible, and easy-to-use option parser.\n" @@ -32,14 +36,15 @@ msgid "" "For support, use the optik-users@lists.sourceforge.net mailing list\n" "(http://lists.sourceforge.net/lists/listinfo/optik-users).\n" msgstr "" -"optparse - un parser de opciones, fácil de usar pero potente y ampliable.\n" +"optparse - un analizador de opciones, fácil de usar pero potente y " +"ampliable.\n" "\n" "Por Greg Ward \n" "\n" -"Distribuido originalmente como Optik; see http://optik.sourceforge.net/ .\n" +"Distribuido originalmente como Optik; ver http://optik.sourceforge.net/ .\n" "\n" -"Si tiene problemas con éste módulo, favor no envie reportes de fallas,\n" -"parches, o propuestas de mejora con Python; en su lugar use la página \n" +"Si tiene problemas con éste módulo, no envíe reportes de fallas,\n" +"parches, o propuestas de mejora con Python. Por favor use la página \n" "del proyecto Optik en SourceForge:\n" " http://sourceforge.net/projects/optik\n" "\n" @@ -65,7 +70,7 @@ msgid "" " " msgstr "" "\n" -" Producido si al OptionParser se agregan opciones conflictivos.\n" +" Producido si al OptionParser se agregan opciones conflictivas.\n" " " #: /usr/lib/python2.4/optparse.py:114 @@ -91,19 +96,21 @@ msgstr "" " la línea de comando.\n" " " -#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 msgid "Return a comma-separated list of option strings & metavariables." -msgstr "Devuelve una lista, separado por comas de cadenas de opción & variables meta." +msgstr "" +"Devolver una lista separada por comas, de cadenas de opciones y meta-" +"variables." #: /usr/lib/python2.4/optparse.py:317 msgid "" "Format help with indented section bodies.\n" " " msgstr "" -"Ayuda de formato con indentación de secciones.\n" +"Formato de ayuda con indentación de secciones.\n" " " -#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:44 +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 msgid "usage: %s\n" msgstr "uso: %s\n" @@ -112,7 +119,7 @@ msgid "" "Format help with underlined section headers.\n" " " msgstr "" -"Ayuda de formato con cabeceras subrayadas de secciones.\n" +"Formato de ayuda con cabeceras de secciones subrayadas.\n" " " #: /usr/lib/python2.4/optparse.py:348 @@ -121,19 +128,19 @@ msgstr "Uso" #: /usr/lib/python2.4/optparse.py:354 msgid "integer" -msgstr "integer" +msgstr "Entero" #: /usr/lib/python2.4/optparse.py:355 msgid "long integer" -msgstr "long integer" +msgstr "Entero largo" #: /usr/lib/python2.4/optparse.py:356 msgid "floating-point" -msgstr "punto-flotante" +msgstr "Punto-flotante" #: /usr/lib/python2.4/optparse.py:357 msgid "complex" -msgstr "complejo" +msgstr "Complejo" #: /usr/lib/python2.4/optparse.py:365 msgid "option %s: invalid %s value: %r" @@ -141,7 +148,7 @@ msgstr "opción %s: valor %s inválido: %r" #: /usr/lib/python2.4/optparse.py:373 msgid "option %s: invalid choice: %r (choose from %s)" -msgstr "opción %s: elección inválida: %r (seleccione de %s)" +msgstr "opción %s: selección inválida: %r (seleccione de %s)" #: /usr/lib/python2.4/optparse.py:382 msgid "" @@ -183,7 +190,6 @@ msgstr "" " metavar : string\n" " " -# "keys" in which sense ? #: /usr/lib/python2.4/optparse.py:781 msgid "" "\n" @@ -194,11 +200,12 @@ msgid "" " " msgstr "" "\n" -" Actualize los valores de opciones de cualquier diccionario, pero " +" Actualice los valores de opciones de cualquier diccionario, pero " "solamente\n" -" use teclas del dict que ya tienen un atributo correspondiente\n" -" en si mismo. Cualquier tecla en dict sin atributo correspondiente " -"se \n" +" use claves del diccionario que ya tienen un atributo " +"correspondiente\n" +" en si mismo. Cualquier clave en diccionario sin atributo " +"correspondiente se \n" " va a ignorar silenciosamante.\n" " " @@ -211,9 +218,9 @@ msgid "" " " msgstr "" "\n" -" Actualize los valores de opciones de cualquier diccionario, \n" -" usando todas las teclas del diccionario sin importar si \n" -" tienen un atributo correspondiente en si mismo o no.\n" +" Actualice los valores de opciones de cualquier diccionario, \n" +" usando todas las claves del diccionario sin importar si \n" +" tienen un atributo correspondiente o no.\n" " " #: /usr/lib/python2.4/optparse.py:926 @@ -259,16 +266,16 @@ msgstr "" " values : Values = None)\n" " -> (values : Values, args : [string])\n" "\n" -" Parse las opciones de línea de comando encontrados en " +" Analiza las opciones de línea de comando encontrados en " "'args' (default:\n" " sys.argv[1:]). Cualquier error produce una llamada a 'error()', " "que\n" " por defecto imprime el mensaje de uso a la salida stderr y llama\n" " sys.exit() con un mensaje de error. Si exitoso devuelve un par\n" -" (values, args) donde 'values' es una instalcia de Values (con todos\n" -" los valores de tus opciones) y 'args' es la lista de argumentos que " -"quedan\n" -" luego de parsear las opciones.\n" +" (values, args) donde 'values' es una instancia de Values (con todos\n" +" los valores de las opciones que le fueron pasadas) y 'args' es la " +"lista de argumentos \n" +" que quedan luego de analizar las opciones.\n" " " #: /usr/lib/python2.4/optparse.py:1285 @@ -288,15 +295,14 @@ msgstr "" " check_values(values : Values, args : [string])\n" " -> (values : Values, args : [string])\n" "\n" -" Verifica la válidez de los valores de las opciones indicadas y de " +" Verifica la validéz de los valores de las opciones indicadas y de " "los\n" -" argumentos sobrantes. Devuelve los valores de opcioines y argumentos " +" argumentos sobrantes. Devuelve los valores de opciones y argumentos " "sobrantes\n" -" (posiblemente corregidos, posiblemente completamente nuevo -- como " -"te parezca\n" -" mejor). La implementación por defecto simplemente devuelve los " +" (posiblemente corregidos, completamente nuevos -- como le parezca\n" +" mejor). La implementación predeterminada simplemente devuelve los " "valores que se\n" -" le pasaron; subclases pueden sobreescribir como deseado.\n" +" le pasaron; las subclases se pueden sobreescribir.\n" " " #: /usr/lib/python2.4/optparse.py:1298 @@ -317,12 +323,12 @@ msgstr "" " rargs : [string],\n" " values : Values)\n" "\n" -" Procesa argumentos de línea de comando y popula 'values', " -"consumando\n" -" opciones y argumentos dr 'rargs'. Si 'allow_interspersed_args' es\n" +" Procesa argumentos de línea de comando y carga 'values', " +"consumiendo\n" +" opciones y argumentos de 'args'. Si 'allow_interspersed_args' es\n" " falso, para con el primer argumento que no es una opción. Si " "verdadero, acumula los\n" -" argumentos entremedios que no son opciones en 'largs'.\n" +" argumentos intermedios que no son opciones en 'largs'.\n" " " #: /usr/lib/python2.4/optparse.py:1349 @@ -336,29 +342,30 @@ msgid "" msgstr "" "_match_long_opt(opt : string) -> string\n" "\n" -" Determina con cual opción larga concuerda la cadena 'opt', o sea " -"que, para cual\n" +" Determina con cual opción de cadena larga concuerda la cadena 'opt', " +"o sea que, para cual\n" " de ellos es una abreviatura no ambigua. Produce BadOptionError si\n" " 'opt' no coincide de manera no-ambigua con uno de las opciones de " -"long string.\n" +"cadena larga.\n" " " #: /usr/lib/python2.4/optparse.py:1376 /usr/lib/python2.4/optparse.py:1415 msgid "%s option requires an argument" -msgstr "%s opción requiere un argumento" +msgstr "la opción %s requiere un argumento" #: /usr/lib/python2.4/optparse.py:1378 /usr/lib/python2.4/optparse.py:1417 msgid "%s option requires %d arguments" -msgstr "opción %s require %d argumentos" +msgstr "la opción %s requiere %d argumentos" #: /usr/lib/python2.4/optparse.py:1387 msgid "%s option does not take a value" -msgstr "opción %s no toma un valor" +msgstr "ls opción %s no toma un valor" #: /usr/lib/python2.4/optparse.py:1404 /usr/lib/python2.4/optparse.py:1558 msgid "no such option: %s" msgstr "no existe la opción: %s" +# alguna mejor idea para "retornar" ? #: /usr/lib/python2.4/optparse.py:1454 msgid "" "error(msg : string)\n" @@ -370,10 +377,9 @@ msgid "" msgstr "" "error(msg : string)\n" "\n" -" Imprime un mensaje de uso incluyendo 'msg' hacia la salida stderr y " -"salir.\n" -" Si lo sobreescribís en una subclase no debería retornar -- \n" -" debería o salir o producir una excepción.\n" +" Imprime un mensaje incluyendo 'msg' hacia la salida stderr y sale.\n" +" Si lo sobreescribe en una subclase no debería retornar -- \n" +" sino debería o salir o producir una excepción.\n" " " #: /usr/lib/python2.4/optparse.py:1471 @@ -389,11 +395,11 @@ msgid "" msgstr "" "print_usage(file : file = stdout)\n" "\n" -" Imprime el mensaje de uso parra el programa actual (self.usage) a\n" +" Imprime el mensaje de uso para el programa actual (self.usage) a\n" " 'file' (por defecto stdout). Cualquier ocurrencia de la cadena \"%" "prog\" en\n" " self.usage es reemplazado por el nombre del programa actual\n" -" (nombre de base de sys.argv[0]). No hace nada si self.usage es " +" (nombre de base de sys.argv[0]). No hace nada si self.usage está " "vacío\n" " o no definido.\n" " " @@ -411,11 +417,11 @@ msgstr "" "print_version(file : file = stdout)\n" "\n" " Imprime el mensaje de versión del programa actual (self.version) a\n" -" 'file' (por defecto a stdout). Como print_usage(), cualquier " -"occurencia\n" +" 'file' (por defecto a stdout). Similar a print_usage(), cualquier " +"ocurrencia\n" " de \"%prog\" en self.version es reemplazado por el nombre del " "programa\n" -" actual. No hace nada si self.version es vacío o no definido.\n" +" actual. No hace nada si self.version está vacío o no definido.\n" " " #: /usr/lib/python2.4/optparse.py:1504 @@ -432,10 +438,9 @@ msgid "" msgstr "" "print_help(file : file = stdout)\n" "\n" -" Imprime un mensaje extendido de ayuda, listando todas las opciones " -"y\n" -" los textos de ayuda que viene juntos con ellos, a 'file' (por " -"defecto a stdout).\n" +" Imprime un mensaje de ayuda extensa, listando todas las opciones y\n" +" los textos de ayuda que vienen con ellos, a 'file' (por defecto a " +"stdout).\n" " " #: /usr/lib/python2.4/optparse.py:1541 @@ -451,9 +456,8 @@ msgstr "" "\n" " Devuelve la cadena clave en 'wordmap' para la cual 's' es una " "abreviatura\n" -" no-ambigua. Si 's' resulta ser ambiguoo no concuerda con ninguno de " -"las\n" -" 'palabras', produce BadOptionError.\n" +" no-ambigua. Si 's' resulta ser ambiguo o no concuerda con ninguno de \n" +" 'words', produce BadOptionError.\n" " " #: /usr/lib/python2.4/optparse.py:1562 @@ -462,7 +466,7 @@ msgstr "opción ambigua: %s (%s?)" #: pisi-cli:46 msgid "Keyboard Interrupt: Exiting..." -msgstr "Interrupción de teclado: Saliendo..." +msgstr "Interrupción de teclado: Terminando..." #: pisi-cli:49 msgid "Program Terminated." @@ -477,8 +481,8 @@ msgid "" "upgrades." msgstr "" "Una operación de base de datos fue abortada. Debería ejecutar pisi\n" -"de nuevo para el procedimiento de recuperación normal de DB. Asegurese de \n" -"tener suficiente espacio libre en disco.\n" +"de nuevo para el procedimiento de recuperación normal de DB. Asegúrese de \n" +"tener espacio disponible en disco.\n" " Debe ejecutar rebuild-db solamente en caso de corrupción de archivos y para " "actualización de base de datos" @@ -487,8 +491,8 @@ msgid "" "Unhandled internal exception.\n" "Please file a bug report. (http://bugs.uludag.org.tr)" msgstr "" -"Excepción interna no previsto.\n" -"Favor envie un reporte de la falla. (http://bugs.uludag.org.tr)" +"Excepción interna no prevista.\n" +"Favor envíe un reporte de la falla. (http://bugs.uludag.org.tr)" #: pisi-cli:63 msgid "System Error. Program Terminated." @@ -500,11 +504,11 @@ msgstr "Favor use 'pisi help' para ayuda general." #: pisi-cli:73 msgid "Traceback:" -msgstr "Traceback:" +msgstr "Registro:" #: pisi-cli:77 msgid "Use --debug to see a traceback." -msgstr "Use --debug para ver traceback." +msgstr "Use --debug para ver registro." #: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 msgid "" @@ -518,7 +522,7 @@ msgstr "" #: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." -msgstr "Falló Configure." +msgstr "Configuración fallada." #: pisi/actionsapi/autotools.py:77 pisi/actionsapi/autotools.py:87 #: pisi/actionsapi/kde.py:67 @@ -570,12 +574,12 @@ msgstr "Falló ejecución de autoheader." msgid "No configure script found for cmake." msgstr "Script de configuración no encontrado." -#: pisi/actionsapi/get.py:163 +#: pisi/actionsapi/get.py:160 msgid "Util %s cannot be found" msgstr "Utilidad %s no se puede encontrar" # what is the context of this ? -#: pisi/actionsapi/get.py:165 +#: pisi/actionsapi/get.py:162 msgid "Warning: %s does not exist, using plain name %s" msgstr "Alerta: %s no existe, usando nombre simple %s" @@ -611,8 +615,9 @@ msgstr "falló perl install." #: pisi/actionsapi/pisitools.py:126 msgid "ActionsAPI [doman]: Wrong man page file: %s" -msgstr "ActionsAPI [doman]: Archivo página man equivocado: %s" +msgstr "ActionsAPI [doman]: Archivo de ayuda man equivocado: %s" +# directorio o carpeta ? creo que mezclé los términos #: pisi/actionsapi/pisitools.py:164 msgid "ActionsAPI [rename]: No such file or directory: %s" msgstr "ActionsAPI [rename]: No existe archivo o directorio: %s" @@ -623,7 +628,7 @@ msgstr "Archivo no existe o permiso denegado: %s" #: pisi/actionsapi/pisitools.py:198 msgid "ActionsAPI [dosym]: File exists: %s" -msgstr "ActionsAPI [dosym]: Archivo existe: %s" +msgstr "ActionsAPI [dosym]: Archivo ya existe: %s" #: pisi/actionsapi/pisitoolsfunctions.py:45 #: pisi/actionsapi/pisitoolsfunctions.py:59 @@ -637,7 +642,7 @@ msgstr "Ejecución de %s falló." #: pisi/actionsapi/shelltools.py:49 msgid "Cannot create directory %s" -msgstr "No posible crear carpeta %s" +msgstr "No posible crear la carpeta %s" #: pisi/actionsapi/shelltools.py:57 msgid "ActionsAPI [echo]: Can't append to file %s." @@ -707,11 +712,11 @@ msgstr "ActionsAPI [copytree]: Carpeta %s no existe." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Permiso denegado: %s" -#: pisi/api.py:299 pisi/comariface.py:30 +#: pisi/api.py:297 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "paquete comar no está instalado completamente" -#: pisi/api.py:311 +#: pisi/api.py:309 msgid "File %s not found" msgstr "Archivo %s no encontrado" @@ -727,7 +732,7 @@ msgstr "" "\n" "Archivo corrupto: %s" -#: pisi/api.py:370 pisi/cli/commands.py:967 +#: pisi/api.py:370 pisi/cli/commands.py:1044 msgid "OK" msgstr "OK" @@ -741,15 +746,15 @@ msgstr "* Archivo de índice grabado" #: pisi/api.py:394 msgid "Repo %s already present." -msgstr "Repo %s ya presente." +msgstr "Repositorio %s ya existe." #: pisi/api.py:398 msgid "Repo %s added to system." -msgstr "Repo %s agregado al sistema." +msgstr "Repositorio %s agregado al sistema." #: pisi/api.py:404 msgid "Repo %s removed from system." -msgstr "Repo %s removido del sistema." +msgstr "Repositorio %s removido del sistema." #: pisi/api.py:406 msgid "Repository %s does not exist. Cannot remove." @@ -766,11 +771,11 @@ msgstr "No hay actualizaciones disponibles para repositorio %s." # what do You mean here with "at any rate" ? ok, got it, but will think of better spanish translation. it is not yet in here. #: pisi/api.py:423 msgid "Updating database at any rate as requested" -msgstr "Actualizando base de datos según solicitado" +msgstr "Actualizando base de datos de todas formas según solicitado" #: pisi/api.py:434 msgid "* Package database updated." -msgstr "* Base de datos de paquetes actualizado." +msgstr "* Base de datos de paquetes actualizada." #: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." @@ -778,11 +783,11 @@ msgstr "No se encontró repositorio con nombre %s." #: pisi/api.py:444 msgid "* Rebuilding '%s' named repo... " -msgstr "* Regenerando repo de nombre '%s' ... " +msgstr "* Regenerando repositorio con nombre '%s' ... " #: pisi/api.py:457 msgid "Input/Output error while reading %s: %s" -msgstr "Error de Input/Output al leer %s: %s" +msgstr "Error de Entrada/Salida al leer %s: %s" #: pisi/api.py:514 msgid "Rebuilding package database" @@ -800,152 +805,161 @@ msgstr "" msgid "Archive type not recognized" msgstr "Tipo de archivo desconocido" -#: pisi/atomicoperations.py:66 +#: pisi/atomicoperations.py:67 msgid "Package %s found in repository %s" msgstr "Paquete %s encontrado en repositorio %s" -#: pisi/atomicoperations.py:78 +# should it not be "URL" ? +#: pisi/atomicoperations.py:90 msgid "Package URI: %s" msgstr "URI de paquete: %s" -#: pisi/atomicoperations.py:82 +#: pisi/atomicoperations.py:94 msgid "Package %s not found in any active repository." -msgstr "Paquete %s no encontrado en ningun repositorio activo." +msgstr "Paquete %s no encontrado en ningún repositorio activo." -#: pisi/atomicoperations.py:101 +#: pisi/atomicoperations.py:113 msgid "Installing %s, version %s, release %s, build %s" msgstr "Instalando %s, versión %s, release %s, build %s" -#: pisi/atomicoperations.py:146 +#: pisi/atomicoperations.py:158 msgid "%s package cannot be installed unless the dependencies are satisfied" -msgstr "paquete %s no se puede instalar sin las dependencias" +msgstr "" +"los paquetes %s no se puede instalar hasta que instale los paquetes " +"requeridos" # check this ?? - probably ok, but see the context -#: pisi/atomicoperations.py:165 +#: pisi/atomicoperations.py:177 msgid "/%s from %s package\n" msgstr "/%s de paquete %s\n" -#: pisi/atomicoperations.py:166 +#: pisi/atomicoperations.py:178 msgid "" "File conflicts:\n" "%s" msgstr "" -"Conflictos de archivo:\n" +"Archivo en conflicto:\n" "%s" -#: pisi/atomicoperations.py:201 +#: pisi/atomicoperations.py:213 msgid "Re-install same version package?" msgstr "Reinstalar el paquete de la misma versión ?" -#: pisi/atomicoperations.py:202 +# traducir mejor como rechazar o denegar ?? +#: pisi/atomicoperations.py:214 msgid "Package re-install declined" -msgstr "Reinstalación de paquete rechazado" +msgstr "Reinstalación de paquete rechazada" -#: pisi/atomicoperations.py:208 +#: pisi/atomicoperations.py:220 msgid "Upgrading to new upstream version" msgstr "Actualizando a nueva versión upstream" -#: pisi/atomicoperations.py:211 +#: pisi/atomicoperations.py:223 msgid "Upgrading to new distribution release" -msgstr "Actualización a nueva release de distribución" - -#: pisi/atomicoperations.py:215 -msgid "Upgrading to new distribution build" -msgstr "Actualización a nuevo 'build' de distribución" - -#: pisi/atomicoperations.py:225 -msgid "Downgrade to old distribution release?" -msgstr "Revertir hacia release antigua de distribución ?" +msgstr "Actualización a nueva versión (release) de distribución" #: pisi/atomicoperations.py:227 +msgid "Upgrading to new distribution build" +msgstr "Actualización a nueva versión ('build') de distribución" + +#: pisi/atomicoperations.py:237 +msgid "Downgrade to old distribution release?" +msgstr "Revertir hacia versión (release) antigua de distribución ?" + +#: pisi/atomicoperations.py:239 msgid "Downgrade to old distribution build?" -msgstr "Revertir hacia 'build' antiguo de distribución ?" +msgstr "Revertir hacia versión ('build') antigua de distribución ?" -#: pisi/atomicoperations.py:229 +#: pisi/atomicoperations.py:241 msgid "Package downgrade declined" -msgstr "Revertir (downgrade) de paquete rechazado" +msgstr "Revertir versión anterior (downgrade) de paquete rechazada" -#: pisi/atomicoperations.py:253 +#: pisi/atomicoperations.py:265 msgid "%s configuration failed." -msgstr "Falló configuración %s ." +msgstr "Falló la configuración %s ." -#: pisi/atomicoperations.py:340 +#: pisi/atomicoperations.py:388 msgid "Storing %s, " msgstr "Guardando %s, " -#: pisi/atomicoperations.py:343 +#: pisi/atomicoperations.py:391 msgid "Storing %s." msgstr "Guardando %s." -#: pisi/atomicoperations.py:350 +#: pisi/atomicoperations.py:398 msgid "Storing %s" msgstr "Guardando %s" -#: pisi/atomicoperations.py:406 +#: pisi/atomicoperations.py:454 msgid "File list could not be read for package %s, continuing removal." -msgstr "Lista de archivos no se pudo leer para paquete %s, continuando eliminar." +msgstr "" +"La lista de archivos no se pudo leer para el paquete %s, continuando " +"eliminación." -#: pisi/atomicoperations.py:412 +#: pisi/atomicoperations.py:460 msgid "Removing package %s" msgstr "Eliminando paquete %s" -#: pisi/atomicoperations.py:415 +#: pisi/atomicoperations.py:463 msgid "Trying to remove nonexistent package " msgstr "Intentando remover paquete no-existente" -#: pisi/atomicoperations.py:454 +#: pisi/atomicoperations.py:502 msgid "Not removing conflicted file : %s" -msgstr "No eliminado archivo conflictivo: %s" +msgstr "Archivo conflictivo: %s no eliminado " -#: pisi/atomicoperations.py:474 -msgid "Installed file %s is not exists on system [Probably you manually deleted]" +#: pisi/atomicoperations.py:522 +msgid "" +"Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Archivo instalado %s no existe en el sistema [Probablemente eliminado " "manualmente]" -#: pisi/atomicoperations.py:535 +#: pisi/atomicoperations.py:581 msgid "Metadata XML '%s' cannot be found" msgstr "Metadata XML '%s' no se puede encontrar" -#: pisi/atomicoperations.py:543 +#: pisi/atomicoperations.py:589 msgid "MetaData format wrong (%s)" msgstr "Formato de MetaData incorrecto (%s)" -#: pisi/atomicoperations.py:545 +#: pisi/atomicoperations.py:591 msgid "* Adding '%s' to db... " msgstr "* Agregando '%s' a db... " -#: pisi/atomicoperations.py:551 +#: pisi/atomicoperations.py:597 msgid "Files XML '%s' cannot be found" msgstr "Archivos XML '%s' no se pueden encontrar" -#: pisi/atomicoperations.py:556 pisi/package.py:136 +#: pisi/atomicoperations.py:602 pisi/package.py:141 msgid "Invalid %s" -msgstr "%s Invalido" +msgstr "%s no es válido" -#: pisi/atomicoperations.py:565 +#: pisi/atomicoperations.py:611 msgid "OK." msgstr "OK." -#: pisi/build.py:88 +# depende del contexto - verificar si se puede mejorar.. +#: pisi/build.py:86 msgid "Path %s belongs in multiple packages" msgstr "Ruta %s pertenece a múltiples paquetes" -#: pisi/build.py:114 +#: pisi/build.py:112 msgid "Source URI: %s" msgstr "URI Fuente: %s" -#: pisi/build.py:118 +#: pisi/build.py:116 msgid "Source %s not found in any active repository." -msgstr "Fuente %s no encontrado en ningún repositorio activo." +msgstr "Fuente %s no encontrada en repositorios activos." -#: pisi/build.py:183 +#: pisi/build.py:181 msgid "Building PiSi source package: %s" msgstr "Generando paquete fuente PiSi: %s" #: pisi/build.py:229 msgid "IceCream detected. Make sure your daemon is up and running..." -msgstr "IceCream detectado. Asegurese que el demónio está activo y funcionando..." +msgstr "" +"IceCream detectado. Asegurese que el demónio está activo y funcionando..." #: pisi/build.py:234 msgid "CCache detected..." @@ -953,11 +967,11 @@ msgstr "CCache detectado..." #: pisi/build.py:287 msgid "PartOf tag not defined, looking for component" -msgstr "PartOf tag no definido, buscando componente" +msgstr "ParteOf tag no definido, buscando componente" #: pisi/build.py:297 msgid "Cannot find component.xml in upper directory" -msgstr "No se pudo encontrar .xml en directorio superior" +msgstr "No se pudo encontrar component.xml en directorio superior" #: pisi/build.py:301 msgid "Source is part of %s component" @@ -988,121 +1002,134 @@ msgid "Building source..." msgstr "Generando fuente..." #: pisi/build.py:328 +#, fuzzy +msgid "Testing package..." +msgstr "Creando Paquete PiSi %s." + +#: pisi/build.py:332 msgid "Installing..." msgstr "Instalando..." -#: pisi/build.py:370 +#: pisi/build.py:374 msgid "Unable to read Actions Script (%s): %s" msgstr "No posible leer Script de Acciones (%s): %s" -#: pisi/build.py:372 +#: pisi/build.py:376 msgid "SyntaxError in Actions Script (%s): %s" msgstr "Error de Sintaxis en Script de Acciones (%s): %s" -#: pisi/build.py:389 +#: pisi/build.py:393 msgid "Unable to read COMAR script (%s): %s" msgstr "No posible leer Script de COMAR (%s): %s" -#: pisi/build.py:391 +#: pisi/build.py:395 msgid "SyntaxError in COMAR file (%s): %s" -msgstr "Error de Sintax en archivo COMAR (%s): %s" +msgstr "Error de Sintaxis en archivo COMAR (%s): %s" -#: pisi/build.py:417 +# no suea bien, pero está correcto segun ingles. pero quizá querían decir otra cosa ? +# quizá quieren decir: no posible llamar/ejecutar rutina del achivo de acciones ?? +#: pisi/build.py:421 msgid "unable to call function from actions: %s" msgstr "no posible llamar función desde acciones: %s" # did I get "safety switch" right (in this context)? -#: pisi/build.py:433 -msgid "Safety switch: following extra packages in system.devel will be installed: " +#: pisi/build.py:437 +msgid "" +"Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Verificación de seguridad: Se instalarán los siguientes paquetes adicionales " "en system.devel:" -#: pisi/build.py:438 +#: pisi/build.py:442 msgid "Safety switch: system.devel is already installed" msgstr "Verificación de seguridad: system.devel ya está instalado" -#: pisi/build.py:440 +#: pisi/build.py:444 msgid "Safety switch: the component system.devel cannot be found" -msgstr "Verificación de seguridad: No posible encontrar el componente system.devel" +msgstr "" +"Verificación de seguridad: No posible encontrar el componente system.devel" -#: pisi/build.py:449 +# satisfechas - entiendo que se refiere a librerias necesarias para hacer el proceso build +# quizá hay mejor manera de decirlo en español +#: pisi/build.py:453 msgid "Unsatisfied Build Dependencies:" msgstr "Dependencias Build no satisfechas:" -#: pisi/build.py:453 +#: pisi/build.py:457 msgid "Cannot build package due to unsatisfied build dependencies" -msgstr "No posible generar el paquete por dependencias build no satisfechos" +msgstr "No es posible generar el paquete por dependencias build no satisfechas" -#: pisi/build.py:461 +#: pisi/build.py:465 msgid "Build dependency %s cannot be satisfied" msgstr "Dependencia build %s no se puede satisfacer" -#: pisi/build.py:463 +#: pisi/build.py:467 msgid "Do you want to install the unsatisfied build dependencies" -msgstr "Quiere instalar las dependencias build no satisfechas " +msgstr "Quiere instalar las dependencias build faltantes " -#: pisi/build.py:464 +#: pisi/build.py:468 msgid "Installing build dependencies." msgstr "Instalando dependencias build" -#: pisi/build.py:469 +#: pisi/build.py:473 msgid "Ignoring build dependencies." msgstr "Ignorando dependencias build" -#: pisi/build.py:479 +#: pisi/build.py:483 msgid "Patch file is missing: %s\n" -msgstr "Archivo parche faltanda: %s\n" +msgstr "Falta el archivo de parche: %s\n" -#: pisi/build.py:492 +#: pisi/build.py:496 msgid "* Applying patch: %s" msgstr "* Aplicando parche: %s" -#: pisi/build.py:550 +#: pisi/build.py:554 msgid "Stripping files.." msgstr "Quitando archivos.." -#: pisi/build.py:656 +#: pisi/build.py:654 msgid "(found old version %s)" msgstr "(encontrado versión antigua %s)" -#: pisi/build.py:658 +#: pisi/build.py:656 msgid "Skipping %s with wrong pkg name " msgstr "Omitiendo %s con nombre de pkg incorrecto" -#: pisi/build.py:679 +#: pisi/build.py:677 msgid "(no previous build found, setting build no to 1.)" msgstr "(no se encontró build anterior, seteando número de build a 1.)" -#: pisi/build.py:724 +#: pisi/build.py:722 msgid "(old package lacks a build no, setting build no to 1.)" -msgstr "(paquete antiguo no tiene número de build, seteando número de build a 1.)" +msgstr "" +"(paquete antiguo no tiene número de build, seteando número de build a 1.)" -#: pisi/build.py:727 +#: pisi/build.py:725 msgid "There are changes, incrementing build no to %d" msgstr "Hay cambios, incrementando número de build a %d" -#: pisi/build.py:730 +#: pisi/build.py:728 msgid "There is no change from previous build %d" msgstr "No hay cambios en relación al build anterior %d" -#: pisi/build.py:795 +#: pisi/build.py:793 msgid "No user named '%s' found on the system" msgstr "Nombre de usuario '%s' no encontrado en el sistema" -#: pisi/build.py:800 +#: pisi/build.py:798 msgid "No group named '%s' found on the system" msgstr "Nombre de grupo '%s' no encontrado en el sistema" -#: pisi/build.py:803 +# oops, aqui falta traducir. pero como se puede decir ? +#: pisi/build.py:801 msgid "** Building package %s" -msgstr "** Building package %s" +msgstr "** Construyendo paquete %s" -#: pisi/build.py:805 pisi/build.py:808 +#: pisi/build.py:803 pisi/build.py:806 msgid "Generating %s," msgstr "Generando %s," -#: pisi/build.py:814 +#: pisi/build.py:812 msgid "" "Build number is not available. For repo builds you must enable buildno in " "pisi.conf." @@ -1110,153 +1137,158 @@ msgstr "" "Número de build no disponible. Para builds de repo buildno debe estar " "habilitado en pisi.conf." -#: pisi/build.py:832 +#: pisi/build.py:830 msgid "Creating PiSi package %s." msgstr "Creando Paquete PiSi %s." -#: pisi/build.py:877 +# podria ser tambien "Fin" o "Listo" +#: pisi/build.py:875 pisi/delta.py:93 msgid "Done." msgstr "Hecho." -#: pisi/build.py:883 +#: pisi/build.py:881 msgid "Abandoned files under the install dir (%s):" msgstr "Archivos abandonados en carpeta de instalación (%s):" -#: pisi/build.py:887 -msgid "All of the files under the install dir (%s) has been collected by package(s)" +# revisa este por favor +#: pisi/build.py:885 +msgid "" +"All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Todos los archivos de la carpeta de instalación (%s) se juntaron en los " "paquetes" -#: pisi/build.py:891 +#: pisi/build.py:889 msgid "Cleaning Build Directory..." msgstr "Limpiando Carpeta Build..." -#: pisi/build.py:894 +#: pisi/build.py:892 msgid "Keeping Build Directory" msgstr "Conservando Carpeta Build" -#: pisi/cli/__init__.py:79 +#: pisi/cli/__init__.py:76 msgid "Warning: " msgstr "Alerta:" -#: pisi/cli/__init__.py:88 +#: pisi/cli/__init__.py:85 msgid "Error: " msgstr "Error: " # is this to translate ? would it work if i change this ? -#: pisi/cli/__init__.py:120 +#: pisi/cli/__init__.py:117 msgid " (yes/no)" msgstr " (yes/no)" -#: pisi/cli/__init__.py:141 +#: pisi/cli/__init__.py:138 msgid " [complete]\n" msgstr " [complete]\n" -#: pisi/cli/__init__.py:151 +#: pisi/cli/__init__.py:148 msgid "Installed %s" msgstr "Instalado %s" -#: pisi/cli/__init__.py:153 +#: pisi/cli/__init__.py:150 msgid "Removed %s" msgstr "Removido %s" -#: pisi/cli/__init__.py:155 +#: pisi/cli/__init__.py:152 msgid "Upgraded %s" msgstr "Actualizado %s" -#: pisi/cli/__init__.py:157 +#: pisi/cli/__init__.py:154 msgid "Configured %s" msgstr "Configurado %s" -#: pisi/cli/__init__.py:159 +#: pisi/cli/__init__.py:156 msgid "Extracting the files of %s" msgstr "Extrayendo los archivos de %s" -#: pisi/cli/commands.py:94 +#: pisi/cli/commands.py:92 msgid "generic help string for any command" msgstr "cadena de ayuda genérica para cualquier comando" -#: pisi/cli/commands.py:123 pisi/cli/pisicli.py:104 +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 msgid "Unrecognized command: %s" msgstr "Comando desconocido: %s" -#: pisi/cli/commands.py:145 +#: pisi/cli/commands.py:143 msgid "common options" msgstr "opciones comúnes" -#: pisi/cli/commands.py:148 +#: pisi/cli/commands.py:146 msgid "general options" msgstr "opciones generales" # "Change" is meant to be imperative ? like "please do.." ? (or is it like "The change") -#: pisi/cli/commands.py:151 +# como entender "root" ?? +#: pisi/cli/commands.py:149 msgid "Change the system root for PiSi commands" -msgstr "Cambie el root del sistema para los comandos PiSi" +msgstr "Cambiar la raíz del sistema para los comandos PiSi" -#: pisi/cli/commands.py:153 +#: pisi/cli/commands.py:151 msgid "Assume yes in all yes/no queries" -msgstr "Asumir yes(si) en todas consultas yes/no" +msgstr "Asumir Sí (yes) en todas las consultas Sí/No (yes/no)" + +#: pisi/cli/commands.py:156 +msgid "Detailed output" +msgstr "Detalles" #: pisi/cli/commands.py:158 -msgid "Detailed output" -msgstr "Salida detallada" - -#: pisi/cli/commands.py:160 msgid "Show debugging information" msgstr "Mostrar información de depuración" -#: pisi/cli/commands.py:162 +#: pisi/cli/commands.py:160 msgid "Suppresses all coloring of PiSi's output" -msgstr "No colorear mensajes salidas de PiSi" +msgstr "No colorear mensajes de PiSi" # there must be a better choice for "fallback" (in spanish)..doesn't come to my mind right now -#: pisi/cli/commands.py:169 +# funcion auxiliar de reserva - funcion de respaldo +# entiendo: .. se va a llamar solamente si el modulo que lo llama no tiene su propia funcion "options" +#: pisi/cli/commands.py:167 msgid "" "This is a fall back function. If the implementer module provides an\n" " options function it will be called" msgstr "" -"Esto es una función auxiliar de reserva. Si el módulo que lo implemente " -"provee \n" -" una función options, lo va a llamar" +"Esto es una función de respaldo. Si el módulo que lo implemente provee \n" +" una función de opciones, lo va a llamar" -#: pisi/cli/commands.py:181 +#: pisi/cli/commands.py:179 msgid "Destination directory %s does not exist. Creating directory.\n" msgstr "Carpeta destino %s no existe. Creando carpeta.\n" -#: pisi/cli/commands.py:203 +#: pisi/cli/commands.py:201 msgid "Password: " msgstr "Contraseña: " -#: pisi/cli/commands.py:209 +#: pisi/cli/commands.py:207 msgid "initialize PiSi components" msgstr "inicializar componentes PiSi " -#: pisi/cli/commands.py:217 +#: pisi/cli/commands.py:215 msgid "do cleanup work for PiSi components" msgstr "hacer limpieza para los componentes PiSi" -#: pisi/cli/commands.py:231 +#: pisi/cli/commands.py:229 msgid "print help for the command" msgstr "imprimir ayuda para el comando" -#: pisi/cli/commands.py:237 +#: pisi/cli/commands.py:235 msgid "exit program" msgstr "salir del programa" -#: pisi/cli/commands.py:239 +#: pisi/cli/commands.py:237 msgid "Command terminated abnormally." msgstr "Comando terminado de manera anormal" -#: pisi/cli/commands.py:249 +#: pisi/cli/commands.py:247 msgid "Command lacks name" msgstr "Al comando le falta el nombre" -#: pisi/cli/commands.py:253 +#: pisi/cli/commands.py:251 msgid "Duplicate command %s" msgstr "Comando duplicado %s" -#: pisi/cli/commands.py:262 +#: pisi/cli/commands.py:260 msgid "" "Prints help for given commands\n" "\n" @@ -1264,13 +1296,13 @@ msgid "" "\n" "If run without parameters, it prints the general help." msgstr "" -"imprime ayuda para comando indicado\n" +"Imprime ayuda para comando determinado\n" "\n" "Uso: help [ ... ]\n" "\n" "Cuando se ejecuta sin parámetros imprime la ayuda general." -#: pisi/cli/commands.py:296 +#: pisi/cli/commands.py:294 msgid "" "Clean stale locks\n" "\n" @@ -1287,7 +1319,7 @@ msgstr "" "el acceso a base de datos.\n" "Este comando elimina archivos lock sin uso de la carpeta de la base de datos." -#: pisi/cli/commands.py:315 +#: pisi/cli/commands.py:313 msgid "" "Delete cache files\n" "\n" @@ -1305,7 +1337,7 @@ msgstr "" "guardanen la carpeta /var. Al acumularse pueden\n" "consumir un gran espacio en disco." -#: pisi/cli/commands.py:336 +#: pisi/cli/commands.py:334 msgid "" "Graph package relations\n" "\n" @@ -1322,50 +1354,51 @@ msgstr "" "\n" "Produce un gráfico de relaciones de paquetes, indicando dependencias\n" "y conflictos iniciando de un paquete dado. Por defecto\n" -"muestra las relaciones de paque tes entre los paquetes del repositorio y\n" -"escribe el paquete en formato graphviz a 'pgraph.dot'.\n" +"muestra las relaciones de paquetes entre los paquetes del repositorio y\n" +"guarda el paquete en formato graphviz en 'pgraph.dot'.\n" -#: pisi/cli/commands.py:353 +#: pisi/cli/commands.py:351 msgid "graph options" msgstr "opciones del gráfico" -#: pisi/cli/commands.py:357 +#: pisi/cli/commands.py:355 msgid "Specify a particular repository" msgstr "Especificar un repositorio determinado" -#: pisi/cli/commands.py:360 +#: pisi/cli/commands.py:358 msgid "Graph of installed packages" msgstr "Gráfico de paquetes instalados" -#: pisi/cli/commands.py:363 +#: pisi/cli/commands.py:361 msgid "Do not show installed packages" msgstr "No mostrar paquetes instalados" -#: pisi/cli/commands.py:366 +#: pisi/cli/commands.py:364 msgid "Dot output file" msgstr "Archivo salida Dot" -#: pisi/cli/commands.py:377 +#: pisi/cli/commands.py:375 msgid "Plotting packages in repository %s" msgstr "Ploteando paquetes de repositorio %s" -#: pisi/cli/commands.py:383 +#: pisi/cli/commands.py:381 msgid "Plotting a graph of relations among all repository packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" +msgstr "" +"Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" -#: pisi/cli/commands.py:390 +#: pisi/cli/commands.py:388 msgid "Plotting a graph of relations among all installed packages" msgstr "Ploteando un gráfico de relaciones entre todos los paquetes instalados" -#: pisi/cli/commands.py:402 +#: pisi/cli/commands.py:400 msgid "Do not take build no into account." -msgstr "No evaluar número de build." +msgstr "Ignorar número de build." -#: pisi/cli/commands.py:407 +#: pisi/cli/commands.py:405 msgid "Do not take dependency information into account" -msgstr "No evaluar información de dependencias" +msgstr "Ignorar información de dependencias" -#: pisi/cli/commands.py:411 +#: pisi/cli/commands.py:409 msgid "" "Build PiSi packages\n" "\n" @@ -1387,32 +1420,43 @@ msgstr "" "Como alternativa se puede indicar la ubicación de un paquete de fuentes,\n" " para descargarlo de un repositorio de fuentes.\n" -#: pisi/cli/commands.py:434 +#: pisi/cli/commands.py:432 msgid "build options" msgstr "opciones de build" -#: pisi/cli/commands.py:442 +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 msgid "Output directory for produced packages" msgstr "Carpeta de salida para paquetes producidos" -#: pisi/cli/commands.py:445 +# verificar, está bien asi ? "bypass" +#: pisi/cli/commands.py:443 msgid "Bypass errors from ActionsAPI" msgstr "Omitir errores del ActionsAPI" # check? -#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 +# tiene que ver con mensajes anteriores.. safety switch: xx.. (mensaje) +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 msgid "Bypass safety switch" msgstr "Omitir la verificación de seguridad" +# check? +# tiene que ver con mensajes anteriores.. safety switch: xx.. (mensaje) +#: pisi/cli/commands.py:447 +#, fuzzy +msgid "Bypass testing step" +msgstr "Omitir la verificación de seguridad" + #: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Crear un paquete estático con archivos ar" +# asi lo entiendo, favor verificar #: pisi/cli/commands.py:451 -msgid "Do not install build dependencies, fail if a build dependency is present" +msgid "" +"Do not install build dependencies, fail if a build dependency is present" msgstr "" -"No instalar dependencias build, error si una dependencia de build está " -"presente" +"No instalar dependencias de build, producir una falla si una dependencia de " +"build es necesaria" #: pisi/cli/commands.py:453 msgid "PiSi binary package formats: '1.0', '1.1' (default)" @@ -1443,27 +1487,50 @@ msgid "Break build after running compile step" msgstr "Interrumpir build luego de compilar" #: pisi/cli/commands.py:466 +#, fuzzy +msgid "Break build after running check step" +msgstr "Interrumpir build luego de compilar" + +#: pisi/cli/commands.py:468 msgid "Break build after running install step" msgstr "Interrumpir build luego de ejecutar install" -#: pisi/cli/commands.py:468 +#: pisi/cli/commands.py:470 msgid "create PiSi package" msgstr "crear paquete PiSi" -#: pisi/cli/commands.py:482 +#: pisi/cli/commands.py:484 msgid "package_format must be one of %s " msgstr "package_format debe ser uno de %s " -#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 msgid "Output directory: %s" msgstr "Carpeta de salida: %s" # sense is "current directory" i think ? -#: pisi/cli/commands.py:487 +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 msgid "Outputting packages in the working directory." msgstr "Guardando paquetes en la carpeta actual." -#: pisi/cli/commands.py:498 +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +#, fuzzy +msgid "delta options" +msgstr "opciones de indexar" + +#: pisi/cli/commands.py:549 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1484,35 +1551,36 @@ msgstr "" "Tambien se puede dar el nombre de un componente.\n" # no idea, i should know the context :( -#: pisi/cli/commands.py:517 +#: pisi/cli/commands.py:568 msgid "emerge options" msgstr "Opciones emerge" -#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 msgid "Ignore file conflicts" msgstr "Ignorar conflictos de archivos" -#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 msgid "Ignore package conflicts" msgstr "Ignorar confllictos de paquetes" -#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 msgid "Bypass comar configuration agent" msgstr "Omitir al agente de configuración comar" -#: pisi/cli/commands.py:536 +#: pisi/cli/commands.py:587 msgid "Outputting binary packages in the package cache." msgstr "Guardando paquetes binarios en el cache de paquetes." -#: pisi/cli/commands.py:544 +#: pisi/cli/commands.py:595 msgid "Abstract package operation command" msgstr "Comando de operación de paquete abstracto" -#: pisi/cli/commands.py:557 +#: pisi/cli/commands.py:608 msgid "Do not perform any action, just show what would be done" msgstr "No hacer nada, solamente mostrar lo que se haría" -#: pisi/cli/commands.py:568 +# espero que la idea está bien asi "expanded" +#: pisi/cli/commands.py:619 msgid "" "Install PiSi packages\n" "\n" @@ -1529,32 +1597,31 @@ msgstr "" "Uso: install ... \n" "\n" "Se puede usar nombres de archivos, URI's o nombres de paquetes para los " -"paquetes. Se\n" +"paquetes. Si\n" "se especifíca un nombre de paquete, éste debería existir en un repositorio " "especificado.\n" "\n" -"Tambien se puede indicar componentes en vez de nombres de paquetes, los que " -"se\n" -"completerán a nombres de paquetes.\n" +"Tambien se pueden indicar componentes en vez de nombres de paquetes, que se\n" +"completarán a nombres de paquetes.\n" -#: pisi/cli/commands.py:586 +#: pisi/cli/commands.py:637 msgid "install options" msgstr "Opciones de instalación" -#: pisi/cli/commands.py:591 +#: pisi/cli/commands.py:642 msgid "Reinstall already installed packages" msgstr "Reinstalar paquetes ya instalados" # check here: should be the idea be here - "dependent" (instead of "recursive")? -#: pisi/cli/commands.py:597 +#: pisi/cli/commands.py:648 msgid "Install component's and recursive components' packages" -msgstr "Instalar paquetes de componente y de componentes recursivos" +msgstr "Instalar paquetes de componente y de componentes relacionados" -#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 msgid "Fetch upgrades but do not install." msgstr "Descargar actualizaciones pero no instalar" -#: pisi/cli/commands.py:622 +#: pisi/cli/commands.py:677 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1579,45 +1646,44 @@ msgstr "" "\n" ": nombre de paquete\n" "\n" -"Actualiza el sistema entero si no se indica un nombre de paquete\n" +"Actualiza el sistema entero si no se indica el nombre de un paquete\n" "\n" "Se puede usar solamente nombres de paquetes para especificar paquetes\n" -"porque la operación de actualizacióno de paquetes solo está definido con \n" +"porque la operación de actualización de paquetes solo está definida con \n" "respecto a repositorios. Para el nombre especificado debe existir\n" -"el paquete correspondiente en los repositorios de paquetes. Si quiere " -"solamente\n" +"el paquete correspondiente en los repositorios. Si quiere solamente\n" " reinstalar un paquete de un archivo PiSi file, use el comando install.\n" "\n" -"Tambien se puede especificar componentes en vez de nombres de paquetes, lo " +"Tambien se pueden especificar componentes en vez de nombres de paquetes, " "que \n" "se autocompletará a nombres de paquetes.\n" -#: pisi/cli/commands.py:648 +#: pisi/cli/commands.py:703 msgid "upgrade options" msgstr "opciones de actualización" -#: pisi/cli/commands.py:653 +#: pisi/cli/commands.py:708 msgid "Security related package upgrades only" msgstr "Solamente actualizaciones de seguridad" -#: pisi/cli/commands.py:655 +#: pisi/cli/commands.py:710 msgid "Do not update repositories" msgstr "No actualizar repositorios" -#: pisi/cli/commands.py:661 +#: pisi/cli/commands.py:716 msgid "Upgrade component's and recursive components' packages" -msgstr "Actualizar componentes y recursivamente paquetes de componentes" +msgstr "Actualizar componentes y recursivamente paquetes del componente" -#: pisi/cli/commands.py:665 +#: pisi/cli/commands.py:720 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." msgstr "" "Ignorar paquetes y componentes para la actualización, cuyo nombre base " -"coincide con patrón." +"coincide con el patrón." # translated as if "..whose basenames contain the pattern string" -#: pisi/cli/commands.py:667 +#: pisi/cli/commands.py:722 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1625,15 +1691,15 @@ msgstr "" "Ignorar paquetes y componentes para la actualización, cuyo nombre base " "contiene el patrón." -#: pisi/cli/commands.py:707 +#: pisi/cli/commands.py:766 msgid "Updating repositories" msgstr "Actualizando repositorios" -#: pisi/cli/commands.py:712 +#: pisi/cli/commands.py:771 msgid "Will not update repositories" -msgstr "No se actuallizarán los repositorios" +msgstr "No se actualizarán los repositorios" -#: pisi/cli/commands.py:734 +#: pisi/cli/commands.py:796 msgid "" "Remove PiSi packages\n" "\n" @@ -1644,7 +1710,7 @@ msgid "" "You can also specify components instead of package names, which will be\n" "expanded to package names.\n" msgstr "" -"Removee paquetes PiSi \n" +"Remover paquetes PiSi \n" "\n" "Uso: remove ... \n" "\n" @@ -1655,15 +1721,15 @@ msgstr "" "que \n" "se autocompletará a nombres de paquetes.\n" -#: pisi/cli/commands.py:751 +#: pisi/cli/commands.py:813 msgid "remove options" msgstr "opciones de remover" -#: pisi/cli/commands.py:754 +#: pisi/cli/commands.py:816 msgid "Remove component's and recursive components' packages" -msgstr "Remover paquetes del componente y recursivamente de los subcomponentes" +msgstr "Remover paquetes del componente y de componentes relacionados" -#: pisi/cli/commands.py:776 +#: pisi/cli/commands.py:838 msgid "" "Configure pending packages\n" "\n" @@ -1675,15 +1741,15 @@ msgstr "" "Configurar paquetes pendientes\n" "\n" "Si la configuración de COMAR de algunos paquetes no se \n" -"realizaron durante la instalación, se les agrega a una lista\n" +"realizó durante la instalación, se les agrega a una lista\n" "de paquetes pendientes a configurar. Este comando \n" "configura los paquetes en esta situación.\n" -#: pisi/cli/commands.py:792 +#: pisi/cli/commands.py:854 msgid "configure-pending options" msgstr "Opciones de configuración de pendientes" -#: pisi/cli/commands.py:804 +#: pisi/cli/commands.py:866 msgid "" "Display package information\n" "\n" @@ -1695,67 +1761,67 @@ msgstr "" "\n" "Uso: info ... \n" "\n" -" puede ser nombre de paquete o un archivo .pisi,\n" +" puede ser nombre de un paquete o de un archivo .pisi,\n" -#: pisi/cli/commands.py:819 +#: pisi/cli/commands.py:881 msgid "info options" msgstr "opciones de info" -#: pisi/cli/commands.py:826 +#: pisi/cli/commands.py:888 msgid "Show a list of package files." msgstr "Mostrar lista de archivos de paquetes" -# my translation of "the current component", is it ok ? -#: pisi/cli/commands.py:828 +#: pisi/cli/commands.py:890 msgid "Info about the given component" -msgstr "Infos sobre el componente actual" +msgstr "Infos acerca del componente" -#: pisi/cli/commands.py:831 +#: pisi/cli/commands.py:893 msgid "Show only paths." msgstr "Mostrar solamente rutas" -#: pisi/cli/commands.py:833 +#: pisi/cli/commands.py:895 msgid "Do not show details" msgstr "No mostrar detalles" -#: pisi/cli/commands.py:835 +#: pisi/cli/commands.py:897 msgid "Output in xml format" msgstr "Salida en formato xml" -#: pisi/cli/commands.py:881 +#: pisi/cli/commands.py:943 msgid "Package file: %s" msgstr "Archivo de paquete: %s" -#: pisi/cli/commands.py:887 +#: pisi/cli/commands.py:949 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:889 +#: pisi/cli/commands.py:951 msgid "Installed package:" msgstr "Paquete instalado:" -#: pisi/cli/commands.py:895 +#: pisi/cli/commands.py:957 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:897 -msgid "Package found in repository:" +#: pisi/cli/commands.py:959 +#, fuzzy +msgid "Package found in %s repository:" msgstr "Paquete encontrado en repositorio:" -#: pisi/cli/commands.py:901 +#: pisi/cli/commands.py:963 msgid "%s is not found in repositories" msgstr "%s no encontrado en repositorios" -#: pisi/cli/commands.py:904 +#: pisi/cli/commands.py:966 msgid "%s is not installed" msgstr "%s no está instalado" # "Reverse" ne demek ? is this = undo ? -#: pisi/cli/commands.py:917 +#: pisi/cli/commands.py:979 msgid "Reverse Dependencies:" msgstr "Dependencias reversas:" -#: pisi/cli/commands.py:920 +#: pisi/cli/commands.py:982 msgid "" "\n" "Files:" @@ -1763,11 +1829,11 @@ msgstr "" "\n" "Archivos:" -#: pisi/cli/commands.py:928 +#: pisi/cli/commands.py:990 msgid "File information not available" msgstr "Información de archivo no disponible" -#: pisi/cli/commands.py:934 +#: pisi/cli/commands.py:996 msgid "" "Verify installation\n" "\n" @@ -1788,20 +1854,30 @@ msgstr "" ": nombre de paquete\n" "\n" "Para cada archivo se guarda un checksum criptográfico. El \n" -"comando Check usa los checksum para verificar la integridad de \n" +"comando check usa los checksum para verificar la integridad de \n" "un paquete. Simplemente hay que indicar los nombre de los paquetes.\n" "\n" "Sin nombre de paquete, el comando verifica todos los paquetes instalados.\n" -#: pisi/cli/commands.py:958 +#: pisi/cli/commands.py:1016 +#, fuzzy +msgid "check options" +msgstr "opciones de busqueda" + +#: pisi/cli/commands.py:1018 +#, fuzzy +msgid "Check installed packages under given component" +msgstr "Listar paquetes instalados de componente " + +#: pisi/cli/commands.py:1034 msgid "Checking all installed packages" msgstr "Verificando todos los paquetes instalados" -#: pisi/cli/commands.py:961 +#: pisi/cli/commands.py:1038 msgid "* Checking %s... " msgstr "* Verificando %s... " -#: pisi/cli/commands.py:965 +#: pisi/cli/commands.py:1042 msgid "" "\n" "Package %s is corrupt." @@ -1809,11 +1885,11 @@ msgstr "" "\n" "Paquete %s está corrupto." -#: pisi/cli/commands.py:969 +#: pisi/cli/commands.py:1046 msgid "Package %s not installed" msgstr "Paquete %s no está instalado" -#: pisi/cli/commands.py:974 +#: pisi/cli/commands.py:1051 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1832,7 +1908,7 @@ msgstr "" "Uso: index ...\n" "\n" "Este comando busca todos los archivos PiSi de una carpeta, collecciona sus\n" -"tags PiSi y junta la información en un archivo XML de salida,\n" +"tags PiSi y junta la información en un archivo XML de salida,\n" "que por defecto tiene el nombre 'pisi-index.xml'. El comando indexa\n" "tanto a paquetes fuente como a binarios.\n" "\n" @@ -1840,31 +1916,31 @@ msgstr "" "igual, pero\n" "se junta el resultado en un solo archivo del indexado.\n" -#: pisi/cli/commands.py:995 +#: pisi/cli/commands.py:1072 msgid "index options" msgstr "opciones de indexar" -#: pisi/cli/commands.py:999 +#: pisi/cli/commands.py:1076 msgid "Store absolute links for indexed files." msgstr "Guardar rutas absolutas para los archivos indexados." -#: pisi/cli/commands.py:1002 +#: pisi/cli/commands.py:1079 msgid "Index output file" msgstr "Archivo index de salida" -#: pisi/cli/commands.py:1005 +#: pisi/cli/commands.py:1082 msgid "Do not index PiSi spec files." -msgstr "No incluir archivos de spec PiSi" +msgstr "No indexar archivos tipo spec de PiSi" -#: pisi/cli/commands.py:1008 +#: pisi/cli/commands.py:1085 msgid "Do not sign index." -msgstr "No firmar index" +msgstr "No firmar index." -#: pisi/cli/commands.py:1021 +#: pisi/cli/commands.py:1098 msgid "Indexing current directory." -msgstr "Indexando carpeta actual" +msgstr "Indexando carpeta actual." -#: pisi/cli/commands.py:1029 +#: pisi/cli/commands.py:1106 msgid "" "Print the list of all installed packages\n" "\n" @@ -1874,30 +1950,32 @@ msgstr "" "\n" "Uso: list-installed\n" -#: pisi/cli/commands.py:1043 +#: pisi/cli/commands.py:1120 msgid "list-installed options" msgstr "opciones de list-installed" -#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 -#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 -#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 msgid "Show in long format" msgstr "Mostrar formato largo" -#: pisi/cli/commands.py:1048 +#: pisi/cli/commands.py:1125 msgid "List installed packages under given component" -msgstr "Listar paquetes instalados bajo componente dado" +msgstr "Listar paquetes instalados de componente " -#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 msgid "Show detailed install info" -msgstr "Mostrar información detallada de instalación" +msgstr "Mostrar detalles de instalación" # I suppose here the position is important too ! Should be the same ok as in english -#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 -msgid "Package Name |St| Version| Rel.| Build| Distro| Date" -msgstr "Nombre Paquete |St| Versión| Rel.| Build| Distro| Fecha" +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 +msgid "" +"Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "" +"Nombre Paquete |St| Versión| Rel.| Build| Distro| Fecha" -#: pisi/cli/commands.py:1082 +#: pisi/cli/commands.py:1159 msgid "" "Rebuild Databases\n" "\n" @@ -1917,19 +1995,19 @@ msgstr "" "Si se indican nombres de paquetes, deberían coincidir con \n" "carpetas de paquetes en /var/lib/pisi\n" -#: pisi/cli/commands.py:1100 +#: pisi/cli/commands.py:1177 msgid "rebuild-db options" msgstr "opciones rebuild-db" -#: pisi/cli/commands.py:1103 +#: pisi/cli/commands.py:1180 msgid "Rebuild files database" msgstr "Regenerar base de datos de archivos" -#: pisi/cli/commands.py:1114 +#: pisi/cli/commands.py:1191 msgid "Rebuild PiSi databases?" msgstr "Regenerar base de datos PiSi ?" -#: pisi/cli/commands.py:1121 +#: pisi/cli/commands.py:1198 msgid "" "Update repository databases\n" "\n" @@ -1949,15 +2027,15 @@ msgstr "" "Synchroniza la base de datos PiSi con el repositorio actual.\n" "Si no se indica un repositorio, se actualizan todos los repositorios.\n" -#: pisi/cli/commands.py:1139 +#: pisi/cli/commands.py:1216 msgid "update-repo options" msgstr "opciones update-repo" -#: pisi/cli/commands.py:1143 +#: pisi/cli/commands.py:1220 msgid "Update database in any case" msgstr "Actualizar la base de datos de todas formas" -#: pisi/cli/commands.py:1161 +#: pisi/cli/commands.py:1238 msgid "" "Add a repository\n" "\n" @@ -1971,35 +2049,36 @@ msgid "" "NB: We support only local files (e.g., /a/b/c) and http:// URIs at the " "moment\n" msgstr "" -"Agregar un preositorio\n" +"Agregar un repositorio\n" "\n" "Uso: add-repo \n" "\n" ": nombre de repositorio a agregar\n" ": URI de archivo indexador\n" "\n" -"Si no se indica repo, add-repo pardus-devel repo se agrega por defecto\n" +"Si no se indica repo, add-repo agrega por defect el repositorio pardus-" +"devel\n" "\n" "Obs.: Actualmente están soportados solamente archivos locales (ej., /a/b/c) " "y URIs http:// \n" -#: pisi/cli/commands.py:1181 +#: pisi/cli/commands.py:1258 msgid "add-repo options" msgstr "opciones add-repo" -#: pisi/cli/commands.py:1184 +#: pisi/cli/commands.py:1261 msgid "Add repository at given position (0 is first)" msgstr "Agregar repositorio en posicion indicada (inicia con 0)" -#: pisi/cli/commands.py:1198 +#: pisi/cli/commands.py:1275 msgid "Update PiSi database for repository %s?" msgstr "Actualizar base de datos PiSi para repositorio %s?" -#: pisi/cli/commands.py:1202 +#: pisi/cli/commands.py:1279 msgid "%s repository could not be reached. Removing %s from system." msgstr "Repositorio %s inaccesible. Removiendo %s del sistema." -#: pisi/cli/commands.py:1211 +#: pisi/cli/commands.py:1288 msgid "" "Remove repositories\n" "\n" @@ -2014,7 +2093,8 @@ msgstr "" "Remueve toda información de repositorio del sistema.\n" # i think translatioin ok, but maybe something nicer/better (in spanish) for "tracked" ? -#: pisi/cli/commands.py:1237 +# observar, vigilar, o simplemente: registrados, configurados .. ?? +#: pisi/cli/commands.py:1314 msgid "" "List repositories\n" "\n" @@ -2026,9 +2106,9 @@ msgstr "" "\n" "Uso: list-repo\n" "\n" -"Lista repositorios que están siendo observados actualmente.\n" +"Lista repositorios que están configurados actualmente.\n" -#: pisi/cli/commands.py:1260 +#: pisi/cli/commands.py:1337 msgid "" "List available packages in the repositories\n" "\n" @@ -2043,30 +2123,31 @@ msgstr "" "Uso: list-available [ ... repon ]\n" "\n" "Da una lista breve de los paquetes PiSi publicados en los\n" -"repositorios especificados. Sin especificar un repositorio, se listan\n" +"repositorios especificados. Si no se especifica un repositorio, se listan\n" "los paquetes de todos los repositorios.\n" -#: pisi/cli/commands.py:1277 +#: pisi/cli/commands.py:1354 msgid "list-available options" msgstr "opciones list-available" -#: pisi/cli/commands.py:1281 +# o traducir "con" ? +#: pisi/cli/commands.py:1358 msgid "List available packages under given component" -msgstr "Listar paquetes disponibles bajo un componente dado" +msgstr "Listar paquetes disponibles de un componente dado" -#: pisi/cli/commands.py:1283 +#: pisi/cli/commands.py:1360 msgid "Show uninstalled packages only" msgstr "Solo muestra paquetes desinstalados" -#: pisi/cli/commands.py:1291 +#: pisi/cli/commands.py:1368 msgid "Installed packages are shown in this color" msgstr "Paquetes instalados se muestran en este color" -#: pisi/cli/commands.py:1299 +#: pisi/cli/commands.py:1376 msgid "Repository : %s\n" msgstr "Repositorio : %s\n" -#: pisi/cli/commands.py:1326 +#: pisi/cli/commands.py:1403 msgid "" "List available components\n" "\n" @@ -2082,11 +2163,11 @@ msgstr "" "Da una lista breve de componentes PiSi publicados en los\n" "repositorios.\n" -#: pisi/cli/commands.py:1341 +#: pisi/cli/commands.py:1418 msgid "list-components options" msgstr "opciones list-components" -#: pisi/cli/commands.py:1366 +#: pisi/cli/commands.py:1443 msgid "" "List available sources\n" "\n" @@ -2100,11 +2181,11 @@ msgstr "" "\n" "Da una lista breve de los fuentes publicados en los repositories.\n" -#: pisi/cli/commands.py:1380 +#: pisi/cli/commands.py:1457 msgid "list-sources options" msgstr "opciones list-sources" -#: pisi/cli/commands.py:1405 +#: pisi/cli/commands.py:1482 msgid "" "List packages to be upgraded\n" "\n" @@ -2112,39 +2193,39 @@ msgid "" "\n" "Lists the packages that will be upgraded.\n" msgstr "" -"Lista paquetes a actualizar\n" +"Listar paquetes a actualizar\n" "\n" "Uso: list-upgrades\n" "\n" "Lista los paquetes que se actualizarán.\n" -#: pisi/cli/commands.py:1419 +#: pisi/cli/commands.py:1496 msgid "list-upgrades options" -msgstr "opcioens list-upgrades" +msgstr "opciones list-upgrades" -#: pisi/cli/commands.py:1424 +#: pisi/cli/commands.py:1501 msgid "List upgradable packages under given component" -msgstr "Lista paquetes actualizables bajo un componente dado" +msgstr "Lista de paquetes actualizables de un componente dado" -#: pisi/cli/commands.py:1441 pisi/operations.py:466 +#: pisi/cli/commands.py:1518 pisi/operations.py:460 msgid "No packages to upgrade." msgstr "No hay paquetes para actualizar" -#: pisi/cli/commands.py:1461 +#: pisi/cli/commands.py:1538 msgid "" "List pending packages\n" "\n" "Lists packages waiting to be configured.\n" msgstr "" -"Lista de paquetes pendientes\n" +"Listar paquetes pendientes\n" "\n" -"Lista paquetes esperando la configuración.\n" +"Lista paquetes pendientes a configurar.\n" -#: pisi/cli/commands.py:1483 +#: pisi/cli/commands.py:1560 msgid "There are no packages waiting to be configured" -msgstr "No hay paquetes esperando la configuración" +msgstr "No hay paquetes pendientes para configurar" -#: pisi/cli/commands.py:1488 +#: pisi/cli/commands.py:1565 msgid "" "Search packages\n" "\n" @@ -2160,23 +2241,19 @@ msgstr "" "Busca paquetes con un patrón de búsqueda en\n" "campos de resumen, descripción y nombre de paquete.\n" -#: pisi/cli/commands.py:1503 +#: pisi/cli/commands.py:1580 msgid "search options" msgstr "opciones de busqueda" -#: pisi/cli/commands.py:1506 -msgid "Set search language" -msgstr "Establecer idioma de búsqueda" - -#: pisi/cli/commands.py:1511 +#: pisi/cli/commands.py:1586 msgid "Show details" msgstr "Mostrar detalles" -#: pisi/cli/commands.py:1523 +#: pisi/cli/commands.py:1598 msgid "%s packages found" msgstr "%s paquetes encontrados" -#: pisi/cli/commands.py:1532 +#: pisi/cli/commands.py:1607 msgid "" "Search for a file\n" "\n" @@ -2190,36 +2267,36 @@ msgstr "" "\n" "Busca el paquete instalado que contiene el archivo indicado.\n" -#: pisi/cli/commands.py:1546 +#: pisi/cli/commands.py:1621 msgid "search-file options" msgstr "opciones search-file" -#: pisi/cli/commands.py:1550 +#: pisi/cli/commands.py:1625 msgid "Fuzzy search" msgstr "Búsqueda Fuzzy" -#: pisi/cli/commands.py:1552 +#: pisi/cli/commands.py:1627 msgid "Show only package name" msgstr "Mostrar solamente nombre de paquete" # i put in spanish "contains" instead of "has", ok ? -#: pisi/cli/commands.py:1573 +#: pisi/cli/commands.py:1648 msgid "Package %s has file %s" msgstr "Paquete %s contiene archivo %s" -#: pisi/cli/commands.py:1575 +#: pisi/cli/commands.py:1650 msgid "Type: %s, Hash: %s" msgstr "Tipo: %s, Hash: %s" -#: pisi/cli/commands.py:1578 +#: pisi/cli/commands.py:1653 msgid "Path '%s' does not belong to an installed package" -msgstr "Ruta '%s' no perteneca a un paquete instalado" +msgstr "Ruta '%s' no pertenece a un paquete instalado" -#: pisi/cli/commands.py:1591 +#: pisi/cli/commands.py:1666 msgid "Searching for %s" msgstr "Buscando %s" -#: pisi/cli/commands.py:1601 +#: pisi/cli/commands.py:1676 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2231,7 +2308,7 @@ msgstr "" "donde es uno de:\n" "\n" -#: pisi/cli/commands.py:1607 +#: pisi/cli/commands.py:1682 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2241,7 +2318,7 @@ msgstr "" #: pisi/cli/pisicli.py:56 msgid "Options must precede non-option arguments" -msgstr "Opciones deben ir antes de los otros argumentos" +msgstr "Se debe indicar opciones delante de otros argumentos" #: pisi/cli/pisicli.py:97 msgid "No command given" @@ -2250,7 +2327,7 @@ msgstr "No se dió ningún comando" # is my idea of "parsing" in spanish correct - or acceptable ? #: pisi/cli/pisicli.py:100 msgid "Command line parsing error" -msgstr "Error de sintax de comando" +msgstr "Error de sintaxis de comando" #: pisi/comariface.py:54 msgid "cannot connect to comar" @@ -2274,7 +2351,7 @@ msgstr "Error de script: %s" #: pisi/comariface.py:94 msgid "comar denied our access" -msgstr "comar denegó el acceso" +msgstr "acceso denegado por comar" #: pisi/comariface.py:99 msgid "Configuring %s package" @@ -2302,35 +2379,35 @@ msgstr "Ejecutando script previo de remover paquete" #: pisi/comariface.py:129 msgid "Calling pre remove handlers" -msgstr "Llamando actuadores antes de remover" +msgstr "Llamando actuadores previos de remover" #: pisi/comariface.py:133 msgid "Unregistering comar scripts" msgstr "Eliminando scripts comar del registro" -#: pisi/component.py:106 pisi/component.py:112 +#: pisi/component.py:105 pisi/component.py:111 msgid "Component %s not found" msgstr "Componente %s no encontrado" -#: pisi/component.py:208 pisi/component.py:234 +#: pisi/component.py:207 pisi/component.py:233 msgid "Information for component %s not available" msgstr "Información para componente %s no disponible" -#: pisi/config.py:61 +#: pisi/config.py:60 msgid "Destination directory %s does not exist. Creating it." msgstr "Carpeta destino %s no existe. Creando ahora." -#: pisi/configfile.py:105 +#: pisi/configfile.py:107 msgid "No section by name '%s'" -msgstr "No sección con nombre '%s'" +msgstr "No hay sección con nombre '%s'" #: pisi/conflict.py:39 pisi/dependency.py:40 msgid " version >= " -msgstr " version >= " +msgstr " versión >= " #: pisi/conflict.py:41 pisi/dependency.py:42 msgid " version <= " -msgstr " version <= " +msgstr " versión <= " #: pisi/conflict.py:43 pisi/dependency.py:44 msgid " version " @@ -2348,6 +2425,7 @@ msgstr " release <= " msgid " release " msgstr " release " +# rebind en español ?? #: pisi/constants.py:30 msgid "Can't rebind constant: %s" msgstr "No posible rebind constant: %s" @@ -2356,6 +2434,17 @@ msgstr "No posible rebind constant: %s" msgid "Can't unbind constant: %s" msgstr "No posible unbind constant: %s" +#: pisi/delta.py:27 +#, fuzzy +msgid "Cannot create delta for same package!" +msgstr "No posible crear la carpeta %s" + +#: pisi/delta.py:41 +#, fuzzy +msgid "Creating delta PiSi package between %s %s" +msgstr "Creando Paquete PiSi %s." + +# satisfy - a traducir con "cumplir" ? como suena ? #: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "Dependencia %s de paquete %s no está satisfecha" @@ -2370,47 +2459,48 @@ msgstr "Error de nombre de archivo" #: pisi/fetcher.py:84 msgid "Access denied to write to destination directory: \"%s\"" -msgstr "Acceso de escritura denegado para carpeta: \"%s\"" +msgstr "Acceso denegado para escritura en carpeta de destino: \"%s\"" #: pisi/fetcher.py:89 msgid "Access denied to destination file: \"%s\"" msgstr "Acceso denegado a archivo de destino: \"%s\"" #: pisi/fetcher.py:100 -msgid "A problem occured. Please check the archive address and/or permissions again." +msgid "" +"A problem occured. Please check the archive address and/or permissions again." msgstr "" -"Ocurrió un problema. Favor verifique otra vez la ubicación y/o los permisos " -"del paquete." +"Ocurrió un problema. Favor verifique la ubicación y/o los permisos del " +"paquete." #: pisi/fetcher.py:158 msgid "No such file or no permission to read" -msgstr "No existe el archivo o no hay permisos de lectura" +msgstr "No existe el archivo o no hay permiso de lectura" -#: pisi/fetcher.py:183 +#: pisi/fetcher.py:182 msgid "Requested range not satisfiable, starting again." msgstr "Rango solicitado no posible satisfacer, iniciando otra vez." -#: pisi/fetcher.py:190 +#: pisi/fetcher.py:189 msgid "Cannot fetch %s; value error: %s" -msgstr "Imposible traer %s; valor de error: %s" +msgstr "Imposible descargar %s; valor de error: %s" -#: pisi/fetcher.py:192 pisi/fetcher.py:196 +#: pisi/fetcher.py:191 pisi/fetcher.py:195 msgid "Cannot fetch %s; %s" -msgstr "No posible traer %s; %s" +msgstr "No posible descargar %s; %s" -#: pisi/fetcher.py:194 +#: pisi/fetcher.py:193 msgid "Please check your network connections and try again. (%s)" msgstr "Favor verifique su conexión de red y luego intente de nuevo. (%s)" -#: pisi/fetcher.py:198 +#: pisi/fetcher.py:197 msgid "Cannot fetch %s; (%s): %s" -msgstr "No posible traer %s; (%s): %s" +msgstr "No posible descargar %s; (%s): %s" -#: pisi/fetcher.py:244 +#: pisi/fetcher.py:243 msgid "Proxy configuration has been found for '%s' protocol" msgstr "Configuración de proxy se detectó para protocolo '%s' " -#: pisi/fetcher.py:328 pisi/fetcher.py:349 pisi/fetcher.py:362 +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 msgid "ftp error" msgstr "error ftp" @@ -2420,15 +2510,16 @@ msgstr "uri debe ser de tipo URI o string" #: pisi/file.py:89 msgid "zip compression not supported yet" -msgstr "compresión zip todavía no soportado" +msgstr "compresión zip actualmente no soportada" +# reemplazar traer por - descargar ?? #: pisi/file.py:117 msgid "Fetching %s" -msgstr "Trayendo %s" +msgstr "Descargando %s" #: pisi/file.py:122 msgid "Copying %s to transfer dir" -msgstr "Copiando %s a carpeta de transfer" +msgstr "Copiando %s a carpeta de transferencia" #: pisi/file.py:127 msgid "File '%s' not found." @@ -2448,7 +2539,7 @@ msgstr "Escritura remota no implementado" #: pisi/file.py:187 msgid "gzip compression not supported yet" -msgstr "compresión gzip todavía no soportado" +msgstr "compresión gzip actualmente no soportado" #: pisi/file.py:202 pisi/file.py:205 msgid "ERROR: gpg --detach-sig %s failed" @@ -2456,47 +2547,47 @@ msgstr "ERROR: gpg --detach-sig %s falló" #: pisi/graph.py:31 msgid "Encountered cycle %s" -msgstr "Encontrado cycle %s" +msgstr "Encontrado ciclo (cycle) %s" -#: pisi/index.py:96 +#: pisi/index.py:100 msgid "Adding %s to component index" msgstr "Agregando %s a index de componentes" -#: pisi/index.py:108 +#: pisi/index.py:112 msgid "Adding %s to package index" msgstr "Agregando %s al index de paquetes" -#: pisi/index.py:122 +#: pisi/index.py:126 msgid "Updating package database of %s" -msgstr "Actualizando base de datos de paquetes %s" +msgstr "Actualizando base de datos de paquetes de %s" -#: pisi/index.py:150 +#: pisi/index.py:154 msgid "Package %s: metadata corrupt, skipping..." msgstr "Metadata de paquete %s: corrupto, omitiendo..." # here "source" means - like source code ? (not "base".. ) -#: pisi/index.py:178 +#: pisi/index.py:193 msgid "Adding %s to source index" msgstr "Agregando %s a index de fuentes" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed" msgstr "instalado" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed-pending" msgstr "installed-pending" # ok ? -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "purged" msgstr "limpiado" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "removed" msgstr "removido" -#: pisi/installdb.py:62 +#: pisi/installdb.py:59 msgid "" "State: %s\n" "Version: %s, Release: %s, Build: %s\n" @@ -2504,11 +2595,11 @@ msgstr "" "Estado: %s\n" "Versión: %s, Release: %s, Build: %s\n" -#: pisi/installdb.py:67 +#: pisi/installdb.py:64 msgid "Distribution: %s, Install Time: %s\n" msgstr "Distribución: %s, Tiempo de Instalación: %s\n" -#: pisi/installdb.py:154 +#: pisi/installdb.py:151 msgid "Already installed" msgstr "Ya instalado" @@ -2524,39 +2615,40 @@ msgstr "Clave %s no encontrado" msgid "Key %s in repo %s not found" msgstr "Clave %s no encontrado en repositorio %s " -#: pisi/lockeddbshelve.py:47 +#: pisi/lockeddbshelve.py:46 msgid "Database version for %s insufficient. Please run rebuild-db command." msgstr "" "Versión de base de datos %s insuficiente. Favor ejecute el comando rebuild-" "db." -#: pisi/lockeddbshelve.py:51 -msgid "Database version for %s greater than PiSi version. You need a newer PiSi." +#: pisi/lockeddbshelve.py:50 +msgid "" +"Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" -"Versión de base de datos %s mayor que versión de PiSi. Necesitas una versión " +"Versión de base de datos %s mayor que versión de PiSi. Necesita una versión " "PiSi más nueva." -#: pisi/lockeddbshelve.py:62 +#: pisi/lockeddbshelve.py:61 msgid "Cannot attain write access to database environment" msgstr "No posible acceder base de datos para escritura" -#: pisi/lockeddbshelve.py:64 +#: pisi/lockeddbshelve.py:63 msgid "Database version %s not present." msgstr "Versión de base de datos %s no disponible." -#: pisi/lockeddbshelve.py:71 pisi/lockeddbshelve.py:153 +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 msgid "" "Another instance of PiSi is running. Only one instance is allowed to modify " "the PiSi database at a time." msgstr "" -"Otra instancia de PiSi está ejecutandose en este momento. Solamente una de " -"las instancias puede modificar la base de datos de PiSi." +"Otra instancia de PiSi se está ejecutando en este momento. Solamente una de " +"las instancias puede realizar modificaciones en la base de datos de PiSi." -#: pisi/lockeddbshelve.py:81 +#: pisi/lockeddbshelve.py:80 msgid "Cannot attain read access to database environment" msgstr "No posible acceder base de datos para lectura" -#: pisi/lockeddbshelve.py:95 +#: pisi/lockeddbshelve.py:94 msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." @@ -2564,34 +2656,36 @@ msgstr "" "No posible escribir en base de datos PiSi. Debe ejecutar esta operación como " "usuario root." -#: pisi/lockeddbshelve.py:113 +#: pisi/lockeddbshelve.py:112 msgid "Cannot attain read or write access to database %s" msgstr "No posible acceder a base de datos %s para lectura o escritura" -#: pisi/lockeddbshelve.py:139 -msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +#: pisi/lockeddbshelve.py:138 +msgid "" +"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Banderas deberían ser uno de 'r', 'w', 'c' or 'n' o use las banderas bsddb." "db.DB_* " -#: pisi/metadata.py:58 +#: pisi/metadata.py:74 msgid "Distribution: %s, Dist. Release: %s\n" msgstr "Distribución: %s, Dist. Release: %s\n" -#: pisi/metadata.py:60 +#: pisi/metadata.py:76 msgid "Architecture: %s, Installed Size: %s" msgstr "Arquitectura: %s, Tamaño Instalado: %s" # "mirrors" should be better (in spanish).. #: pisi/mirrors.py:46 msgid "Mirrors file %s does not exist. Could not resolve mirrors://" -msgstr "Archivo mirror %s no existe. No posible resolver mirrors://" +msgstr "Archivo %s no existe en mirror. No posible resolver mirrors://" -#: pisi/operations.py:114 +#: pisi/operations.py:107 msgid "Mixing file names and package names not supported yet." -msgstr "Mezclando nombres de archivos y nombres de paquetes todavía no soportado." +msgstr "" +"Mezclando nombres de archivos y nombres de paquetes actualmente no soportado." -#: pisi/operations.py:156 +#: pisi/operations.py:149 msgid "" "The following packages will be installed\n" "in the respective order to satisfy extra dependencies:\n" @@ -2599,36 +2693,36 @@ msgstr "" "Se instalarán los siguientes paquetes\n" "en el orden respectivo para satisfacer las dependencias adicionales:\n" -#: pisi/operations.py:159 pisi/operations.py:621 +#: pisi/operations.py:152 pisi/operations.py:615 msgid "Do you want to continue?" -msgstr "Quiere continuar ?" +msgstr "Desea continuar ?" -#: pisi/operations.py:160 +#: pisi/operations.py:153 msgid "External dependencies not satisfied" msgstr "Dependencia externa no satisfecha" -#: pisi/operations.py:172 pisi/operations.py:339 +#: pisi/operations.py:165 pisi/operations.py:332 msgid "No packages to install." -msgstr "No hay paquetes a instalar." +msgstr "No hay paquetes para instalar." -#: pisi/operations.py:203 +#: pisi/operations.py:196 msgid "Installation order: " msgstr "Orden de instalación:" # might be slightly different. i should see the context -#: pisi/operations.py:257 pisi/operations.py:279 +#: pisi/operations.py:250 pisi/operations.py:272 msgid "Conflicts remain" msgstr "Conflictos quedan" -#: pisi/operations.py:267 +#: pisi/operations.py:260 msgid "Selected packages [%s] are in conflict with each other." -msgstr "Paquetes seleccionados [%s] están en conflicto entre sí." +msgstr "Paquetes seleccionados [%s] están en conflicto entre ellos." -#: pisi/operations.py:273 +#: pisi/operations.py:266 msgid "[%s conflicts with: %s]\n" -msgstr "[%s conflicta con: %s]\n" +msgstr "[%s en conflicto con: %s]\n" -#: pisi/operations.py:275 +#: pisi/operations.py:268 msgid "" "The following packages have conflicts:\n" "%s" @@ -2636,35 +2730,37 @@ msgstr "" "Los siguientes paquetes tienen conflictos:\n" "%s" -#: pisi/operations.py:278 +#: pisi/operations.py:271 msgid "Remove the following conflicting packages?" msgstr "Remover los siguientes paquetes conflictivos ?" # I don't know what to say for "Safety switch".. yet -#: pisi/operations.py:305 +#: pisi/operations.py:298 msgid "Safety switch: Following packages in system.base will be installed: " msgstr "" -"Verificación de seguridad: Se instalarán los siguientes paquetes en system." +"Verificación de seguridad: Se instalarán los siguientes paquetes en system." "base: " -#: pisi/operations.py:311 +#: pisi/operations.py:304 msgid "Safety switch: Following packages in system.base will be upgraded: " msgstr "" -"Verificación de seguridad: Se actualizarán los siguientes paquetes en " -"system.base: " +"Verificación de seguridad: Se actualizarán los siguientes paquetes en system." +"base: " # should this say in english ? "Safety switch: the component cannot be found in system.base" ?? (i did in spanish like this) -#: pisi/operations.py:317 pisi/operations.py:597 +#: pisi/operations.py:310 pisi/operations.py:591 msgid "Safety switch: the component system.base cannot be found" -msgstr "Verificación de seguridad: No posible encontrar el componente system.base: " +msgstr "" +"Verificación de seguridad: No posible encontrar el componente system.base: " -#: pisi/operations.py:334 +#: pisi/operations.py:327 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" -msgstr "Los siguientes paquetes ya están instalados y no se instalarán de nuevo:\n" +msgstr "" +"Los siguientes paquetes ya están instalados y no se instalarán de nuevo:\n" -#: pisi/operations.py:355 +#: pisi/operations.py:348 msgid "" "Following packages will be installed in the respective order to satisfy " "dependencies:\n" @@ -2672,85 +2768,86 @@ msgstr "" "Se instalarán los siguientes paquetes en el orden indicado para satisfacer " "las dependencias:\n" -#: pisi/operations.py:360 pisi/operations.py:491 +#: pisi/operations.py:353 pisi/operations.py:485 msgid "Total size of package(s): %.2f %s" msgstr "Tamaño total de paquete(s): %.2f %s" -#: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 msgid "There are extra packages due to dependencies. Do you want to continue?" -msgstr "Hay paquetes adicionales por motivo de dependencias. Quiere continuar ?" +msgstr "" +"Hay paquetes adicionales por motivo de dependencias. Quiere continuar ?" -#: pisi/operations.py:432 +#: pisi/operations.py:425 msgid "Warning: package *name* ends with '.pisi'" msgstr "Alerta: *name* de paquete termina con '.pisi'" -#: pisi/operations.py:435 +#: pisi/operations.py:428 msgid "Package %s is not installed." msgstr "Paquete %s no está instalado." -#: pisi/operations.py:441 +#: pisi/operations.py:434 msgid "Package %s is not available in repositories." msgstr "Paquete %s no está disponible en repositorios." -#: pisi/operations.py:453 +#: pisi/operations.py:447 msgid "Package %s is already at the latest release %s." msgstr "Paquete %s ya está con su ultima release %s." -#: pisi/operations.py:459 +#: pisi/operations.py:453 msgid "Package %s is already at the latest build %s." msgstr "Paquete %s ya está con su último build %s." -#: pisi/operations.py:486 +#: pisi/operations.py:480 msgid "The following packages will be upgraded: " msgstr "Se actualizarán los siguientes paquetes: " -#: pisi/operations.py:552 +#: pisi/operations.py:546 msgid "Dependency %s of %s cannot be satisfied" msgstr "Dependencia %s de %s no se puede satisfacer" -#: pisi/operations.py:553 +#: pisi/operations.py:547 msgid "Upgrade is not possible." msgstr "Actualización no posible." -#: pisi/operations.py:568 +#: pisi/operations.py:562 msgid "Reverse dependency %s of %s cannot be satisfied" -msgstr "Dependencia reversa %s de %s no puede ser satisfecha" +msgstr "No se puede satisfacer la dependencia %s de %s" -#: pisi/operations.py:593 +#: pisi/operations.py:587 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "" -"Verificación de seguridad: no posible remover los paquetes siguientes en " +"Verificación de seguridad: no posible remover los paquetes siguientes de " "system.base: " -#: pisi/operations.py:604 +#: pisi/operations.py:598 msgid "Package %s does not exist. Cannot remove." msgstr "Paquete %s no existe. No posible remover." -#: pisi/operations.py:608 +#: pisi/operations.py:602 msgid "No packages to remove." msgstr "No hay paquetes para remover." -#: pisi/operations.py:617 +#: pisi/operations.py:611 msgid "" "The following minimal list of packages will be removed\n" "in the respective order to satisfy dependencies:\n" msgstr "" -"La siguiente lista mínimal de paquetes se removerán\n" +"La siguiente lista mínima de paquetes se removerá\n" "en el orden indicado, para satisfacer las dependencias:\n" -#: pisi/operations.py:622 +#: pisi/operations.py:616 msgid "Package removal declined" -msgstr "Remover paquetes rechazado" +msgstr "Remover paquetes denegado" -#: pisi/operations.py:634 +#: pisi/operations.py:628 msgid "Package %s is not installed. Cannot remove." msgstr "Paquete %s no está instalado. No posible remover." -#: pisi/operations.py:683 +#: pisi/operations.py:677 msgid "No packages to emerge." -msgstr "No hay paquetes para emerge" +msgstr "No hay paquetes para emerge." -#: pisi/operations.py:698 +#: pisi/operations.py:692 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" @@ -2758,141 +2855,143 @@ msgstr "" "Se instalará la siguiente lista mínima de paquetes\n" "del repositorio en el orden indicado para satisfacer dependencias:\n" -#: pisi/operations.py:701 +#: pisi/operations.py:695 msgid "" "The following minimal list of packages will be built and\n" "installed in the respective order to satisfy dependencies:\n" msgstr "" -"La siguiente lista mínimal de paquetes se genererán e instalarán\n" +"La siguiente lista mínima de paquetes se generará e instalará\n" "en el orden indicado, para satisfacer las dependencias:\n" -#: pisi/operations.py:743 +#: pisi/operations.py:737 msgid "Cannot find source package: %s" -msgstr "No posible encontrar paquete de fuentes: %s" +msgstr "No se ha encontrado paquete fuente: %s" +# en realidad no lo entiendo.., supongo que debe haber un error en el texto en ingles (la ultima frase) #: pisi/package.py:56 msgid "" "There was a problem while fetching '%s'.\n" "The package may have been upgraded. Please try to upgrade the package." msgstr "" "Ocurrió un problema durante descarga de '%s'.\n" -"El paquete puede ya estar actualizado. Favor intente actualizar el paquete." +"El paquete puede ya estar actualizado. Por favor intente actualizar el " +"paquete." -#: pisi/package.py:60 pisi/sourcearchive.py:94 +#: pisi/package.py:60 pisi/sourcearchive.py:92 msgid "%s [cached]" msgstr "%s [cached]" -#: pisi/package.py:131 +#: pisi/package.py:136 msgid "MetaData format wrong" msgstr "Formato MetaData incorrecto" -#: pisi/packagedb.py:66 +#: pisi/packagedb.py:65 msgid "Package %s not found" msgstr "Paquete %s no encontrado" -#: pisi/pxml/autoxml.py:77 +#: pisi/pxml/autoxml.py:79 msgid "At least one '%s' tag should have local text" msgstr "Al menos un tag '%s' debería tener texto local" -#: pisi/pxml/autoxml.py:84 +#: pisi/pxml/autoxml.py:86 msgid "'%s' language of tag '%s' is empty" msgstr "Idioma '%s' de tag '%s' está vacío" -#: pisi/pxml/autoxml.py:112 +#: pisi/pxml/autoxml.py:114 msgid "LocalText: unable to get either current or default locale" msgstr "LocalText: no posible obtener locale actual o valor por defecto" -#: pisi/pxml/autoxml.py:118 pisi/pxml/autoxml.py:133 +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 msgid "" "Tag should have at least the current locale, or failing that an English or " "Turkish version" msgstr "" -"El Tag debería tener al menos un locale actual, o si falla esto, una versión " -"en inglés o turco" +"El tag debería tener al menos un locale actual, o al fallar, una versión en " +"inglés o turco" -#: pisi/pxml/autoxml.py:374 +#: pisi/pxml/autoxml.py:372 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' errores" -#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: Cadena '%s' tiene errores" -#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Archivo '%s' tiene errores" -#: pisi/pxml/autoxml.py:467 +#: pisi/pxml/autoxml.py:465 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: falló validación de objeto" -#: pisi/pxml/autoxml.py:475 +#: pisi/pxml/autoxml.py:473 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: codificación de archivo '%s' tiene errores" -#: pisi/pxml/autoxml.py:525 +#: pisi/pxml/autoxml.py:523 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: tipo de tag desconocido %s en spec" -#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 msgid "Mandatory variable %s not available" -msgstr "Variable obligatoria %s no disponible" +msgstr "Variable requerida %s no disponible" -#: pisi/pxml/autoxml.py:654 +#: pisi/pxml/autoxml.py:652 msgid "Type mismatch: read text cannot be decoded" msgstr "Error de tipo de datos: no posible decodificar cadena de entrada" # anything better for "token"? -#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 msgid "Mandatory token %s not available" -msgstr "Token obligatorio %s no disponible" +msgstr "Token requerido %s no disponible" -#: pisi/pxml/autoxml.py:672 +#: pisi/pxml/autoxml.py:670 msgid "Type mismatch. Expected %s, got %s" msgstr "Error de tipo de datos. Esperado %s, recibido %s" -#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 msgid "Type mismatch: DOM cannot be decoded" msgstr "Error de tipo de datos: no posible decodificar DOM " -#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 -#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 msgid "Mandatory argument not available" -msgstr "Argumento obligatorio no disponible" +msgstr "Argumento requerido no disponible" -#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 msgid "Object cannot be encoded" msgstr "No posible codificar objeto" -#: pisi/pxml/autoxml.py:743 +#: pisi/pxml/autoxml.py:741 msgid "List type must contain only one element" msgstr "Tipo de lista debe contener un solo elemento" -#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 msgid "Mandatory list \"%s\" under \"%s\" node is empty." -msgstr "Lista obligatoria \"%s\" bajo nodo \"%s\" está vacía." +msgstr "Lista requerida \"%s\" bajo nodo \"%s\" está vacía." #: pisi/pxml/xmlext.py:79 msgid "getNodeText: Expected text node, got something else!" msgstr "getNodeText: Esperado nodo de text, recibido algo diferente!" -#: pisi/pxml/xmlfile.py:64 +#: pisi/pxml/xmlfile.py:63 msgid "String '%s' has invalid XML" msgstr "Cadena '%s' contiene XML inválido" -#: pisi/pxml/xmlfile.py:72 pisi/pxml/xmlfile.py:87 +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 msgid "File '%s' has invalid XML" msgstr "Archivo '%s' contiene XML inválido" -#: pisi/repodb.py:74 +#: pisi/repodb.py:73 msgid "No repository named %s exists" msgstr "No existe repositorio con nombre %s" -#: pisi/repodb.py:83 +#: pisi/repodb.py:82 msgid "Repository %s already exists" msgstr "Repositorio %s ya existe" -#: pisi/repodb.py:90 +#: pisi/repodb.py:89 msgid "Cannot add repository at position %s" msgstr "No posible agregar repositorio en posición %s" @@ -2902,29 +3001,29 @@ msgstr "Paquete pisi: %s* no encontrado." #: pisi/scenarioapi/repoops.py:28 msgid "Repo already has package named %s." -msgstr "Repo ya incluye paquete de nombre %s." +msgstr "Repo ya contiene paquete con nombre %s." #: pisi/scenarioapi/repoops.py:52 pisi/scenarioapi/repoops.py:59 msgid "Repo does not have package named %s." msgstr "Repo no contiene paquete con nombre %s." -#: pisi/sourcearchive.py:63 +#: pisi/sourcearchive.py:61 msgid "Trying fallback address: %s" msgstr "Intentando dirección de respaldo: %s" -#: pisi/sourcearchive.py:74 +#: pisi/sourcearchive.py:72 msgid "%s mirrors are not defined." -msgstr "%s mirrors no están definidos." +msgstr "%s repositorios no están definidos." -#: pisi/sourcearchive.py:79 +#: pisi/sourcearchive.py:77 msgid "Fetching source from mirror: %s" -msgstr "Trayendo fuente de mirror: %s" +msgstr "Descargando fuente desde %s" -#: pisi/sourcearchive.py:85 +#: pisi/sourcearchive.py:83 msgid "Could not fetch source from %s mirrors." -msgstr "No posible traer fuentes de %s mirrors." +msgstr "No posible descargar fuentes desde %s." -#: pisi/sourcearchive.py:103 +#: pisi/sourcearchive.py:101 msgid "unpack: check_file_hash failed" msgstr "unpack: check_file_hash falló" @@ -2932,37 +3031,38 @@ msgstr "unpack: check_file_hash falló" msgid "Source package %s not found" msgstr "Paquete fuente %s no encontrado" -#: pisi/specfile.py:141 +#: pisi/specfile.py:140 msgid "URI: %s, type: %s, sha1sum: %s" msgstr "URI: %s, tipo: %s, sha1sum: %s" -#: pisi/specfile.py:208 +#: pisi/specfile.py:207 msgid "Name: %s, version: %s, release: %s, build %s\n" msgstr "Nombre: %s, version: %s, release: %s, build %s\n" -#: pisi/specfile.py:210 +#: pisi/specfile.py:209 msgid "Summary: %s\n" msgstr "Resumen: %s\n" -#: pisi/specfile.py:211 +#: pisi/specfile.py:210 msgid "Description: %s\n" msgstr "Descripción: %s\n" -#: pisi/specfile.py:212 +#: pisi/specfile.py:211 msgid "Component: %s\n" msgstr "Componente: %s\n" -#: pisi/specfile.py:213 +# o simplemente "contiene" ? +#: pisi/specfile.py:212 msgid "Provides: " msgstr "Provee: " -#: pisi/specfile.py:217 +#: pisi/specfile.py:216 msgid "Dependencies: " msgstr "Dependencias: " #: pisi/uri.py:80 msgid "setAuthInfo needs a tuple (user, pass)" -msgstr "setAuthInfo requiere un tuple (user, pass)" +msgstr "setAuthInfo requiere un par (usuario,clave)" #: pisi/util.py:122 pisi/util.py:143 msgid "Running " @@ -2972,43 +3072,43 @@ msgstr "Ejecutando" msgid "return value for \"%s\" is %s" msgstr "valor devuelto de \"%s\" es %s" -#: pisi/util.py:364 +#: pisi/util.py:361 msgid "Including external link '%s'" msgstr "Incluyendo link externo '%s'" -#: pisi/util.py:366 +#: pisi/util.py:363 msgid "Including directory '%s'" msgstr "Incluyendo carpeta '%s'" -#: pisi/util.py:440 +#: pisi/util.py:448 msgid "I/O Error: Cannot calculate SHA1 hash of %s" msgstr "I/O Error: No posible calcular hash SHA1 de %s" -#: pisi/util.py:451 +#: pisi/util.py:459 msgid "Cannot calculate SHA1 hash of given data" -msgstr "No posible calculaar hash SHA1 de datos presentes" +msgstr "No posible calcular hash SHA1 de datos indicados" -#: pisi/util.py:488 +#: pisi/util.py:498 msgid "ERROR: patch (%s) failed" msgstr "ERROR: parche (%s) falló" -#: pisi/util.py:490 +#: pisi/util.py:500 msgid "ERROR: patch (%s) failed: %s" msgstr "ERROR: parche (%s) falló: %s" -#: pisi/util.py:536 +#: pisi/util.py:546 msgid "strip command failed for file '%s'!" msgstr "comando strip falló para archivo '%s'!" -#: pisi/util.py:543 +#: pisi/util.py:553 msgid "objcopy (keep-debug) command failed for file '%s'!" msgstr "comando objcopy (keep-debug) falló para archivo '%s'!" -#: pisi/util.py:549 +#: pisi/util.py:559 msgid "objcopy (add-debuglink) command failed for file '%s'!" msgstr "comando objcopy (add-debuglink) falló para archivo '%s'!" -#: pisi/util.py:610 +#: pisi/util.py:620 msgid "Updating environment..." msgstr "Actualizando entorno..." @@ -3033,15 +3133,18 @@ msgstr "" "%s\n" #: scripts/repostats.py:371 -msgid "Developer '%s <%s>' has another mail address '%s' in source package '%s'" -msgstr "Desarollador '%s <%s>' tiene otra dirección email '%s' en archivo fuente '%s'" +msgid "" +"Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "" +"Desarrollador '%s <%s>' tiene otra dirección email '%s' en archivo fuente '%" +"s'" #: scripts/repostats.py:467 msgid "" "Cannot parse '%s':\n" "%s\n" msgstr "" -"No posible parsear '%s':\n" +"No posible analizar '%s':\n" "%s\n" #: scripts/repostats.py:553 @@ -3054,9 +3157,24 @@ msgstr "No generar sitio web.\n" #: scripts/repostats.py:575 msgid "Scanning source repository...\n" -msgstr "Buscando en repositorio fuente...\n" +msgstr "Buscando en repositorio de fuentes...\n" #: scripts/repostats.py:579 msgid "Scanning binary packages...\n" -msgstr "Buscando en paquetes binarios...\n" +msgstr "Buscando paquetes binarios...\n" +#~ msgid "Set search language" +#~ msgstr "Establecer idioma de búsqueda" + +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Tipo de archivo '%s' desconocido en paquete '%s' " + +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Paquete de fuente '%s' tiene formato de fecha incorrecto '%s'" + +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%d errores encontrados! Corríjalos de inmediato!\n" + +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "" +#~ "Las siguientes dependencias no están disponibles en el repositorio:\n" diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 00000000..6f556343 --- /dev/null +++ b/po/fr.po @@ -0,0 +1,3144 @@ +# translation of fr.po to French +# Copyright (C) YEAR ORGANIZATION +# +# Amine Chadly , 2007. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2007-03-17 17:16+0200\n" +"Last-Translator: Amine Chadly \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: KBabel 1.11.4\n" + +#: /usr/lib/python2.4/optparse.py:1 +msgid "" +"optparse - a powerful, extensible, and easy-to-use option parser.\n" +"\n" +"By Greg Ward \n" +"\n" +"Originally distributed as Optik; see http://optik.sourceforge.net/ .\n" +"\n" +"If you have problems with this module, please do not file bugs,\n" +"patches, or feature requests with Python; instead, use Optik's\n" +"SourceForge project page:\n" +" http://sourceforge.net/projects/optik\n" +"\n" +"For support, use the optik-users@lists.sourceforge.net mailing list\n" +"(http://lists.sourceforge.net/lists/listinfo/optik-users).\n" +msgstr "" +"optparse - un analyseur d'options facile à utiliser, extensible\n" +"et puissant\n" +"Par Greg Ward \n" +"\n" +"Distribué à l'origine comme Optik; voir http://optik.sourceforge.net/ .\n" +"\n" +"Si vous avez de problèmes avec ce module, ne le signalez pas,\n" +"n'envoyez pas de patches ou de requêtes de nouvelles \n" +"fonctionnalités avec Python; utilisez plutôt la page de projet \n" +"Sourceforge d'Optik : \n" +" http://sourceforge.net/projects/optik\n" +"\n" +"Pour le support, utiliser la liste de diffusion \n" +"optik-users@lists.sourceforge.net\n" +"(http://lists.sourceforge.net/lists/listinfo/optik-users).\n" + +#: /usr/lib/python2.4/optparse.py:93 +msgid "" +"\n" +" Raised if an Option instance is created with invalid or\n" +" inconsistent arguments.\n" +" " +msgstr "" +"\n" +" Levée si une instance d'Option est créée avec un nombre\n" +" incorrect d'arguments ou avec un argument invalide.\n" +" " + +#: /usr/lib/python2.4/optparse.py:109 +msgid "" +"\n" +" Raised if conflicting options are added to an OptionParser.\n" +" " +msgstr "" +"\n" +" Levée si des options incompatibles sont ajoutées à un OptionParser.\n" +" " + +#: /usr/lib/python2.4/optparse.py:114 +msgid "" +"\n" +" Raised if an invalid option value is encountered on the command\n" +" line.\n" +" " +msgstr "" +"\n" +" Levée si une valeur incorrecte d'option est rencontrée dans la \n" +" ligne de commande.\n" +" " + +#: /usr/lib/python2.4/optparse.py:120 +msgid "" +"\n" +" Raised if an invalid or ambiguous option is seen on the command-line.\n" +" " +msgstr "" +"\n" +" Levée si une option invalide ou ambiguë est vue dans la ligne de " +"commande.\n" +" " + +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 +msgid "Return a comma-separated list of option strings & metavariables." +msgstr "" +"Retourne une liste de chaînes d'options & de métavariables séparées par des " +"virgules." + +#: /usr/lib/python2.4/optparse.py:317 +msgid "" +"Format help with indented section bodies.\n" +" " +msgstr "" +"Réarrange l'aide en indentant le corps des sections.\n" +" " + +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 +msgid "usage: %s\n" +msgstr "utilisation : %s\n" + +#: /usr/lib/python2.4/optparse.py:336 +msgid "" +"Format help with underlined section headers.\n" +" " +msgstr "" +"Arrange l'aide en soulignant les titres de sections.\n" +" " + +#: /usr/lib/python2.4/optparse.py:348 +msgid "Usage" +msgstr "Utilisation" + +#: /usr/lib/python2.4/optparse.py:354 +msgid "integer" +msgstr "entier" + +#: /usr/lib/python2.4/optparse.py:355 +msgid "long integer" +msgstr "entier long" + +#: /usr/lib/python2.4/optparse.py:356 +msgid "floating-point" +msgstr "virgule flottante" + +#: /usr/lib/python2.4/optparse.py:357 +msgid "complex" +msgstr "complexe" + +#: /usr/lib/python2.4/optparse.py:365 +msgid "option %s: invalid %s value: %r" +msgstr "option %s: invalide %s valeur: %r" + +#: /usr/lib/python2.4/optparse.py:373 +msgid "option %s: invalid choice: %r (choose from %s)" +msgstr "option %s: choix invalide : %r (choisir parmi %s)" + +#: /usr/lib/python2.4/optparse.py:382 +msgid "" +"\n" +" Instance attributes:\n" +" _short_opts : [string]\n" +" _long_opts : [string]\n" +"\n" +" action : string\n" +" type : string\n" +" dest : string\n" +" default : any\n" +" nargs : int\n" +" const : any\n" +" choices : [string]\n" +" callback : function\n" +" callback_args : (any*)\n" +" callback_kwargs : { string : any }\n" +" help : string\n" +" metavar : string\n" +" " +msgstr "" +"\n" +" Attributs d'instance :\n" +" _short_opts : [string]\n" +" _long_opts : [string]\n" +"\n" +" action : string\n" +" type : string\n" +" dest : string\n" +" default : any\n" +" nargs : int\n" +" const : any\n" +" choices : [string]\n" +" callback : function\n" +" callback_args : (any*)\n" +" callback_kwargs : { string : any }\n" +" help : string\n" +" metavar : string\n" +" " + +#: /usr/lib/python2.4/optparse.py:781 +msgid "" +"\n" +" Update the option values from an arbitrary dictionary, but only\n" +" use keys from dict that already have a corresponding attribute\n" +" in self. Any keys in dict without a corresponding attribute\n" +" are silently ignored.\n" +" " +msgstr "" +"\n" +" Met à jour les valeur d'options depuis un dictionnaire arbitraire,\n" +" mais n'utilise que les clefs du dictionnaire qui ont un attribut \n" +" correspondant dans self. Tout clefs du dictionnaire sans attribut \n" +" correspondant est silencieusement ignorée.\n" +" " + +#: /usr/lib/python2.4/optparse.py:794 +msgid "" +"\n" +" Update the option values from an arbitrary dictionary,\n" +" using all keys from the dictionary regardless of whether\n" +" they have a corresponding attribute in self or not.\n" +" " +msgstr "" +"\n" +" Met à jour les valeurs d'options depuis un dictionnaire\n" +" arbitraire en utilisant toutes les clefs du dictionnaire \n" +" qu'elles aient un attribut correspondant ou pas.\n" +" " + +#: /usr/lib/python2.4/optparse.py:926 +msgid "" +"add_option(Option)\n" +" add_option(opt_str, ..., kwarg=val, ...)\n" +" " +msgstr "" +"add_option(Option)\n" +" add_option(opt_str, ..., kwarg=val, ...)\n" +" " + +#: /usr/lib/python2.4/optparse.py:1138 +msgid "show this help message and exit" +msgstr "affiche ce message d'aide puis sort" + +#: /usr/lib/python2.4/optparse.py:1143 +msgid "show program's version number and exit" +msgstr "indique la version du programme et sort" + +#: /usr/lib/python2.4/optparse.py:1166 +msgid "%prog [options]" +msgstr "%prog [options]" + +#: /usr/lib/python2.4/optparse.py:1246 +msgid "" +"\n" +" parse_args(args : [string] = sys.argv[1:],\n" +" values : Values = None)\n" +" -> (values : Values, args : [string])\n" +"\n" +" Parse the command-line options found in 'args' (default:\n" +" sys.argv[1:]). Any errors result in a call to 'error()', which\n" +" by default prints the usage message to stderr and calls\n" +" sys.exit() with an error message. On success returns a pair\n" +" (values, args) where 'values' is an Values instance (with all\n" +" your option values) and 'args' is the list of arguments left\n" +" over after parsing options.\n" +" " +msgstr "" +"\n" +" parse_args(args : [string] = sys.argv[1:],\n" +" values : Values = None)\n" +" -> (values : Values, args : [string])\n" +"\n" +" Analyse les options de la ligne de commande trouvées \n" +" dans 'args' (par défaut : sys.argv[1:]). Toute erreur \n" +" provoque un appel à error()', qui par défaut affiche le \n" +" message d'utilisation vers stderr puis appelle sys.exit()\n" +" avec un message d'erreur. En cas de succès, retourne \n" +" une paire (valeurs, args) où values est un instance de \n" +" Values (avec toutes vos valeurs d'options) et args est\n" +" une liste d'arguments restants après l'analyse des\n" +" options.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1285 +msgid "" +"\n" +" check_values(values : Values, args : [string])\n" +" -> (values : Values, args : [string])\n" +"\n" +" Check that the supplied option values and leftover arguments are\n" +" valid. Returns the option values and leftover arguments\n" +" (possibly adjusted, possibly completely new -- whatever you\n" +" like). Default implementation just returns the passed-in\n" +" values; subclasses may override as desired.\n" +" " +msgstr "" +"\n" +" check_values(values : Values, args : [string])\n" +" -> (values : Values, args : [string])\n" +"\n" +" Vérifie que les valeurs d'options fournies et les arguments\n" +" restants sont valides. Retourne les valeurs d'options et \n" +" les arguments restants (potentiellement ajustées, \n" +" potentiellement complètement nouvelles -- comme vous\n" +" préférez). L'implémentation par défaut retourne juste les \n" +" valeurs fournies en entrée; les sous-classes peuvent \n" +" redéfinir à leur convenance.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1298 +msgid "" +"_process_args(largs : [string],\n" +" rargs : [string],\n" +" values : Values)\n" +"\n" +" Process command-line arguments and populate 'values', consuming\n" +" options and arguments from 'rargs'. If 'allow_interspersed_args' " +"is\n" +" false, stop at the first non-option argument. If true, accumulate " +"any\n" +" interspersed non-option arguments in 'largs'.\n" +" " +msgstr "" +"_process_args(largs : [string],\n" +" rargs : [string],\n" +" values : Values)\n" +"\n" +" Procède à l'analyse des arguments de la ligne de commande et peuple\n" +" 'values', consommant les options et les arguments de 'rargs'. Si \n" +" 'allow_interspersed_args' est à false, s'arrête au premier argument " +"qui\n" +" n'est pas une option. Si établi à true, accumule tout argument " +"intercalé\n" +" qui n'est pas une option dans 'largs'.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1349 +msgid "" +"_match_long_opt(opt : string) -> string\n" +"\n" +" Determine which long option string 'opt' matches, ie. which one\n" +" it is an unambiguous abbrevation for. Raises BadOptionError if\n" +" 'opt' doesn't unambiguously match any long option string.\n" +" " +msgstr "" +"_match_long_opt(opt : string) -> string\n" +"\n" +" Détermine quelle option longue correspond à la chaîne 'opt', c'est\n" +" à dire pour laquelle elle est une abrévation non équivoque. Lève\n" +" BadOptionError si 'opt' ne correspond à aucune chaîne longue \n" +" d'option sans équivoque.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1376 /usr/lib/python2.4/optparse.py:1415 +msgid "%s option requires an argument" +msgstr "L'option %s requiert un argument" + +#: /usr/lib/python2.4/optparse.py:1378 /usr/lib/python2.4/optparse.py:1417 +msgid "%s option requires %d arguments" +msgstr "L'option %s requiert %d arguments" + +#: /usr/lib/python2.4/optparse.py:1387 +msgid "%s option does not take a value" +msgstr "L'option %s ne prend pas de valeur" + +#: /usr/lib/python2.4/optparse.py:1404 /usr/lib/python2.4/optparse.py:1558 +msgid "no such option: %s" +msgstr "Option inexistante : %s" + +#: /usr/lib/python2.4/optparse.py:1454 +msgid "" +"error(msg : string)\n" +"\n" +" Print a usage message incorporating 'msg' to stderr and exit.\n" +" If you override this in a subclass, it should not return -- it\n" +" should either exit or raise an exception.\n" +" " +msgstr "" +"error(msg : string)\n" +"\n" +" Affiche un message d'utilisation incorporant 'msg' dans stderr puis " +"sort.\n" +" Si vous surchargez dans une sous-classe, la méthode ne doit \n" +" pas rendre la main -- Elle devrait soit quitter, soit lever une " +"exception.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1471 +msgid "" +"print_usage(file : file = stdout)\n" +"\n" +" Print the usage message for the current program (self.usage) to\n" +" 'file' (default stdout). Any occurence of the string \"%prog\" in\n" +" self.usage is replaced with the name of the current program\n" +" (basename of sys.argv[0]). Does nothing if self.usage is empty\n" +" or not defined.\n" +" " +msgstr "" +"print_usage(file : file = stdout)\n" +"\n" +" Affiche le message d'utilisation pour le programme courant (self." +"usage) \n" +" dans 'file' (par défaut stdout). Toute occurence de la chaîne \"%" +"prog\" dans\n" +" self.usage est remplacée par le nom du programme courant\n" +" (nom de base de sys.argv[0]). Ne fait rien si self.usage est vide\n" +" ou indéfinie.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1489 +msgid "" +"print_version(file : file = stdout)\n" +"\n" +" Print the version message for this program (self.version) to\n" +" 'file' (default stdout). As with print_usage(), any occurence\n" +" of \"%prog\" in self.version is replaced by the current program's\n" +" name. Does nothing if self.version is empty or undefined.\n" +" " +msgstr "" +"print_version(file : file = stdout)\n" +"\n" +" Affiche le message de version de ce programme (self.version)\n" +" dans le fichier 'file' (par défaut dans stdout). Comme pour \n" +" print_usage(), toute occurence de \"%prog\" dans self.version\n" +" sera remplacée par le nom du programme courant\n" +" Ne fait rien si self.version est vide ou indéfinie.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1504 +msgid "options" +msgstr "options" + +#: /usr/lib/python2.4/optparse.py:1528 +msgid "" +"print_help(file : file = stdout)\n" +"\n" +" Print an extended help message, listing all options and any\n" +" help text provided with them, to 'file' (default stdout).\n" +" " +msgstr "" +"print_help(file : file = stdout)\n" +"\n" +" Affiche un message d'aide étendu, listant toutes les options\n" +" ainsi que tout aide textuelle fournie avec elles dans 'file' \n" +" (stdout par défaut).\n" +" " + +#: /usr/lib/python2.4/optparse.py:1541 +msgid "" +"_match_abbrev(s : string, wordmap : {string : Option}) -> string\n" +"\n" +" Return the string key in 'wordmap' for which 's' is an unambiguous\n" +" abbreviation. If 's' is found to be ambiguous or doesn't match any of\n" +" 'words', raise BadOptionError.\n" +" " +msgstr "" +"_match_abbrev(s : string, wordmap : {string : Option}) -> string\n" +"\n" +" Retourne la chaîne clef dans 'wordmap' pour laquelle 's' est une\n" +" abréviation sans ambiguïté. Lève une BadOptionError si 's' est \n" +" ambigu ou ne correspond à aucun mot.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1562 +msgid "ambiguous option: %s (%s?)" +msgstr "option ambiguë : %s (%s?)" + +#: pisi-cli:46 +msgid "Keyboard Interrupt: Exiting..." +msgstr "Interruption Clavier : Sortons..." + +#: pisi-cli:49 +msgid "Program Terminated." +msgstr "Programme définitivement interrompu." + +#: pisi-cli:52 +msgid "" +"A database operation has been aborted. You should run pisi\n" +"again for normal DB recovery procedure. Make sure you have free disk " +"space. \n" +"You have to run rebuild-db only when there is file corruption and database " +"upgrades." +msgstr "" +"Une opération relative à la base de données a été abandonnée.\n" +"Veuillez lancer pisi une nouvelle fois afin de suivre la procédure normale " +"de\n" +"reprise DB. Faîtes bien en sorte d'avoir suffisamment d'espace disque.\n" +"Vous ne devez lancer rebuild-db que lorsqu'un fichier est corrompu ou lors \n" +"de mises à jour de la base." + +#: pisi-cli:57 +msgid "" +"Unhandled internal exception.\n" +"Please file a bug report. (http://bugs.uludag.org.tr)" +msgstr "" +"Exception interne non gérée.\n" +"Veuillez signaler le disfonctionnement s'il vous plaît. (http://bugs.uludag." +"org.tr)" + +#: pisi-cli:63 +msgid "System Error. Program Terminated." +msgstr "Erreur Système. Programme définitivement interrompu." + +#: pisi-cli:70 +msgid "Please use 'pisi help' for general help." +msgstr "Veuillez utiliser 'pisi help' pour une aide généraliste." + +#: pisi-cli:73 +msgid "Traceback:" +msgstr "Pile d'exécution : " + +#: pisi-cli:77 +msgid "Use --debug to see a traceback." +msgstr "Utiliser --debug pour voir une pile d'exécution." + +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 +msgid "" +"Please attach the config.log to your bug report:\n" +"%s/config.log" +msgstr "" +"Veuillez attacher le config.log à votre rapport de disfonctionnement s'il " +"vous plaît :\n" +"%s/config.log" + +#: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 +msgid "Configure failed." +msgstr "Échec du configure." + +#: pisi/actionsapi/autotools.py:77 pisi/actionsapi/autotools.py:87 +#: pisi/actionsapi/kde.py:67 +msgid "No configure script found." +msgstr "Pas de script configure trouvé." + +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 +msgid "Make failed." +msgstr "Échec du make." + +#: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 +#: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 +#: pisi/actionsapi/scons.py:43 +msgid "Install failed." +msgstr "Échec de l'installation." + +#: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 +msgid "No Makefile found." +msgstr "Pas de Makefile trouvé." + +#: pisi/actionsapi/autotools.py:143 +msgid "Running aclocal failed." +msgstr "L'exécution de aclocal a échoué." + +#: pisi/actionsapi/autotools.py:148 +msgid "Running autoconf failed." +msgstr "L'exécution de autoconf a échoué." + +#: pisi/actionsapi/autotools.py:153 +msgid "Running autoreconf failed." +msgstr "L'exécution de autoreconf a échoué." + +#: pisi/actionsapi/autotools.py:158 +msgid "Running automake failed." +msgstr "L'exécution de automake a échoué." + +#: pisi/actionsapi/autotools.py:163 +msgid "Running autoheader failed." +msgstr "L'exécution de autoheader a échoué." + +#: pisi/actionsapi/cmaketools.py:64 +#, fuzzy +msgid "No configure script found for cmake." +msgstr "Pas de script configure trouvé." + +#: pisi/actionsapi/get.py:160 +msgid "Util %s cannot be found" +msgstr "L'utilitaire %s n'a pu être trouvé" + +#: pisi/actionsapi/get.py:162 +msgid "Warning: %s does not exist, using plain name %s" +msgstr "Attention : %s n'existe pas, utilisation du simple nom %s" + +#: pisi/actionsapi/kde.py:34 +msgid "" +"\n" +"!!! Please attach the config.log to your bug report:\n" +"%s/config.log" +msgstr "" +"\n" +"!!! Veuillez attacher le config.log à votre rapport de disfonctionnement " +"s'il vous plaît :\n" +"%s/config.log" + +#: pisi/actionsapi/libtools.py:38 +msgid "Running ldconfig failed." +msgstr "L'exécution de ldconfig a échoué." + +#: pisi/actionsapi/libtools.py:49 +msgid "GNU Config Update Finished." +msgstr "La mise à jour de GNU Config est maintenant terminée." + +#: pisi/actionsapi/libtools.py:53 +msgid "Running libtoolize failed." +msgstr "L'exécution de libtoolize a échoué." + +#: pisi/actionsapi/perlmodules.py:66 +msgid "perl build failed." +msgstr "la compilation de perl a échoué." + +#: pisi/actionsapi/perlmodules.py:75 +msgid "perl install failed." +msgstr "L'installation de perl a échoué." + +#: pisi/actionsapi/pisitools.py:126 +msgid "ActionsAPI [doman]: Wrong man page file: %s" +msgstr "ActionsAPI [doman]: Fichier de page de manuel incorrecte : %s" + +#: pisi/actionsapi/pisitools.py:164 +msgid "ActionsAPI [rename]: No such file or directory: %s" +msgstr "ActionsAPI [rename]: Pas de fichier ou répertoire à ce nom : %s" + +#: pisi/actionsapi/pisitools.py:181 +msgid "File does not exist or permission denied: %s" +msgstr "Le fichier n'existe pas ou la permission refusée : %s" + +#: pisi/actionsapi/pisitools.py:198 +msgid "ActionsAPI [dosym]: File exists: %s" +msgstr "ActionsAPI [dosym]: Le fichier existe : %s" + +#: pisi/actionsapi/pisitoolsfunctions.py:45 +#: pisi/actionsapi/pisitoolsfunctions.py:59 +#: pisi/actionsapi/pisitoolsfunctions.py:72 +msgid "Insufficient arguments." +msgstr "Pas assez d'arguments." + +#: pisi/actionsapi/pythonmodules.py:66 +msgid "Running %s failed." +msgstr "L'exécution de %s a échoué." + +#: pisi/actionsapi/shelltools.py:49 +msgid "Cannot create directory %s" +msgstr "Impossible de créer le répertoire %s" + +#: pisi/actionsapi/shelltools.py:57 +msgid "ActionsAPI [echo]: Can't append to file %s." +msgstr "ActionsAPI [echo]: Impossible d'ajouter des données au fichier %s." + +#: pisi/actionsapi/shelltools.py:66 +msgid "ActionsAPI [chmod]: Operation not permitted: %s (mode: %s)" +msgstr "ActionsAPI [chmod]: Operation non permise : %s (mode: %s)" + +#: pisi/actionsapi/shelltools.py:69 +msgid "ActionsAPI [chmod]: File %s doesn't exists." +msgstr "ActionsAPI [chmod]: Le fichier %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:77 +msgid "ActionsAPI [chown]: Operation not permitted: %s (uid: %s, gid: %s)" +msgstr "ActionsAPI [chown]: Operation non permise : %s (uid: %s, gid: %s)" + +#: pisi/actionsapi/shelltools.py:80 +msgid "ActionsAPI [chown]: File %s doesn't exists." +msgstr "ActionsAPI [chown]: Le fichier %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:87 +msgid "ActionsAPI [sym]: Permission denied: %s to %s" +msgstr "ActionsAPI [sym]: Permission refusée : %s à %s" + +#: pisi/actionsapi/shelltools.py:95 +msgid "ActionsAPI [unlink]: Permission denied: %s." +msgstr "ActionsAPI [unlink]: Permission refusée : %s." + +#: pisi/actionsapi/shelltools.py:99 +msgid "ActionsAPI [unlink]: File %s doesn't exists." +msgstr "ActionsAPI [unlink]: Le fichier %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:107 +msgid "ActionsAPI [unlinkDir]: Operation not permitted: %s" +msgstr "ActionsAPI [unlinkDir]: Operation non permise : %s" + +#: pisi/actionsapi/shelltools.py:111 +msgid "ActionsAPI [unlinkDir]: Directory %s doesn't exists." +msgstr "ActionsAPI [unlinkDir]: Le repertoire %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:120 +msgid "ActionsAPI [move]: Permission denied: %s to %s" +msgstr "ActionsAPI [move]: Permission refusée : de %s à %s" + +#: pisi/actionsapi/shelltools.py:122 +msgid "ActionsAPI [move]: File %s doesn't exists." +msgstr "ActionsAPI [move]: Le fichier %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:132 +msgid "ActionsAPI [copy]: Permission denied: %s to %s" +msgstr "ActionsAPI [copy]: Permission refusée : de %s à %s" + +#: pisi/actionsapi/shelltools.py:148 +msgid "ActionsAPI [copy]: File %s does not exist." +msgstr "ActionsAPI [copy]: Le fichier %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:163 +msgid "ActionsAPI [copytree] %s to %s: %s" +msgstr "ActionsAPI [copytree] %s à %s: %s" + +#: pisi/actionsapi/shelltools.py:165 +msgid "ActionsAPI [copytree]: Directory %s doesn't exists." +msgstr "ActionsAPI [copytree]: Le repertoire %s n'existe pas." + +#: pisi/actionsapi/shelltools.py:177 +msgid "ActionsAPI [touch]: Permission denied: %s" +msgstr "ActionsAPI [touch]: Permission refusée : %s" + +#: pisi/api.py:297 pisi/comariface.py:30 +msgid "comar package is not fully installed" +msgstr "Le paquet comar n'est pas entièrement installé" + +#: pisi/api.py:309 +msgid "File %s not found" +msgstr "Le fichier %s est introuvable" + +#: pisi/api.py:364 +msgid "Checking /%s " +msgstr "Vérification /%s " + +#: pisi/api.py:368 +msgid "" +"\n" +"Corrupt file: %s" +msgstr "" +"\n" +"Fichier corrompu : %s" + +#: pisi/api.py:370 pisi/cli/commands.py:1044 +msgid "OK" +msgstr "OK" + +#: pisi/api.py:383 +msgid "* Building index of PiSi files under %s" +msgstr "* Construction de l'index des fichiers PiSi sous %s" + +#: pisi/api.py:390 +msgid "* Index file written" +msgstr "* Fichier d'index écrit" + +#: pisi/api.py:394 +msgid "Repo %s already present." +msgstr "Le dépôt %s existe déjà." + +#: pisi/api.py:398 +msgid "Repo %s added to system." +msgstr "Le dépôt %s a été ajouté au système." + +#: pisi/api.py:404 +msgid "Repo %s removed from system." +msgstr "Le dépôt %s a été supprimé du système." + +#: pisi/api.py:406 +msgid "Repository %s does not exist. Cannot remove." +msgstr "Le dépôt %s n'existe pas. Impossible de le supprimer." + +#: pisi/api.py:413 +msgid "* Updating repository: %s" +msgstr "* Mise à jour du dépôt : %s" + +#: pisi/api.py:421 +msgid "No updates available for repository %s." +msgstr "Pas de mise à jour pour le dépôt %s." + +#: pisi/api.py:423 +msgid "Updating database at any rate as requested" +msgstr "Mise à jour de la base de données quoi qu'il arrive comme demandé" + +#: pisi/api.py:434 +msgid "* Package database updated." +msgstr "* Base de données des paquets mise à jour." + +#: pisi/api.py:436 pisi/api.py:461 +msgid "No repository named %s found." +msgstr "Pas de dépôt au nom %s trouvé." + +#: pisi/api.py:444 +msgid "* Rebuilding '%s' named repo... " +msgstr "* Reconstruction du dépôt '%s'... " + +#: pisi/api.py:457 +msgid "Input/Output error while reading %s: %s" +msgstr "Erreur d'entrée/sortie ors de la lecture de %s : %s" + +#: pisi/api.py:514 +msgid "Rebuilding package database" +msgstr "Reconstruction de la base de données des paquets" + +#: pisi/archive.py:36 +msgid "" +"An error has occured while running LZMA:\n" +"%s" +msgstr "" +"Une erreur est survenue lors de l'exécutions de LZMA :\n" +"%s" + +#: pisi/archive.py:101 pisi/archive.py:161 +msgid "Archive type not recognized" +msgstr "Type d'archive non reconnue" + +#: pisi/atomicoperations.py:67 +msgid "Package %s found in repository %s" +msgstr "Paquet %s trouvé dans le dépôt %s" + +#: pisi/atomicoperations.py:90 +msgid "Package URI: %s" +msgstr "URI du paquet : %s" + +#: pisi/atomicoperations.py:94 +msgid "Package %s not found in any active repository." +msgstr "Le paquet %s introuvable dans les dépôts actifs." + +#: pisi/atomicoperations.py:113 +msgid "Installing %s, version %s, release %s, build %s" +msgstr "Installation de %s, version majeure %s, version mineure %s, build %s" + +#: pisi/atomicoperations.py:158 +msgid "%s package cannot be installed unless the dependencies are satisfied" +msgstr "" +"Le paquet %s ne peut être installé sans que les dépendances ne soient " +"satisfaites" + +#: pisi/atomicoperations.py:177 +msgid "/%s from %s package\n" +msgstr "/%s pour le paquet %s\n" + +#: pisi/atomicoperations.py:178 +msgid "" +"File conflicts:\n" +"%s" +msgstr "" +"Conflit de fichiers :\n" +"%s" + +#: pisi/atomicoperations.py:213 +msgid "Re-install same version package?" +msgstr "Ré-installer la même version du paquet ?" + +#: pisi/atomicoperations.py:214 +msgid "Package re-install declined" +msgstr "Ré-installation du paquet déclinée" + +#: pisi/atomicoperations.py:220 +msgid "Upgrading to new upstream version" +msgstr "Mise à jour vers une version ultérieure" + +#: pisi/atomicoperations.py:223 +msgid "Upgrading to new distribution release" +msgstr "Mise à jour vers une nouvelle version de distribution" + +#: pisi/atomicoperations.py:227 +msgid "Upgrading to new distribution build" +msgstr "Mise à jour vers un nouveau build de la distribution" + +#: pisi/atomicoperations.py:237 +msgid "Downgrade to old distribution release?" +msgstr "Régresser vers une version de distribution plus récente ?" + +#: pisi/atomicoperations.py:239 +msgid "Downgrade to old distribution build?" +msgstr "Régresser vers une version de build plus vielle de la distribution ?" + +#: pisi/atomicoperations.py:241 +msgid "Package downgrade declined" +msgstr "Régression de paquet déclinée" + +#: pisi/atomicoperations.py:265 +msgid "%s configuration failed." +msgstr "La configuration de %s a échoué." + +#: pisi/atomicoperations.py:388 +msgid "Storing %s, " +msgstr "Stockage de %s," + +#: pisi/atomicoperations.py:391 +msgid "Storing %s." +msgstr "Stockage de %s." + +#: pisi/atomicoperations.py:398 +msgid "Storing %s" +msgstr "Stockage de %s" + +#: pisi/atomicoperations.py:454 +msgid "File list could not be read for package %s, continuing removal." +msgstr "" +"La liste des fichier pour le paquet %s n'a pu être lue, poursuite de la " +"suppression." + +#: pisi/atomicoperations.py:460 +msgid "Removing package %s" +msgstr "Suppression du paquet %s" + +#: pisi/atomicoperations.py:463 +msgid "Trying to remove nonexistent package " +msgstr " Tentative de suppression d'un paquet inexistant" + +#: pisi/atomicoperations.py:502 +msgid "Not removing conflicted file : %s" +msgstr "Le fichier %s causant un conflit ne sera pas supprimé" + +#: pisi/atomicoperations.py:522 +msgid "" +"Installed file %s is not exists on system [Probably you manually deleted]" +msgstr "" +"Le fichier %s précédemment installé n'existe plus sur le système " +"[Probablement supprimé manuellement]" + +#: pisi/atomicoperations.py:581 +msgid "Metadata XML '%s' cannot be found" +msgstr "La métadonnée XML '%s' introuvable" + +#: pisi/atomicoperations.py:589 +msgid "MetaData format wrong (%s)" +msgstr "Le format de la MétaDonnée (%s) est eronné" + +#: pisi/atomicoperations.py:591 +msgid "* Adding '%s' to db... " +msgstr "* Ajout de '%s' à la base de données... " + +#: pisi/atomicoperations.py:597 +msgid "Files XML '%s' cannot be found" +msgstr "Fichiers XML '%s' introuvables" + +#: pisi/atomicoperations.py:602 pisi/package.py:141 +msgid "Invalid %s" +msgstr "%s invalide" + +#: pisi/atomicoperations.py:611 +msgid "OK." +msgstr "OK." + +#: pisi/build.py:86 +msgid "Path %s belongs in multiple packages" +msgstr "Le chemin %s appartient à plusieurs paquets" + +#: pisi/build.py:112 +msgid "Source URI: %s" +msgstr "URI Source : %s" + +#: pisi/build.py:116 +msgid "Source %s not found in any active repository." +msgstr "La source %s n'est dans aucun des dépôts actifs." + +#: pisi/build.py:181 +msgid "Building PiSi source package: %s" +msgstr "Construction du paquet source PiSi : %s" + +#: pisi/build.py:229 +msgid "IceCream detected. Make sure your daemon is up and running..." +msgstr "" +"IceCream détecté. Vérifiez bien que votre daemon est en cours d'exécution..." + +#: pisi/build.py:234 +msgid "CCache detected..." +msgstr "CCache détecté..." + +#: pisi/build.py:287 +msgid "PartOf tag not defined, looking for component" +msgstr "Balise PartOf non définie, recherche d'un composant" + +#: pisi/build.py:297 +msgid "Cannot find component.xml in upper directory" +msgstr "Impossible de trouver component.xml dans le répertoire père" + +#: pisi/build.py:301 +msgid "Source is part of %s component" +msgstr "La source fait partie du composant %s" + +#: pisi/build.py:305 +msgid "Fetching source from: %s" +msgstr "Récupération de la source depuis : %s" + +#: pisi/build.py:307 +msgid "Source archive is stored: %s/%s" +msgstr "L'archive du source est stockée dans : %s/%s" + +#: pisi/build.py:311 +msgid "Unpacking archive..." +msgstr "Décompression de l'archive..." + +#: pisi/build.py:313 +msgid " unpacked (%s)" +msgstr " décompressée (%s)" + +#: pisi/build.py:318 +msgid "Setting up source..." +msgstr "Préparation du code source..." + +#: pisi/build.py:323 +msgid "Building source..." +msgstr "Compilation du code source..." + +#: pisi/build.py:328 +#, fuzzy +msgid "Testing package..." +msgstr "Création du paquet PiSi %s." + +#: pisi/build.py:332 +msgid "Installing..." +msgstr "Installation..." + +#: pisi/build.py:374 +msgid "Unable to read Actions Script (%s): %s" +msgstr "Impossible de lire le Script d'Actions (%s) : %s" + +#: pisi/build.py:376 +msgid "SyntaxError in Actions Script (%s): %s" +msgstr "Erreur de syntaxe dans le Script d'Actions (%s) : %s" + +#: pisi/build.py:393 +msgid "Unable to read COMAR script (%s): %s" +msgstr "Impossible de lire le script COMAR (%s) : %s" + +#: pisi/build.py:395 +msgid "SyntaxError in COMAR file (%s): %s" +msgstr "Erreur de syntaxe dans le fichier COMAR (%s) : %s" + +#: pisi/build.py:421 +msgid "unable to call function from actions: %s" +msgstr "impossible d'appeler une fonction depuis une action : %s" + +#: pisi/build.py:437 +msgid "" +"Safety switch: following extra packages in system.devel will be installed: " +msgstr "" +"Précautions de sécurité : les paquets supplémentaire dans system.devel vont " +"être installés :" + +#: pisi/build.py:442 +msgid "Safety switch: system.devel is already installed" +msgstr "Précautions de sécurité : system.devel est déjà installé" + +#: pisi/build.py:444 +msgid "Safety switch: the component system.devel cannot be found" +msgstr "Précautions de sécurité : Le composant system.devel est introuvable" + +#: pisi/build.py:453 +msgid "Unsatisfied Build Dependencies:" +msgstr "Dépendance de Compilation Insatisfaites : " + +#: pisi/build.py:457 +msgid "Cannot build package due to unsatisfied build dependencies" +msgstr "" +"Impossible de construire le paquer à cause de dépendance de compilation " +"insatisfaites" + +#: pisi/build.py:465 +msgid "Build dependency %s cannot be satisfied" +msgstr "La dépendance de compilation %s ne peut être satisfaite" + +#: pisi/build.py:467 +msgid "Do you want to install the unsatisfied build dependencies" +msgstr "Voulez-vous installer les dépendances de compilations manquantes" + +#: pisi/build.py:468 +msgid "Installing build dependencies." +msgstr "Installation des dépendances de compilation." + +#: pisi/build.py:473 +msgid "Ignoring build dependencies." +msgstr "Ignore les dépendances de compilations." + +#: pisi/build.py:483 +msgid "Patch file is missing: %s\n" +msgstr "Le fichier de patch %s est manquant\n" + +#: pisi/build.py:496 +msgid "* Applying patch: %s" +msgstr "* Application du patch : %s" + +#: pisi/build.py:554 +msgid "Stripping files.." +msgstr "Suppression des chaînes inutilisées des fichiers..." + +#: pisi/build.py:654 +msgid "(found old version %s)" +msgstr "(Une ancienne version %s a été trouvée)" + +#: pisi/build.py:656 +msgid "Skipping %s with wrong pkg name " +msgstr "Mise de côté de %s avec un nom de paquet erroné" + +#: pisi/build.py:677 +msgid "(no previous build found, setting build no to 1.)" +msgstr "" +"(pas de compilation précédente trouvée, établissement du numéro de build à 1)" + +#: pisi/build.py:722 +msgid "(old package lacks a build no, setting build no to 1.)" +msgstr "" +"(le package plus ancien n'a pas de numéro de build, établissement du numéro " +"de build à 1)" + +#: pisi/build.py:725 +msgid "There are changes, incrementing build no to %d" +msgstr "Il y a des changements, incrémentation du numéro de build à %d" + +#: pisi/build.py:728 +msgid "There is no change from previous build %d" +msgstr "Il n'y a aucun changement depuis la compilation précédente %d" + +#: pisi/build.py:793 +msgid "No user named '%s' found on the system" +msgstr "Aucun utilisateur '%s' trouvé sur le système" + +#: pisi/build.py:798 +msgid "No group named '%s' found on the system" +msgstr "Pas de groupe '%s' trouvé sur le système" + +#: pisi/build.py:801 +msgid "** Building package %s" +msgstr "** Compilation du paquet %s" + +#: pisi/build.py:803 pisi/build.py:806 +msgid "Generating %s," +msgstr "Génération de %s." + +#: pisi/build.py:812 +msgid "" +"Build number is not available. For repo builds you must enable buildno in " +"pisi.conf." +msgstr "" +"Numéro de build non disponible. Pour les builds de dépôts, vous devez " +"activer buildno dans pisi.conf" + +#: pisi/build.py:830 +msgid "Creating PiSi package %s." +msgstr "Création du paquet PiSi %s." + +#: pisi/build.py:875 pisi/delta.py:93 +msgid "Done." +msgstr "Terminé." + +#: pisi/build.py:881 +msgid "Abandoned files under the install dir (%s):" +msgstr "Fichiers abandonnés sous le répertoire d'installation (%s) :" + +#: pisi/build.py:885 +msgid "" +"All of the files under the install dir (%s) has been collected by package(s)" +msgstr "" +"Tous les fichiers sous le répertoire d'installation (%s) ont été collectés " +"par le(s) paquet(s)" + +#: pisi/build.py:889 +msgid "Cleaning Build Directory..." +msgstr "Nettoyage du Répertoire de Compilation..." + +#: pisi/build.py:892 +msgid "Keeping Build Directory" +msgstr "Répertoire de Compilation conservé" + +#: pisi/cli/__init__.py:76 +msgid "Warning: " +msgstr "Alerte :" + +#: pisi/cli/__init__.py:85 +msgid "Error: " +msgstr "Erreur :" + +#: pisi/cli/__init__.py:117 +msgid " (yes/no)" +msgstr " (oui/non)" + +#: pisi/cli/__init__.py:138 +msgid " [complete]\n" +msgstr " [fini]\n" + +#: pisi/cli/__init__.py:148 +msgid "Installed %s" +msgstr "%s installé" + +#: pisi/cli/__init__.py:150 +msgid "Removed %s" +msgstr "%s supprimé" + +#: pisi/cli/__init__.py:152 +msgid "Upgraded %s" +msgstr "%s mis à jour" + +#: pisi/cli/__init__.py:154 +msgid "Configured %s" +msgstr "%s configuré" + +#: pisi/cli/__init__.py:156 +msgid "Extracting the files of %s" +msgstr "Extraction des fichiers de %s" + +#: pisi/cli/commands.py:92 +msgid "generic help string for any command" +msgstr "chaîne d'aide générique pour tout commande" + +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 +msgid "Unrecognized command: %s" +msgstr "Commande non reconnue : %s" + +#: pisi/cli/commands.py:143 +msgid "common options" +msgstr "options communes" + +#: pisi/cli/commands.py:146 +msgid "general options" +msgstr "options générales" + +#: pisi/cli/commands.py:149 +msgid "Change the system root for PiSi commands" +msgstr "Change la racine système pour les commandes PiSi" + +#: pisi/cli/commands.py:151 +msgid "Assume yes in all yes/no queries" +msgstr "Assume oui pour toutes les questions oui/non" + +#: pisi/cli/commands.py:156 +msgid "Detailed output" +msgstr "Affichage détaillé du retour" + +#: pisi/cli/commands.py:158 +msgid "Show debugging information" +msgstr "Montrer les informations de déverminage" + +#: pisi/cli/commands.py:160 +msgid "Suppresses all coloring of PiSi's output" +msgstr "Supprime toute coloration dans les retours de PiSi." + +#: pisi/cli/commands.py:167 +msgid "" +"This is a fall back function. If the implementer module provides an\n" +" options function it will be called" +msgstr "" +"Ceci est une fonction de secours. Si le module implémenteur fourni une\n" +" fonction d'options elle sera appelée" + +#: pisi/cli/commands.py:179 +msgid "Destination directory %s does not exist. Creating directory.\n" +msgstr "Répertoire de destination %s n'existe pas. Création du répertoire.\n" + +#: pisi/cli/commands.py:201 +msgid "Password: " +msgstr "Mot de passe : " + +#: pisi/cli/commands.py:207 +msgid "initialize PiSi components" +msgstr "Initialisation des composants PiSi" + +#: pisi/cli/commands.py:215 +msgid "do cleanup work for PiSi components" +msgstr "Effectue les travaux de nettoyage des composants de PiSi" + +#: pisi/cli/commands.py:229 +msgid "print help for the command" +msgstr "Affiche l'aide de la commande" + +#: pisi/cli/commands.py:235 +msgid "exit program" +msgstr "Sort du programme" + +#: pisi/cli/commands.py:237 +msgid "Command terminated abnormally." +msgstr "La commande s'est achevée anormalement." + +#: pisi/cli/commands.py:247 +msgid "Command lacks name" +msgstr "La commande n'a pas de nom" + +#: pisi/cli/commands.py:251 +msgid "Duplicate command %s" +msgstr "Commande %s dupliquée" + +#: pisi/cli/commands.py:260 +msgid "" +"Prints help for given commands\n" +"\n" +"Usage: help [ ... ]\n" +"\n" +"If run without parameters, it prints the general help." +msgstr "" +"Affiche l'aide pour les commandes données\n" +"\n" +"Utilisation : help [ ... ]\n" +"\n" +"Affiche l'aide générale si lancée sans paramètres." + +#: pisi/cli/commands.py:294 +msgid "" +"Clean stale locks\n" +"\n" +"Usage: clean\n" +"\n" +"PiSi uses filesystem locks for managing database access.\n" +"This command deletes unused locks from the database directory." +msgstr "" +"Nettoie les verrous orphelins\n" +"\n" +"Utilisation : clean\n" +"\n" +"PiSi utilise des verrous du système de fichier pour gérer\n" +"l'accès à la base de données. Cette commande supprime\n" +"les verrous inutilisés du répertoire de la base." + +#: pisi/cli/commands.py:313 +msgid "" +"Delete cache files\n" +"\n" +"Usage: delete-cache\n" +"\n" +"Sources, packages and temporary files are stored\n" +"under /var directory. Since these accumulate they can\n" +"consume a lot of disk space." +msgstr "" +"Supprime les fichiers du cache\n" +"\n" +"Utilisation : delete-cache\n" +"\n" +"Les sources, paquets et fichier temporaires sont\n" +"stockés dans le répertoire /var. Comme ils s'accumulent\n" +"ils peuvent finir par occuper beaucoup d'espace disque." + +#: pisi/cli/commands.py:334 +msgid "" +"Graph package relations\n" +"\n" +"Usage: graph [ ...]\n" +"\n" +"Write a graph of package relations, tracking dependency and\n" +"conflicts relations starting from given packages. By default\n" +"shows the package relations among repository packages, and writes\n" +"the package in graphviz format to 'pgraph.dot'.\n" +msgstr "" +"Dessine les relations entre paquets\n" +"\n" +"Utilisation : graph [ ... ]\n" +"\n" +"Affiche un graphe des relations du paquets, recherchant les\n" +"dépendances et les relations conflictuelles en partant des paquets\n" +"donnés. Montre par défaut les relations entre les paquets du dépôt,\n" +"et écrit le paquet au format graphviz dans 'pgraph.dot'.\n" + +#: pisi/cli/commands.py:351 +msgid "graph options" +msgstr "Options du graphe" + +#: pisi/cli/commands.py:355 +msgid "Specify a particular repository" +msgstr "Spécifier un dépôt en particulier" + +#: pisi/cli/commands.py:358 +msgid "Graph of installed packages" +msgstr "Graphe des paquets installés" + +#: pisi/cli/commands.py:361 +msgid "Do not show installed packages" +msgstr "Ne pas montrer les paquets installés" + +#: pisi/cli/commands.py:364 +msgid "Dot output file" +msgstr "fichier de sortie dot" + +#: pisi/cli/commands.py:375 +msgid "Plotting packages in repository %s" +msgstr "Tracé des paquets du dépôt %s" + +#: pisi/cli/commands.py:381 +msgid "Plotting a graph of relations among all repository packages" +msgstr "Tracé du graphe des relations entre tous les paquets du dépôt" + +#: pisi/cli/commands.py:388 +msgid "Plotting a graph of relations among all installed packages" +msgstr "Tracé du graphe de relations entre tous les paquets installés" + +#: pisi/cli/commands.py:400 +msgid "Do not take build no into account." +msgstr "Ne pas prendre en compte le numéro de build." + +#: pisi/cli/commands.py:405 +msgid "Do not take dependency information into account" +msgstr "Ne pas prendre les informations de dépendance en compte" + +#: pisi/cli/commands.py:409 +msgid "" +"Build PiSi packages\n" +"\n" +"Usage: build [ | ] ...\n" +"\n" +"You can give a URI of the pspec.xml file. PiSi will\n" +"fetch all necessary files and build the package for you.\n" +"\n" +"Alternatively, you can give the name of a source package\n" +"to be downloaded from a repository containing sources.\n" +msgstr "" +"Construire les paquets PiSi\n" +"\n" +"Utilisation : build [ | ]...\n" +"\n" +"Vous pouvez donnez une URI du fichier pspec.xml. PiSi\n" +"recherchera toutes les fichiers nécessaires et compilera le\n" +"paquet pour vous.\n" +"\n" +"Vous pouvez également donné le nom d'un paquet de source\n" +"à télécharger depuis un dépôt contenant les sources.\n" + +#: pisi/cli/commands.py:432 +msgid "build options" +msgstr "options de compilation" + +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 +msgid "Output directory for produced packages" +msgstr "Répertoire acceuillant les paquets produits" + +#: pisi/cli/commands.py:443 +msgid "Bypass errors from ActionsAPI" +msgstr "Passe outre les erreurs d'ActionsAPI" + +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 +msgid "Bypass safety switch" +msgstr "Passe outre les précautions de sécurité" + +#: pisi/cli/commands.py:447 +#, fuzzy +msgid "Bypass testing step" +msgstr "Passe outre les précautions de sécurité" + +#: pisi/cli/commands.py:449 +msgid "Create a static package with ar files" +msgstr "Création d'un paquet statique avec des fichier ar" + +#: pisi/cli/commands.py:451 +msgid "" +"Do not install build dependencies, fail if a build dependency is present" +msgstr "" +"N'installe pas les dépendances de compilation, échoue en présence d'une " +"dépendance de compilation" + +#: pisi/cli/commands.py:453 +msgid "PiSi binary package formats: '1.0', '1.1' (default)" +msgstr "formats de paquets binaires PiSi : '1.0', '1.1' (par défaut)" + +#: pisi/cli/commands.py:456 +msgid "build steps" +msgstr "étapes de compilation" + +#: pisi/cli/commands.py:458 +msgid "Break build after fetching the source archive" +msgstr "Se contente de télécharger le code source" + +#: pisi/cli/commands.py:460 +msgid "" +"Break build after unpacking the source archive, checking sha1sum and " +"applying patches" +msgstr "" +"Se contente de télécharger le code source, vérifier son intégrité avec " +"sha1sum et appliquer les patchs" + +#: pisi/cli/commands.py:462 +msgid "Break build after running configure step" +msgstr "" +"Arrête le processus de construction du paquet après le lancement de configure" + +#: pisi/cli/commands.py:464 +msgid "Break build after running compile step" +msgstr "" +"Arrête le processus de construction du paquet après la compilation du source" + +#: pisi/cli/commands.py:466 +#, fuzzy +msgid "Break build after running check step" +msgstr "" +"Arrête le processus de construction du paquet après la compilation du source" + +#: pisi/cli/commands.py:468 +msgid "Break build after running install step" +msgstr "" +"Arrête le process de construction du paquet après l'exécution de l'install" + +#: pisi/cli/commands.py:470 +msgid "create PiSi package" +msgstr "Crée le paquet PiSi" + +#: pisi/cli/commands.py:484 +msgid "package_format must be one of %s " +msgstr "package_format doît être l'un de %s " + +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 +msgid "Output directory: %s" +msgstr "Répertoire de sortie : %s" + +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 +msgid "Outputting packages in the working directory." +msgstr "Génération des paquets dans le répertoire de travail." + +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +#, fuzzy +msgid "delta options" +msgstr "options d'index" + +#: pisi/cli/commands.py:549 +msgid "" +"Build and install PiSi source packages from repository\n" +"\n" +"Usage: emerge ...\n" +"\n" +"You should give the name of a source package to be\n" +"downloaded from a repository containing sources.\n" +"\n" +"You can also give the name of a component.\n" +msgstr "" +"Construit et installe des paquets source PiSi depuis le dépôt\n" +"\n" +"Utilisation : emerge ...\n" +"\n" +"Il vous faut donner le nom d'un paquet source à télécharger\n" +"depuis un dépôt contenant les sources.\n" +"\n" +"Vous pouvez également donné le nom d'un composant.\n" + +#: pisi/cli/commands.py:568 +msgid "emerge options" +msgstr "options d'emerge" + +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 +msgid "Ignore file conflicts" +msgstr "Ignorer les conflits de fichiers" + +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 +msgid "Ignore package conflicts" +msgstr "Ignorer les conflits de paquets" + +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 +msgid "Bypass comar configuration agent" +msgstr "Passer outre l'agent de configuration comar" + +#: pisi/cli/commands.py:587 +msgid "Outputting binary packages in the package cache." +msgstr "Génération de paquets binaires dans le cache de paquets." + +#: pisi/cli/commands.py:595 +msgid "Abstract package operation command" +msgstr "Commande d'opération de paquet abstrait" + +#: pisi/cli/commands.py:608 +msgid "Do not perform any action, just show what would be done" +msgstr "Ne rien faire, juste montrer ce qui serait fait" + +#: pisi/cli/commands.py:619 +msgid "" +"Install PiSi packages\n" +"\n" +"Usage: install ... \n" +"\n" +"You may use filenames, URI's or package names for packages. If you have\n" +"specified a package name, it should exist in a specified repository.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Installer des paquets PiSi\n" +"\n" +"Utilisation : install ... \n" +"\n" +"Vous pouvez utiliser des noms de fichier, des URI ou des noms de paquets\n" +"comme arguments. Si vous avez spécifié un nom de paquet, ils doit exister\n" +"dans un dépôt spécifié.\n" +"\n" +"Vous pouvez également spécifiers des composants au lieu de nom de paquets,\n" +"ils seront complétés en nom de paquets.\n" + +#: pisi/cli/commands.py:637 +msgid "install options" +msgstr "Options d'installation" + +#: pisi/cli/commands.py:642 +msgid "Reinstall already installed packages" +msgstr "Ré-installer les paquets déjà installés." + +#: pisi/cli/commands.py:648 +msgid "Install component's and recursive components' packages" +msgstr "" +"Installer les paquets du composant, et les ceux des composants récursifs" + +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 +msgid "Fetch upgrades but do not install." +msgstr "Chercher les mises à jour mais ne pas les installer." + +#: pisi/cli/commands.py:677 +msgid "" +"Upgrade PiSi packages\n" +"\n" +"Usage: Upgrade [ ... ]\n" +"\n" +": package name\n" +"\n" +"Upgrades the entire system if no package names are given\n" +"\n" +"You may use only package names to specify packages because\n" +"the package upgrade operation is defined only with respect\n" +"to repositories. If you have specified a package name, it\n" +"should exist in the package repositories. If you just want to\n" +"reinstall a package from a PiSi file, use the install command.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Mettre à jour les paquets PiSi\n" +"\n" +"Utilisation : Upgrade [ ... ]\n" +"\n" +": nom de paquet\n" +"\n" +"Met à jour la totalité du système si aucun nom de paquet n'est\n" +"fourni\n" +"\n" +"Il faut exclusivement spécifier des paquets car l'opération de mise\n" +"à jour de paquet est définie seulement vis à vis des dépôts.\n" +"Si vous avez spécifé un nom de paquet, il doit exister dans les\n" +"dêpots. Si vous voulez seulement réinstaller un paquet depuis\n" +"un fichier PiSi, utilisez la commande install.\n" +"\n" +"Vous pouvez également spécifier des composants au lieu de noms de\n" +"paquets, ils seront complétés en noms de paquets.\n" + +#: pisi/cli/commands.py:703 +msgid "upgrade options" +msgstr "options de mise à jour" + +#: pisi/cli/commands.py:708 +msgid "Security related package upgrades only" +msgstr "Seulement les mises à jour liées à la sécurité" + +#: pisi/cli/commands.py:710 +msgid "Do not update repositories" +msgstr "Ne pas mettre à jour les dépôts" + +#: pisi/cli/commands.py:716 +msgid "Upgrade component's and recursive components' packages" +msgstr "Mettre à jour les paquets du composant et les composants récursifs" + +#: pisi/cli/commands.py:720 +msgid "" +"When upgrading system, ignore packages and components whose basenames match " +"pattern." +msgstr "" +"Ignorer les paquet et les composants dont le nom de base correspon au patron " +"lors de la mise à jour du système." + +#: pisi/cli/commands.py:722 +msgid "" +"When upgrading system, ignore packages and components whose " +"basenames match any pattern contained in file." +msgstr "" +"Ignore les paquets et les composants dont les noms de base " +"correspondent aux patrons contenus dans le fichier lors de la mise à jour," + +#: pisi/cli/commands.py:766 +msgid "Updating repositories" +msgstr "Mise à jour des dépôts" + +#: pisi/cli/commands.py:771 +msgid "Will not update repositories" +msgstr "Les dépots ne seront pas mis à jours" + +#: pisi/cli/commands.py:796 +msgid "" +"Remove PiSi packages\n" +"\n" +"Usage: remove ... \n" +"\n" +"Remove package(s) from your system. Just give the package names to remove.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Supprimer les paquets PiSi\n" +"\n" +"Utilisation : remove ... \n" +"\n" +"Supprime les paquet(s) de votre système. Il suffit de donner le nom des " +"paquets\n" +"à supprimer\n" +"\n" +"Vous pouvez également spécifier des composants au lieu de noms de paquets,\n" +"ils seront complétés en nom de paquets.\n" + +#: pisi/cli/commands.py:813 +msgid "remove options" +msgstr "Options de suppression" + +#: pisi/cli/commands.py:816 +msgid "Remove component's and recursive components' packages" +msgstr "Supprime les paquets du composant et des composants récursifs" + +#: pisi/cli/commands.py:838 +msgid "" +"Configure pending packages\n" +"\n" +"If COMAR configuration of some packages were not\n" +"done at installation time, they are added to a list\n" +"of packages waiting to be configured. This command\n" +"configures those packages.\n" +msgstr "" +"Configure les paquets en attente\n" +"\n" +"Si la configuration de certains paquets par COMAR ne\n" +"s'est pas faite à l'installation, ils sont ajouter à une liste\n" +"des paquets en attente de configuration. Cette commande\n" +"configure ces paquets en question.\n" + +#: pisi/cli/commands.py:854 +msgid "configure-pending options" +msgstr "Options de configuration des paquets en attente (configure-pending)" + +#: pisi/cli/commands.py:866 +msgid "" +"Display package information\n" +"\n" +"Usage: info ... \n" +"\n" +" is either a package name or a .pisi file,\n" +msgstr "" +"Affiche les informations du paquet\n" +"\n" +"Utilisation : info ... \n" +"\n" +" est soit un nom de paquet, soit un fichier .pisi.\n" + +#: pisi/cli/commands.py:881 +msgid "info options" +msgstr "options d'info" + +#: pisi/cli/commands.py:888 +msgid "Show a list of package files." +msgstr "Montre une liste de fichiers de paquets." + +#: pisi/cli/commands.py:890 +msgid "Info about the given component" +msgstr "Infos à propos du composant donné" + +#: pisi/cli/commands.py:893 +msgid "Show only paths." +msgstr "Montre seulement les chemins." + +#: pisi/cli/commands.py:895 +msgid "Do not show details" +msgstr "Ne pas montrer les détails" + +#: pisi/cli/commands.py:897 +msgid "Output in xml format" +msgstr "La sortie s'effectue au format xml" + +#: pisi/cli/commands.py:943 +msgid "Package file: %s" +msgstr "Fichier paquet : %s" + +#: pisi/cli/commands.py:949 +msgid "[inst] " +msgstr "[inst] " + +#: pisi/cli/commands.py:951 +msgid "Installed package:" +msgstr "Paquets installés :" + +#: pisi/cli/commands.py:957 +msgid "[repo] " +msgstr "[dépôt]" + +#: pisi/cli/commands.py:959 +#, fuzzy +msgid "Package found in %s repository:" +msgstr "Paquet trouvé dans le dépôt :" + +#: pisi/cli/commands.py:963 +msgid "%s is not found in repositories" +msgstr "%s est introuvable dans les dépôts" + +#: pisi/cli/commands.py:966 +msgid "%s is not installed" +msgstr "%s n'est pas installé" + +#: pisi/cli/commands.py:979 +msgid "Reverse Dependencies:" +msgstr "Dépendances inverses : " + +#: pisi/cli/commands.py:982 +msgid "" +"\n" +"Files:" +msgstr "" +"\n" +"Fichiers :" + +#: pisi/cli/commands.py:990 +msgid "File information not available" +msgstr "Les informations concernant les fichiers n'est pas disponible" + +#: pisi/cli/commands.py:996 +msgid "" +"Verify installation\n" +"\n" +"Usage: check [ ... ]\n" +"\n" +": package name\n" +"\n" +"A cryptographic checksum is stored for each installed\n" +"file. Check command uses the checksums to verify a package.\n" +"Just give the names of packages.\n" +"\n" +"If no packages are given, checks all installed packages.\n" +msgstr "" +"Vérifie l'installation\n" +"\n" +"Utilisation : check [ ... ]\n" +"\n" +" : nom de paquet\n" +"\n" +"Une somme de contrôle cryptée est stockée pour chacun des\n" +"fichiers installés. La commande check utilise ces sommes de\n" +"contôle pour vérifier un paquet.\n" +"Il suffit juste de donne les noms de paquets à vérifier.\n" +"\n" +"Si aucun paquet n'est donné, vérifie l'intégralité des paquets\n" +"installés.\n" + +#: pisi/cli/commands.py:1016 +#, fuzzy +msgid "check options" +msgstr "Options de search" + +#: pisi/cli/commands.py:1018 +#, fuzzy +msgid "Check installed packages under given component" +msgstr "Lister les paquets installé pour le composant donné" + +#: pisi/cli/commands.py:1034 +msgid "Checking all installed packages" +msgstr "Vérification de tous les paquets installés" + +#: pisi/cli/commands.py:1038 +msgid "* Checking %s... " +msgstr "* Vérification de %s... " + +#: pisi/cli/commands.py:1042 +msgid "" +"\n" +"Package %s is corrupt." +msgstr "" +"\n" +"Le paquet %s est corrompu." + +#: pisi/cli/commands.py:1046 +msgid "Package %s not installed" +msgstr "Le paquet %s n'est pas installé" + +#: pisi/cli/commands.py:1051 +msgid "" +"Index PiSi files in a given directory\n" +"\n" +"Usage: index ...\n" +"\n" +"This command searches for all PiSi files in a directory, collects PiSi\n" +"tags from them and accumulates the information in an output XML file,\n" +"named by default 'pisi-index.xml'. In particular, it indexes both\n" +"source and binary packages.\n" +"\n" +"If you give multiple directories, the command still works, but puts\n" +"everything in a single index file.\n" +msgstr "" +"Indexe les fichiers PiSi dans le répertoire donné\n" +"\n" +"Utilisation : index ...\n" +"\n" +"Cette commande recherche tous les fichiers PiSi dans un répertoire, \n" +"collecte leurs balises PiSi et aggrége les informations contenues au\n" +"format XML dans un fichier (pisi-index.xml par défaut). Plus\n" +"précisément, cette commande indexe à la fois les paquets sources et\n" +"binaires.\n" +"\n" +"La commande fonctionne si vous indiquez plusieurs répertoires, mais\n" +"produit un seul fichier d'index contenant toutes les informations.\n" + +#: pisi/cli/commands.py:1072 +msgid "index options" +msgstr "options d'index" + +#: pisi/cli/commands.py:1076 +msgid "Store absolute links for indexed files." +msgstr "Stocker des liens absolus pour les fichiers indexés." + +#: pisi/cli/commands.py:1079 +msgid "Index output file" +msgstr "Fichier de sortie d'index." + +#: pisi/cli/commands.py:1082 +msgid "Do not index PiSi spec files." +msgstr "Ne pas indexer les fichiers spec PiSi." + +#: pisi/cli/commands.py:1085 +msgid "Do not sign index." +msgstr "Ne pas signer l'index." + +#: pisi/cli/commands.py:1098 +msgid "Indexing current directory." +msgstr "Indexer le répertoire courant." + +#: pisi/cli/commands.py:1106 +msgid "" +"Print the list of all installed packages\n" +"\n" +"Usage: list-installed\n" +msgstr "" +"Afficher la liste de tous les paquets installés\n" +"\n" +"Utilisation : list-installed\n" + +#: pisi/cli/commands.py:1120 +msgid "list-installed options" +msgstr "Options de list-installed" + +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 +msgid "Show in long format" +msgstr "Montrer au format long" + +#: pisi/cli/commands.py:1125 +msgid "List installed packages under given component" +msgstr "Lister les paquets installé pour le composant donné" + +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 +msgid "Show detailed install info" +msgstr "Montrer les informations détaillées de l'installation" + +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 +msgid "" +"Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "Paquet Nom |St| Version| Rel.| Build| Distro| Date" + +#: pisi/cli/commands.py:1159 +msgid "" +"Rebuild Databases\n" +"\n" +"Usage: rebuilddb [ ... ]\n" +"\n" +"Rebuilds the PiSi databases\n" +"\n" +"If package specs are given, they should be the names of package\n" +"dirs under /var/lib/pisi\n" +msgstr "" +"Reconstruire les bases de données\n" +"\n" +"Utilisation : rebuilddb [ ... ]\n" +"\n" +"Reconstrui les bases de données PiSi\n" +"\n" +"Si les specs de paquets sont données, ils devraient correspondrent\n" +"aux noms des répertoires de paquets sous /var/lib/pisi\n" + +#: pisi/cli/commands.py:1177 +msgid "rebuild-db options" +msgstr "Options de rebuild-db" + +#: pisi/cli/commands.py:1180 +msgid "Rebuild files database" +msgstr "Reconstruction de la base de données fichiers" + +#: pisi/cli/commands.py:1191 +msgid "Rebuild PiSi databases?" +msgstr "Reconstruire les bases de données de PiSi ?" + +#: pisi/cli/commands.py:1198 +msgid "" +"Update repository databases\n" +"\n" +"Usage: update-repo [ ... ]\n" +"\n" +": repository name\n" +"\n" +"Synchronizes the PiSi databases with the current repository.\n" +"If no repository is given, all repositories are updated.\n" +msgstr "" +"Mise à jour des bases de données de depôt\n" +"\n" +"Utilisation : update-repo [ ... ]\n" +"\n" +" : nom de répertoire\n" +"\n" +"Synchronise les bases de données de PiSi avec le dépôt donné.\n" +"Si aucun dépôt n'est donné, tous les dépôts sont mis à jours.\n" + +#: pisi/cli/commands.py:1216 +msgid "update-repo options" +msgstr "Options de update-repo" + +#: pisi/cli/commands.py:1220 +msgid "Update database in any case" +msgstr "Mise à jour de la base de données quoi qu'il arrive" + +#: pisi/cli/commands.py:1238 +msgid "" +"Add a repository\n" +"\n" +"Usage: add-repo \n" +"\n" +": name of repository to add\n" +": URI of index file\n" +"\n" +"If no repo is given, add-repo pardus-devel repo is added by default\n" +"\n" +"NB: We support only local files (e.g., /a/b/c) and http:// URIs at the " +"moment\n" +msgstr "" +"Ajouter un dépôt\n" +"\n" +"Utilisation : add-repo \n" +"\n" +" : nom du dépôt à ajouter\n" +" : URI du fichier d'index\n" +"\n" +"Si aucun dépôt n'est donné, add-repo ajoute le dépôt pardus-devel par " +"défaut\n" +"\n" +"NB : Pour l'instant seuls les fichiers locaux (e.g., /a/b/c) et les URI http " +"sont\n" +"supportées\n" + +#: pisi/cli/commands.py:1258 +msgid "add-repo options" +msgstr "Options d'add-repo" + +#: pisi/cli/commands.py:1261 +msgid "Add repository at given position (0 is first)" +msgstr "Ajouter un dépôt à la position donnée (0 est la première)" + +#: pisi/cli/commands.py:1275 +msgid "Update PiSi database for repository %s?" +msgstr "Mettre à jour la base de données PiSi pour le dépôt %s ?" + +#: pisi/cli/commands.py:1279 +msgid "%s repository could not be reached. Removing %s from system." +msgstr "Impossible d'atteindre le dépôt %s. Suppression de %s du système." + +#: pisi/cli/commands.py:1288 +msgid "" +"Remove repositories\n" +"\n" +"Usage: remove-repo ... \n" +"\n" +"Remove all repository information from the system.\n" +msgstr "" +"Suppression de dépôts\n" +"\n" +"Utilisation : remove-repo ... \n" +"\n" +"Supprime toutes les informations liées au dépôt du système.\n" + +#: pisi/cli/commands.py:1314 +msgid "" +"List repositories\n" +"\n" +"Usage: list-repo\n" +"\n" +"Lists currently tracked repositories.\n" +msgstr "" +"Liste les dépôts\n" +"\n" +"Utilisation : list-repo\n" +"\n" +"Liste les dépôts actuellement suivis.\n" + +#: pisi/cli/commands.py:1337 +msgid "" +"List available packages in the repositories\n" +"\n" +"Usage: list-available [ ... repon ]\n" +"\n" +"Gives a brief list of PiSi packages published in the specified\n" +"repositories. If no repository is specified, we list packages in\n" +"all repositories.\n" +msgstr "" +"Liste les paquets disponibles dans les dépôts\n" +"\n" +"Utilisation : list-available [ ... ]\n" +"\n" +"Donner une liste brève des paquets PiSi publiés dans les dépôts\n" +"donnés. Si aucun dépôt n'est spécifié, liste les paquets de tous\n" +"les dépôts.\n" + +#: pisi/cli/commands.py:1354 +msgid "list-available options" +msgstr "Options de list-available" + +#: pisi/cli/commands.py:1358 +msgid "List available packages under given component" +msgstr "Liste les paquets disponibles pour un composant donné" + +#: pisi/cli/commands.py:1360 +msgid "Show uninstalled packages only" +msgstr "Montre seulement les paquets désinstallés" + +#: pisi/cli/commands.py:1368 +msgid "Installed packages are shown in this color" +msgstr "Les paquêts installés sont indiqués avec cette couleur" + +#: pisi/cli/commands.py:1376 +msgid "Repository : %s\n" +msgstr "Dépôt : %s\n" + +#: pisi/cli/commands.py:1403 +msgid "" +"List available components\n" +"\n" +"Usage: list-components\n" +"\n" +"Gives a brief list of PiSi components published in the\n" +"repositories.\n" +msgstr "" +"Liste les composants disponibles\n" +"\n" +"Utilisation : list-components\n" +"\n" +"Donne une liste brêve des composants PiSi publiés\n" +"dans les dépôts.\n" + +#: pisi/cli/commands.py:1418 +msgid "list-components options" +msgstr "Options de list-components" + +#: pisi/cli/commands.py:1443 +msgid "" +"List available sources\n" +"\n" +"Usage: list-sources\n" +"\n" +"Gives a brief list of sources published in the repositories.\n" +msgstr "" +"Liste les sources disponibles\n" +"\n" +"Utilisation : list-sources\n" +"\n" +"Donnes une brève liste des sources publiées dans les dépôts.\n" + +#: pisi/cli/commands.py:1457 +msgid "list-sources options" +msgstr "Options de list-sources" + +#: pisi/cli/commands.py:1482 +msgid "" +"List packages to be upgraded\n" +"\n" +"Usage: list-upgrades\n" +"\n" +"Lists the packages that will be upgraded.\n" +msgstr "" +"Liste les paquets à mettre à jour\n" +"\n" +"Utilisation : list-upgrades\n" +"\n" +"Liste les paquets qui vont être mis à jour.\n" + +#: pisi/cli/commands.py:1496 +msgid "list-upgrades options" +msgstr "Options de list-upgrades" + +#: pisi/cli/commands.py:1501 +msgid "List upgradable packages under given component" +msgstr "" +"Liste les paquets pouvant être mis à jour concernant un composant donné" + +#: pisi/cli/commands.py:1518 pisi/operations.py:460 +msgid "No packages to upgrade." +msgstr "Pas de paquet à mettre à jour." + +#: pisi/cli/commands.py:1538 +msgid "" +"List pending packages\n" +"\n" +"Lists packages waiting to be configured.\n" +msgstr "" +"Liste les paquets en attente\n" +"\n" +"Liste les paquet en attente de configuration.\n" + +#: pisi/cli/commands.py:1560 +msgid "There are no packages waiting to be configured" +msgstr "Il n'y a aucun paquet en attente de configuration" + +#: pisi/cli/commands.py:1565 +msgid "" +"Search packages\n" +"\n" +"Usage: search ... \n" +"\n" +"Finds a package containing specified search terms\n" +"in summary, description, and package name fields.\n" +msgstr "" +"Recherche de paquets\n" +"\n" +"Utilisation : search ... \n" +"\n" +"Trouve un paquet contenant les termes recherchés\n" +"dans le sommaire, la description ou le nom du paquet.\n" + +#: pisi/cli/commands.py:1580 +msgid "search options" +msgstr "Options de search" + +#: pisi/cli/commands.py:1586 +msgid "Show details" +msgstr "Montrer les détails" + +#: pisi/cli/commands.py:1598 +msgid "%s packages found" +msgstr "%s paquets trouvés" + +#: pisi/cli/commands.py:1607 +msgid "" +"Search for a file\n" +"\n" +"Usage: search-file ... \n" +"\n" +"Finds the installed package which contains the specified file.\n" +msgstr "" +"Rechercher un fichier\n" +"\n" +"Utilisation : search-file ... \n" +"\n" +"Trouve le paquet installé contenant le fichier spécifié.\n" + +#: pisi/cli/commands.py:1621 +msgid "search-file options" +msgstr "Options pour search-file" + +#: pisi/cli/commands.py:1625 +msgid "Fuzzy search" +msgstr "Recherche floue" + +#: pisi/cli/commands.py:1627 +msgid "Show only package name" +msgstr "Montre seulement le nom de paquet" + +#: pisi/cli/commands.py:1648 +msgid "Package %s has file %s" +msgstr "Le paquet %s a le fichier %s" + +#: pisi/cli/commands.py:1650 +msgid "Type: %s, Hash: %s" +msgstr "Type : %s, Hash : %s" + +#: pisi/cli/commands.py:1653 +msgid "Path '%s' does not belong to an installed package" +msgstr "Le chemin %s n'appartient à aucun paquet installé" + +#: pisi/cli/commands.py:1666 +msgid "Searching for %s" +msgstr "Recherche pour %s" + +#: pisi/cli/commands.py:1676 +msgid "" +"%prog [options] [arguments]\n" +"\n" +"where is one of:\n" +"\n" +msgstr "" +"%prog [options] [arguments]\n" +"\n" +"où peut-être :\n" +"\n" + +#: pisi/cli/commands.py:1682 +msgid "" +"\n" +"Use \"%prog help \" for help on a specific command.\n" +msgstr "" +"\n" +"Utilisez \"%prog help \" pour une aide concernant une commande " +"spécifique.\n" + +#: pisi/cli/pisicli.py:56 +msgid "Options must precede non-option arguments" +msgstr "Les options doivent précéder les arguments qui n'en sont pas." + +#: pisi/cli/pisicli.py:97 +msgid "No command given" +msgstr "Aucune commande fournie" + +#: pisi/cli/pisicli.py:100 +msgid "Command line parsing error" +msgstr "Erreur d'analyse de la ligne de commande" + +#: pisi/comariface.py:54 +msgid "cannot connect to comar" +msgstr "Impossible de se connecter à comar" + +#: pisi/comariface.py:72 +msgid "Could not restart comar" +msgstr "Impossible de redémarrer comar" + +#: pisi/comariface.py:77 +msgid "connection with comar unexpectedly closed" +msgstr "La connection avec comar a été interrompue" + +#: pisi/comariface.py:90 +msgid "Configuration error: %s" +msgstr "Erreur de configuration : %s" + +#: pisi/comariface.py:92 +msgid "Script error: %s" +msgstr "Erreur de script : %s" + +#: pisi/comariface.py:94 +msgid "comar denied our access" +msgstr "comar nous a refusé l'accés" + +#: pisi/comariface.py:99 +msgid "Configuring %s package" +msgstr "Configuration du paquet %s" + +#: pisi/comariface.py:104 +msgid "Registering %s comar script" +msgstr "Enregistrement du script comar %s" + +#: pisi/comariface.py:110 +msgid "Calling post install handlers" +msgstr "Appel aux officiants de post-installation" + +#: pisi/comariface.py:115 +msgid "Running package's post install script" +msgstr "Lancement du script de post-installation du paquet" + +#: pisi/comariface.py:122 +msgid "Configuring %s package for removal" +msgstr "Configuration du paquet %s pour suppression" + +#: pisi/comariface.py:125 +msgid "Running package's pre remove script" +msgstr "Lancement du script de pré-suppression du paquet" + +#: pisi/comariface.py:129 +msgid "Calling pre remove handlers" +msgstr "Appel aux officiants de pré-suppression" + +#: pisi/comariface.py:133 +msgid "Unregistering comar scripts" +msgstr "Désenregistrement des scripts comar" + +#: pisi/component.py:105 pisi/component.py:111 +msgid "Component %s not found" +msgstr "Le composant %s est introuvable" + +#: pisi/component.py:207 pisi/component.py:233 +msgid "Information for component %s not available" +msgstr "Les informations concernant le composant %s ne sont pas disponibles" + +#: pisi/config.py:60 +msgid "Destination directory %s does not exist. Creating it." +msgstr "Le répertoire de destination %s n'existe pas. Création du répertoire." + +#: pisi/configfile.py:107 +msgid "No section by name '%s'" +msgstr "Pas de section au nom '%s'" + +#: pisi/conflict.py:39 pisi/dependency.py:40 +msgid " version >= " +msgstr " version >= " + +#: pisi/conflict.py:41 pisi/dependency.py:42 +msgid " version <= " +msgstr " version <= " + +#: pisi/conflict.py:43 pisi/dependency.py:44 +msgid " version " +msgstr " version " + +#: pisi/conflict.py:45 pisi/dependency.py:46 +msgid " release >= " +msgstr " release >= " + +#: pisi/conflict.py:47 pisi/dependency.py:48 +msgid " release <= " +msgstr " release <= " + +#: pisi/conflict.py:49 pisi/dependency.py:50 +msgid " release " +msgstr " release " + +#: pisi/constants.py:30 +msgid "Can't rebind constant: %s" +msgstr "Impossible de changer la valeur de la constante : %s" + +#: pisi/constants.py:36 +msgid "Can't unbind constant: %s" +msgstr "Impossible de désallouer la constante : %s" + +#: pisi/delta.py:27 +#, fuzzy +msgid "Cannot create delta for same package!" +msgstr "Impossible de créer le répertoire %s" + +#: pisi/delta.py:41 +#, fuzzy +msgid "Creating delta PiSi package between %s %s" +msgstr "Création du paquet PiSi %s." + +#: pisi/dependency.py:107 +msgid "%s dependency of package %s is not satisfied" +msgstr "La dépendance %s du paquet %s n'est pas satisfaite" + +#: pisi/dependency.py:120 +msgid "Package %s is not present in the package database" +msgstr "Le paquet %s n'est pas présent dans la base de données des paquets" + +#: pisi/fetcher.py:81 +msgid "Filename error" +msgstr "Erreur de nom de fichier" + +#: pisi/fetcher.py:84 +msgid "Access denied to write to destination directory: \"%s\"" +msgstr "Accès en écriture refusé pour le repertoire de destination : \"%s\"" + +#: pisi/fetcher.py:89 +msgid "Access denied to destination file: \"%s\"" +msgstr "Accès refusé au fichier de destination : \"%s\"" + +#: pisi/fetcher.py:100 +msgid "" +"A problem occured. Please check the archive address and/or permissions again." +msgstr "" +"Un problème est survenu. Veuillez vérifier l'adresse de l'archive et/ou ses " +"permissions une fois de plus s'il vous plaît." + +#: pisi/fetcher.py:158 +msgid "No such file or no permission to read" +msgstr "Fichier inexistant ou pas pour d'autorisation pour le lire" + +#: pisi/fetcher.py:182 +msgid "Requested range not satisfiable, starting again." +msgstr "Impossible de satisfaire la fourchette demandée, redémarrage." + +#: pisi/fetcher.py:189 +msgid "Cannot fetch %s; value error: %s" +msgstr "Impossible de télécharger %s; erreur numéro : %s" + +#: pisi/fetcher.py:191 pisi/fetcher.py:195 +msgid "Cannot fetch %s; %s" +msgstr "Impossible de télécharger %s; %s" + +#: pisi/fetcher.py:193 +msgid "Please check your network connections and try again. (%s)" +msgstr "Veuillez vérifier vos connections réseau et essayer de nouveau. (%s)" + +#: pisi/fetcher.py:197 +msgid "Cannot fetch %s; (%s): %s" +msgstr "Impossible de télécharger %s; (%s) : %s" + +#: pisi/fetcher.py:243 +msgid "Proxy configuration has been found for '%s' protocol" +msgstr "Une configuration de proxy a été trouvée pour le protocole %s" + +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 +msgid "ftp error" +msgstr "erreur ftp" + +#: pisi/file.py:66 +msgid "uri must have type either URI or string" +msgstr "uri doit être de type URI ou string" + +#: pisi/file.py:89 +msgid "zip compression not supported yet" +msgstr "La compression zip n'est pas encore supportée" + +#: pisi/file.py:117 +msgid "Fetching %s" +msgstr "Téléchargement de %s" + +#: pisi/file.py:122 +msgid "Copying %s to transfer dir" +msgstr "Copie de %s vers le répertoire de transfert" + +#: pisi/file.py:127 +msgid "File '%s' not found." +msgstr "Fichier '%s' introuvable." + +#: pisi/file.py:135 +msgid "File integrity of %s compromised." +msgstr "L'intégrité du fichier %s est compromise." + +#: pisi/file.py:155 +msgid "File mode must be either File.read or File.write" +msgstr "Le mode d'accès au fichier doit être soit File.read soit File.write" + +#: pisi/file.py:160 +msgid "Remote write not implemented" +msgstr "Écriture distante non implémentée" + +#: pisi/file.py:187 +msgid "gzip compression not supported yet" +msgstr "La compression gzip n'est pas encore supportée" + +#: pisi/file.py:202 pisi/file.py:205 +msgid "ERROR: gpg --detach-sig %s failed" +msgstr "ERREUR : gpg --detach-sig %s a échoué" + +#: pisi/graph.py:31 +msgid "Encountered cycle %s" +msgstr "Dépendance circulaire %s rencontrée" + +#: pisi/index.py:100 +msgid "Adding %s to component index" +msgstr "Ajout du composant %s à l'index" + +#: pisi/index.py:112 +msgid "Adding %s to package index" +msgstr "Ajout du paquet %s à l'index du paquet" + +#: pisi/index.py:126 +msgid "Updating package database of %s" +msgstr "Mise à jour de la base de données des paquets de %s" + +#: pisi/index.py:154 +msgid "Package %s: metadata corrupt, skipping..." +msgstr "Paquet %s : métadonnées corrompues, mis de côté..." + +#: pisi/index.py:193 +msgid "Adding %s to source index" +msgstr "Ajout de %s à l'index des sources" + +#: pisi/installdb.py:55 +msgid "installed" +msgstr "installé" + +#: pisi/installdb.py:55 +msgid "installed-pending" +msgstr "en attente d'installation" + +#: pisi/installdb.py:56 +msgid "purged" +msgstr "purgé" + +#: pisi/installdb.py:56 +msgid "removed" +msgstr "supprimé" + +#: pisi/installdb.py:59 +msgid "" +"State: %s\n" +"Version: %s, Release: %s, Build: %s\n" +msgstr "" +"État : %s\n" +"Version : %s, Release : %s, Build : %s\n" + +#: pisi/installdb.py:64 +msgid "Distribution: %s, Install Time: %s\n" +msgstr "Distribution : %s, Date d'installation : %s\n" + +#: pisi/installdb.py:151 +msgid "Already installed" +msgstr "Déjà installé" + +#: pisi/itembyrepodb.py:120 +msgid "Invalid repository string" +msgstr "Chaîne de dépôt invalide" + +#: pisi/itembyrepodb.py:142 +msgid "Key %s not found" +msgstr "Clef %s introuvable" + +#: pisi/itembyrepodb.py:152 +msgid "Key %s in repo %s not found" +msgstr "La Clef %s est introuvable dans le dépôt %s" + +#: pisi/lockeddbshelve.py:46 +msgid "Database version for %s insufficient. Please run rebuild-db command." +msgstr "" +"La version %s de la base de données est trop obsolète. Veuillez lancer la " +"commande rebuild-db s'il vous plaît." + +#: pisi/lockeddbshelve.py:50 +msgid "" +"Database version for %s greater than PiSi version. You need a newer PiSi." +msgstr "" +"La version %s est trop récente pour votre version de PiSi. Vous devez mettre " +"à jour PiSi." + +#: pisi/lockeddbshelve.py:61 +msgid "Cannot attain write access to database environment" +msgstr "" +"Impossible d'obtenir l'accès en écriture à l'environnement de la base de " +"données" + +#: pisi/lockeddbshelve.py:63 +msgid "Database version %s not present." +msgstr "La version de base de données %s n'est pas présente." + +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 +msgid "" +"Another instance of PiSi is running. Only one instance is allowed to modify " +"the PiSi database at a time." +msgstr "" +"Une autre instance de PiSi est en cours d'exécution. Une seule instance de " +"PiSi peut modifier la base de données à la fois." + +#: pisi/lockeddbshelve.py:80 +msgid "Cannot attain read access to database environment" +msgstr "" +"Impossible les droits de lecture à l'environnement de la base de données." + +#: pisi/lockeddbshelve.py:94 +msgid "" +"Cannot attain write access to PiSi database. You have to be root for this " +"operation." +msgstr "" +"Impossible d'obtenir les droits en écriture à la base de données de PiSi. " +"Vous devez être root pour cette opération." + +#: pisi/lockeddbshelve.py:112 +msgid "Cannot attain read or write access to database %s" +msgstr "" +"Impossible d'obtenir un accès en lecture ou en écriture à la base de données " +"%s" + +#: pisi/lockeddbshelve.py:138 +msgid "" +"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgstr "" +"Les fanions devraient être 'r, 'w', 'c', 'n' ou l'un des fanions de bsddb.db." +"DB_*" + +#: pisi/metadata.py:74 +msgid "Distribution: %s, Dist. Release: %s\n" +msgstr "Distribution: %s, Dist. Release: %s\n" + +#: pisi/metadata.py:76 +msgid "Architecture: %s, Installed Size: %s" +msgstr "Architecture : %s, Taille des fichiers installés : %s" + +#: pisi/mirrors.py:46 +msgid "Mirrors file %s does not exist. Could not resolve mirrors://" +msgstr "" +"Le fichier des mirroirs %s n'existe pas. Impossible de trouver les mirroirs." + +#: pisi/operations.py:107 +msgid "Mixing file names and package names not supported yet." +msgstr "" +"Mélanger des noms de fichiers et des noms de paquets n'est pas encore " +"supporté." + +#: pisi/operations.py:149 +msgid "" +"The following packages will be installed\n" +"in the respective order to satisfy extra dependencies:\n" +msgstr "" +"Les paquets suivants vont être installés\n" +"dans cet ordre afin de satisfaire des dépendances supplémentaires :\n" + +#: pisi/operations.py:152 pisi/operations.py:615 +msgid "Do you want to continue?" +msgstr "Voulez-vous continuer ?" + +#: pisi/operations.py:153 +msgid "External dependencies not satisfied" +msgstr "Dépendances externes non satisfaites" + +#: pisi/operations.py:165 pisi/operations.py:332 +msgid "No packages to install." +msgstr "Aucun paquet à installer." + +#: pisi/operations.py:196 +msgid "Installation order: " +msgstr "Ordre d'installation : " + +#: pisi/operations.py:250 pisi/operations.py:272 +msgid "Conflicts remain" +msgstr "Des conflits persistent" + +#: pisi/operations.py:260 +msgid "Selected packages [%s] are in conflict with each other." +msgstr "Les paquets [%s] sélectionnés sont en conflits." + +#: pisi/operations.py:266 +msgid "[%s conflicts with: %s]\n" +msgstr "[%s est en conflit avec %s]\n" + +#: pisi/operations.py:268 +msgid "" +"The following packages have conflicts:\n" +"%s" +msgstr "" +"Le paquet suivant suscite des conflits :\n" +"%s" + +#: pisi/operations.py:271 +msgid "Remove the following conflicting packages?" +msgstr "Supprimer les paquets en conlits suivants ?" + +#: pisi/operations.py:298 +msgid "Safety switch: Following packages in system.base will be installed: " +msgstr "" +"Précautions de sécurité : Les paquets suivants de system.base vont être " +"installés : " + +#: pisi/operations.py:304 +msgid "Safety switch: Following packages in system.base will be upgraded: " +msgstr "" +"Précaution de sécurité : Les paquets suivant de system.base vont être mis à " +"jours : " + +#: pisi/operations.py:310 pisi/operations.py:591 +msgid "Safety switch: the component system.base cannot be found" +msgstr "Précautions de sécurité : Le composant system.base est introuvable" + +#: pisi/operations.py:327 +msgid "" +"The following package(s) are already installed and are not going to be " +"installed again:\n" +msgstr "" +"Le(s) paquet(s) suivant(s) est/sont déjà installé(s) et ne sera/seront pas " +"installé(s) de nouveau.\n" + +#: pisi/operations.py:348 +msgid "" +"Following packages will be installed in the respective order to satisfy " +"dependencies:\n" +msgstr "" +"Les paquets suivants vont être installés dans cet ordre afin de satisfaire " +"des dépendances supplémentaires :\n" + +#: pisi/operations.py:353 pisi/operations.py:485 +msgid "Total size of package(s): %.2f %s" +msgstr "Taille totale du/des paquets(s) : %.2f %s" + +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 +msgid "There are extra packages due to dependencies. Do you want to continue?" +msgstr "" +"Il y a des paquets en plus à cause de dépendances. Voulez-vous continuer ?" + +#: pisi/operations.py:425 +msgid "Warning: package *name* ends with '.pisi'" +msgstr "Alerte : le *nom* du paquet fini par '.pisi'" + +#: pisi/operations.py:428 +msgid "Package %s is not installed." +msgstr "Le paquet %s n'est pas installé." + +#: pisi/operations.py:434 +msgid "Package %s is not available in repositories." +msgstr "Le paquet %s n'est pas disponible dans les dépôts." + +#: pisi/operations.py:447 +msgid "Package %s is already at the latest release %s." +msgstr "Le paquet %s est déjà dans sa version la plus récente %s." + +#: pisi/operations.py:453 +msgid "Package %s is already at the latest build %s." +msgstr "Le paquet %s est déjà à son build le plus récent %s." + +#: pisi/operations.py:480 +msgid "The following packages will be upgraded: " +msgstr "Le paquet suivant va être mis à jour :" + +#: pisi/operations.py:546 +msgid "Dependency %s of %s cannot be satisfied" +msgstr "La dépendance %s de %s ne peut-être satisfaite" + +#: pisi/operations.py:547 +msgid "Upgrade is not possible." +msgstr "La mise à jour est impossible." + +#: pisi/operations.py:562 +msgid "Reverse dependency %s of %s cannot be satisfied" +msgstr "La dépendance inverse %s de %s ne peut-être satisfaite" + +#: pisi/operations.py:587 +msgid "Safety switch: cannot remove the following packages in system.base: " +msgstr "" +"Précautions de sécurité : impossible de supprimer les paquets suivants de " +"system.base : " + +#: pisi/operations.py:598 +msgid "Package %s does not exist. Cannot remove." +msgstr "Le paquet %s n'existe pas. Impossible de le supprimer." + +#: pisi/operations.py:602 +msgid "No packages to remove." +msgstr "Aucun paquet à supprimer." + +#: pisi/operations.py:611 +msgid "" +"The following minimal list of packages will be removed\n" +"in the respective order to satisfy dependencies:\n" +msgstr "" +"La liste minimale suivante de paquet va être supprimée\n" +"en respectant cet ordre afin de satisfaire les dépendances :\n" + +#: pisi/operations.py:616 +msgid "Package removal declined" +msgstr "Suppression de paquet déclinée" + +#: pisi/operations.py:628 +msgid "Package %s is not installed. Cannot remove." +msgstr "Le paquet %s n'est pas installé. Impossible de le supprimer." + +#: pisi/operations.py:677 +msgid "No packages to emerge." +msgstr "Aucun paquet à émerger." + +#: pisi/operations.py:692 +msgid "" +"The following minimal list of packages will be installed\n" +"from repository in the respective order to satisfy dependencies:\n" +msgstr "" +"La liste suivante minimaliste de paquet va être installée\n" +"depuis le dépôt dans cet ordre afin de satisfaire les dépendances :\n" + +#: pisi/operations.py:695 +msgid "" +"The following minimal list of packages will be built and\n" +"installed in the respective order to satisfy dependencies:\n" +msgstr "" +"Les paquets de la liste minimaliste suivante vont être\n" +"construits et installé dans cet ordre afin de satisfaire les dépendances :\n" + +#: pisi/operations.py:737 +msgid "Cannot find source package: %s" +msgstr "Impossible de trouver le paquet source : %s" + +#: pisi/package.py:56 +msgid "" +"There was a problem while fetching '%s'.\n" +"The package may have been upgraded. Please try to upgrade the package." +msgstr "" +"Un problème est survenu lors du téléchargement de '%s'.\n" +"Le paquet a peut être été mis à jour. Essayez de mettre à jour de nouveau le " +"paquet." + +#: pisi/package.py:60 pisi/sourcearchive.py:92 +msgid "%s [cached]" +msgstr "%s [en cache]" + +#: pisi/package.py:136 +msgid "MetaData format wrong" +msgstr "Mauvais format de métadonnées" + +#: pisi/packagedb.py:65 +msgid "Package %s not found" +msgstr "Paquet %s introuvable" + +#: pisi/pxml/autoxml.py:79 +msgid "At least one '%s' tag should have local text" +msgstr "Au moins une balise '%s' devrait avoir du texte local" + +#: pisi/pxml/autoxml.py:86 +msgid "'%s' language of tag '%s' is empty" +msgstr "La balise '%2$s' est vide pour la langue '%1$s'" + +#: pisi/pxml/autoxml.py:114 +msgid "LocalText: unable to get either current or default locale" +msgstr "LocalText: Impossible d'obtenir la locale courante ni celle par défaut" + +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 +msgid "" +"Tag should have at least the current locale, or failing that an English or " +"Turkish version" +msgstr "" +"À défaut d'avoir la locale courante, la balise devrait au moins avoir une " +"version anglaise ou turque." + +#: pisi/pxml/autoxml.py:372 +msgid "autoxml.check: '%s' errors" +msgstr "autoxml.check : erreurs '%s'" + +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 +msgid "autoxml.parse: String '%s' has errors" +msgstr "autoxml.parse : La chaîne '%s' comporte des erreurs" + +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 +msgid "autoxml.read: File '%s' has errors" +msgstr "autoxml.read : Le fichier '%s' contient des erreurs" + +#: pisi/pxml/autoxml.py:465 +msgid "autoxml.write: object validation has failed" +msgstr "autoxml.write : la validation a échoué" + +#: pisi/pxml/autoxml.py:473 +msgid "autoxml.write: File encoding '%s' has errors" +msgstr "autoxml.write : L'encodage du fichier '%s' comporte des erreurs" + +#: pisi/pxml/autoxml.py:523 +msgid "gen_tag: unrecognized tag type %s in spec" +msgstr "gen_tag : type de balyse %s non reconnu dans la spec" + +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 +msgid "Mandatory variable %s not available" +msgstr "La variable obligatoire %s n'est pas disponible" + +#: pisi/pxml/autoxml.py:652 +msgid "Type mismatch: read text cannot be decoded" +msgstr "Problème de correspondance de types : Le texte lu ne peut être décodé" + +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 +msgid "Mandatory token %s not available" +msgstr "Item %s obligatoire non disponible" + +#: pisi/pxml/autoxml.py:670 +msgid "Type mismatch. Expected %s, got %s" +msgstr "Problème de correspondance de type. Attendu %s, reçu %s" + +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 +msgid "Type mismatch: DOM cannot be decoded" +msgstr "Problème de correspondance de type : Impossible de décoder le DOM" + +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 +msgid "Mandatory argument not available" +msgstr "Argument obligatoire non disponible" + +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 +msgid "Object cannot be encoded" +msgstr "L'objet ne peut être encodé" + +#: pisi/pxml/autoxml.py:741 +msgid "List type must contain only one element" +msgstr "La liste des type ne doit contenir qu'un seul élément" + +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 +msgid "Mandatory list \"%s\" under \"%s\" node is empty." +msgstr "La liste obligatoire \"%s\" sous le noeud \"%s\" est vide." + +#: pisi/pxml/xmlext.py:79 +msgid "getNodeText: Expected text node, got something else!" +msgstr "getNodeText : Attendait un noeud texte, reçu quelque chose d'autre !" + +#: pisi/pxml/xmlfile.py:63 +msgid "String '%s' has invalid XML" +msgstr "Chaîne '%s' contient un texte XML invalide" + +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 +msgid "File '%s' has invalid XML" +msgstr "Le fichier '%s' contient un texte XML invalide" + +#: pisi/repodb.py:73 +msgid "No repository named %s exists" +msgstr "Aucun dépôt %s n'existe" + +#: pisi/repodb.py:82 +msgid "Repository %s already exists" +msgstr "Le dépôt %s existe déjà" + +#: pisi/repodb.py:89 +msgid "Cannot add repository at position %s" +msgstr "Impossible d'ajout de dépôt à la position %s" + +#: pisi/scenarioapi/package.py:67 +msgid "No pisi package: %s* found." +msgstr "Pas de paquet pisi %s* trouvé." + +#: pisi/scenarioapi/repoops.py:28 +msgid "Repo already has package named %s." +msgstr "Un dépôt a déjà le paquet %s." + +#: pisi/scenarioapi/repoops.py:52 pisi/scenarioapi/repoops.py:59 +msgid "Repo does not have package named %s." +msgstr "Le dépôt n'a pas le paquet %s." + +#: pisi/sourcearchive.py:61 +msgid "Trying fallback address: %s" +msgstr "Essai avec l'adresse de secours : %s" + +#: pisi/sourcearchive.py:72 +msgid "%s mirrors are not defined." +msgstr "Les mirroirs %s ne sont pas définis." + +#: pisi/sourcearchive.py:77 +msgid "Fetching source from mirror: %s" +msgstr "Téléchargement de la source depuis le mirroir %s" + +#: pisi/sourcearchive.py:83 +msgid "Could not fetch source from %s mirrors." +msgstr "Impossible de télécharge la source depuis les mirroirs %s." + +#: pisi/sourcearchive.py:101 +msgid "unpack: check_file_hash failed" +msgstr "unpack : check_file_hash a échoué" + +#: pisi/sourcedb.py:59 pisi/sourcedb.py:65 +msgid "Source package %s not found" +msgstr "La paquet source %s est introuvable" + +#: pisi/specfile.py:140 +msgid "URI: %s, type: %s, sha1sum: %s" +msgstr "URI : %s, type : %s, sha1sum : %s" + +#: pisi/specfile.py:207 +msgid "Name: %s, version: %s, release: %s, build %s\n" +msgstr "Nom : %s, version : %s, release : %s, build %s\n" + +#: pisi/specfile.py:209 +msgid "Summary: %s\n" +msgstr "Résumé : %s\n" + +#: pisi/specfile.py:210 +msgid "Description: %s\n" +msgstr "Description : %s\n" + +#: pisi/specfile.py:211 +msgid "Component: %s\n" +msgstr "Composant : %s\n" + +#: pisi/specfile.py:212 +msgid "Provides: " +msgstr "Fournit : " + +#: pisi/specfile.py:216 +msgid "Dependencies: " +msgstr "Dépendances : " + +#: pisi/uri.py:80 +msgid "setAuthInfo needs a tuple (user, pass)" +msgstr "setAuthInfo a besoin d'un tuple (utilisateur, mot de passe)" + +#: pisi/util.py:122 pisi/util.py:143 +msgid "Running " +msgstr "En cours d'exécution" + +#: pisi/util.py:126 pisi/util.py:161 +msgid "return value for \"%s\" is %s" +msgstr "la valeur retournée pour \"%s\" est %s" + +#: pisi/util.py:361 +msgid "Including external link '%s'" +msgstr "Inclusion du lien externe '%s'" + +#: pisi/util.py:363 +msgid "Including directory '%s'" +msgstr "Inclusion du répertoire '%s'" + +#: pisi/util.py:448 +msgid "I/O Error: Cannot calculate SHA1 hash of %s" +msgstr "" +"Erreur d'Entrée/Sortie : Impossible de calculer la somme de contrôle SHA1 de " +"%s" + +#: pisi/util.py:459 +msgid "Cannot calculate SHA1 hash of given data" +msgstr "Impossible de calcule la somme de contrôle SHA1 des données spécifiées" + +#: pisi/util.py:498 +msgid "ERROR: patch (%s) failed" +msgstr "ERREUR : le patch (%s) a échoué" + +#: pisi/util.py:500 +msgid "ERROR: patch (%s) failed: %s" +msgstr "ERREUR : le patch (%s) a échoué : %s" + +#: pisi/util.py:546 +msgid "strip command failed for file '%s'!" +msgstr "La commande strip a échoué pour le fichier '%s'!" + +#: pisi/util.py:553 +msgid "objcopy (keep-debug) command failed for file '%s'!" +msgstr "objcopy (keep-debug) la commande a échoué pour le fichie'%s'!" + +#: pisi/util.py:559 +msgid "objcopy (add-debuglink) command failed for file '%s'!" +msgstr "objcopy (add-debuglink) La commande a échoué pour le fichier '%s'!" + +#: pisi/util.py:620 +msgid "Updating environment..." +msgstr "Mise à jour de l'environnement..." + +#: scripts/repostats.py:226 +msgid "" +"Duplicate binary packages:\n" +"%s\n" +"%s\n" +msgstr "" +"Paquets binaires dupliqués:\n" +"%s\n" +"%s\n" + +#: scripts/repostats.py:301 +msgid "" +"Duplicate source packages:\n" +"%s\n" +"%s\n" +msgstr "" +"Paquets sources dupliqués :\n" +"%s\n" +"%s\n" + +#: scripts/repostats.py:371 +msgid "" +"Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "" +"Le développeur '%s <%s>' a une autre adresse mail '%s' dans le paquet source " +"'%s'" + +#: scripts/repostats.py:467 +msgid "" +"Cannot parse '%s':\n" +"%s\n" +msgstr "" +"Impossible d'analyser '%s' :\n" +"%s\n" + +#: scripts/repostats.py:553 +msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" +msgstr "" +"Utilisation : repostats.py [OPTIONS] chemin-dépôt-source [chemin-dépôt-" +"binaire]\n" + +#: scripts/repostats.py:554 +msgid "Dont generate the web site.\n" +msgstr "Ne pas générer de site web.\n" + +#: scripts/repostats.py:575 +msgid "Scanning source repository...\n" +msgstr "Exploration du dépôt de sources...\n" + +#: scripts/repostats.py:579 +msgid "Scanning binary packages...\n" +msgstr "Exploration de paquets binaires...\n" + +#~ msgid "Set search language" +#~ msgstr "Établir la langue de la recherche" + +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Fichier de type inconnu %s dans le paquet '%s'" + +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Paquet source '%s' a un format de date erroné '%s'" + +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "%s erreurs rencontrées ! Correction immédiate exigée !\n" + +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "Les dépendances suivantes ne sont pas disponibles dans le dépôt :\n" diff --git a/po/it.po b/po/it.po new file mode 100644 index 00000000..e723a283 --- /dev/null +++ b/po/it.po @@ -0,0 +1,3077 @@ +# translation of it.po to Italian +# Copyright (C) YEAR ORGANIZATION +# +# Andrea Decorte , 2007. +msgid "" +msgstr "" +"Project-Id-Version: it\n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2007-04-25 14:47+0200\n" +"Last-Translator: Andrea Decorte \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: /usr/lib/python2.4/optparse.py:1 +msgid "" +"optparse - a powerful, extensible, and easy-to-use option parser.\n" +"\n" +"By Greg Ward \n" +"\n" +"Originally distributed as Optik; see http://optik.sourceforge.net/ .\n" +"\n" +"If you have problems with this module, please do not file bugs,\n" +"patches, or feature requests with Python; instead, use Optik's\n" +"SourceForge project page:\n" +" http://sourceforge.net/projects/optik\n" +"\n" +"For support, use the optik-users@lists.sourceforge.net mailing list\n" +"(http://lists.sourceforge.net/lists/listinfo/optik-users).\n" +msgstr "" +"optparse - un analizzatore (parser) di opzioni potente, estensibile e facile " +"da utilizzare.\n" +"\n" +"Di Greg Ward \n" +"\n" +"Distribuito originariamente come Optik; guarda http://optik.sourceforge." +"net/ .\n" +"\n" +"Se hai dei problemi con questo modulo, per favore non inviare bug,\n" +"patch, o richieste di nuove funzioni nella pagina di Python; usa invece la\n" +"pagina di progetto di Optik su SourceForge:\n" +" http://sourceforge.net/projects/optik\n" +"\n" +"Per supporto, usa la mailing list optik-users@lists.sourceforge.net\n" +"(http://lists.sourceforge.net/lists/listinfo/optik-users).\n" + +#: /usr/lib/python2.4/optparse.py:93 +msgid "" +"\n" +" Raised if an Option instance is created with invalid or\n" +" inconsistent arguments.\n" +" " +msgstr "" +"\n" +" Lanciato se una istanza di Option viene creata con argomenti\n" +" invalidi o inconsistenti.\n" +" " + +#: /usr/lib/python2.4/optparse.py:109 +msgid "" +"\n" +" Raised if conflicting options are added to an OptionParser.\n" +" " +msgstr "" +"\n" +" Lanciata se opzioni conflittanti vengono aggiunte a un OptionParser.\n" +" " + +#: /usr/lib/python2.4/optparse.py:114 +msgid "" +"\n" +" Raised if an invalid option value is encountered on the command\n" +" line.\n" +" " +msgstr "" +"\n" +" Lanciata se un valore di opzione non valido viene riscontrato sulla\n" +" linea di comando.\n" +" " + +#: /usr/lib/python2.4/optparse.py:120 +msgid "" +"\n" +" Raised if an invalid or ambiguous option is seen on the command-line.\n" +" " +msgstr "" +"\n" +" Lanciata se una opzione non valida o ambigua viene riscontrata nella " +"linea di comando.\n" +" " + +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 +msgid "Return a comma-separated list of option strings & metavariables." +msgstr "" +"Restituisce una lista separata da virgole di stringhe di opzione e " +"metavariabili." + +#: /usr/lib/python2.4/optparse.py:317 +msgid "" +"Format help with indented section bodies.\n" +" " +msgstr "" +"Formatta l'aiuto indentando il corpo delle sezioni.\n" +" " + +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 +msgid "usage: %s\n" +msgstr "uso: %s\n" + +#: /usr/lib/python2.4/optparse.py:336 +msgid "" +"Format help with underlined section headers.\n" +" " +msgstr "" +"Formatta l'aiuto sottolineando i titoli delle sezioni.\n" +" " + +#: /usr/lib/python2.4/optparse.py:348 +msgid "Usage" +msgstr "Uso" + +#: /usr/lib/python2.4/optparse.py:354 +msgid "integer" +msgstr "intero" + +#: /usr/lib/python2.4/optparse.py:355 +msgid "long integer" +msgstr "intero lungo" + +#: /usr/lib/python2.4/optparse.py:356 +msgid "floating-point" +msgstr "float" + +#: /usr/lib/python2.4/optparse.py:357 +msgid "complex" +msgstr "complesso" + +#: /usr/lib/python2.4/optparse.py:365 +msgid "option %s: invalid %s value: %r" +msgstr "opzione %s: valore %s invalido: %r" + +#: /usr/lib/python2.4/optparse.py:373 +msgid "option %s: invalid choice: %r (choose from %s)" +msgstr "opzione %s: scelta non valida: %r (scegli tra %s)" + +#: /usr/lib/python2.4/optparse.py:382 +msgid "" +"\n" +" Instance attributes:\n" +" _short_opts : [string]\n" +" _long_opts : [string]\n" +"\n" +" action : string\n" +" type : string\n" +" dest : string\n" +" default : any\n" +" nargs : int\n" +" const : any\n" +" choices : [string]\n" +" callback : function\n" +" callback_args : (any*)\n" +" callback_kwargs : { string : any }\n" +" help : string\n" +" metavar : string\n" +" " +msgstr "" +"\n" +" Instance attributes:\n" +" _short_opts : [string]\n" +" _long_opts : [string]\n" +"\n" +" action : string\n" +" type : string\n" +" dest : string\n" +" default : any\n" +" nargs : int\n" +" const : any\n" +" choices : [string]\n" +" callback : function\n" +" callback_args : (any*)\n" +" callback_kwargs : { string : any }\n" +" help : string\n" +" metavar : string\n" +" " + +#: /usr/lib/python2.4/optparse.py:781 +msgid "" +"\n" +" Update the option values from an arbitrary dictionary, but only\n" +" use keys from dict that already have a corresponding attribute\n" +" in self. Any keys in dict without a corresponding attribute\n" +" are silently ignored.\n" +" " +msgstr "" +"\n" +" Aggiorna i valori delle opzioni da un dizionario arbitrario, ma " +"utilizza\n" +" solo le chiavi del dizionario che hanno già un attributo " +"corrispondente\n" +" in sé. Qualsiasi chiave del dizionario senza un attributo " +"corrispondente\n" +" verrà ignorata silenziosamente.\\ " + +#: /usr/lib/python2.4/optparse.py:794 +msgid "" +"\n" +" Update the option values from an arbitrary dictionary,\n" +" using all keys from the dictionary regardless of whether\n" +" they have a corresponding attribute in self or not.\n" +" " +msgstr "" +"\n" +" Aggiorna il valore delle opzioni da un dizionario arbitrario,\n" +" utilizzando tutte le chiavi del dizionario senza valutare se\n" +" essi abbiano o meno un attributo corrispondente in sé.\n" +" " + +#: /usr/lib/python2.4/optparse.py:926 +msgid "" +"add_option(Option)\n" +" add_option(opt_str, ..., kwarg=val, ...)\n" +" " +msgstr "" +"add_option(Opzione)\n" +" add_option(opt_str, ..., kwarg=val, ...)\n" +" " + +#: /usr/lib/python2.4/optparse.py:1138 +msgid "show this help message and exit" +msgstr "mostra questo messaggio di aiuto e esce" + +#: /usr/lib/python2.4/optparse.py:1143 +msgid "show program's version number and exit" +msgstr "mostra il numero di versione del programma e esce" + +#: /usr/lib/python2.4/optparse.py:1166 +msgid "%prog [options]" +msgstr "%prog [opzioni]" + +#: /usr/lib/python2.4/optparse.py:1246 +msgid "" +"\n" +" parse_args(args : [string] = sys.argv[1:],\n" +" values : Values = None)\n" +" -> (values : Values, args : [string])\n" +"\n" +" Parse the command-line options found in 'args' (default:\n" +" sys.argv[1:]). Any errors result in a call to 'error()', which\n" +" by default prints the usage message to stderr and calls\n" +" sys.exit() with an error message. On success returns a pair\n" +" (values, args) where 'values' is an Values instance (with all\n" +" your option values) and 'args' is the list of arguments left\n" +" over after parsing options.\n" +" " +msgstr "" + +#: /usr/lib/python2.4/optparse.py:1285 +msgid "" +"\n" +" check_values(values : Values, args : [string])\n" +" -> (values : Values, args : [string])\n" +"\n" +" Check that the supplied option values and leftover arguments are\n" +" valid. Returns the option values and leftover arguments\n" +" (possibly adjusted, possibly completely new -- whatever you\n" +" like). Default implementation just returns the passed-in\n" +" values; subclasses may override as desired.\n" +" " +msgstr "" + +#: /usr/lib/python2.4/optparse.py:1298 +msgid "" +"_process_args(largs : [string],\n" +" rargs : [string],\n" +" values : Values)\n" +"\n" +" Process command-line arguments and populate 'values', consuming\n" +" options and arguments from 'rargs'. If 'allow_interspersed_args' " +"is\n" +" false, stop at the first non-option argument. If true, accumulate " +"any\n" +" interspersed non-option arguments in 'largs'.\n" +" " +msgstr "" + +#: /usr/lib/python2.4/optparse.py:1349 +msgid "" +"_match_long_opt(opt : string) -> string\n" +"\n" +" Determine which long option string 'opt' matches, ie. which one\n" +" it is an unambiguous abbrevation for. Raises BadOptionError if\n" +" 'opt' doesn't unambiguously match any long option string.\n" +" " +msgstr "" + +#: /usr/lib/python2.4/optparse.py:1376 /usr/lib/python2.4/optparse.py:1415 +msgid "%s option requires an argument" +msgstr "l'opzione %s richiede un argomento" + +#: /usr/lib/python2.4/optparse.py:1378 /usr/lib/python2.4/optparse.py:1417 +msgid "%s option requires %d arguments" +msgstr "l'opzione %s richiede %d argomenti" + +#: /usr/lib/python2.4/optparse.py:1387 +msgid "%s option does not take a value" +msgstr "l'opzione %s non richiede un parametro" + +#: /usr/lib/python2.4/optparse.py:1404 /usr/lib/python2.4/optparse.py:1558 +msgid "no such option: %s" +msgstr "opzione non valida: %s" + +#: /usr/lib/python2.4/optparse.py:1454 +msgid "" +"error(msg : string)\n" +"\n" +" Print a usage message incorporating 'msg' to stderr and exit.\n" +" If you override this in a subclass, it should not return -- it\n" +" should either exit or raise an exception.\n" +" " +msgstr "" +"error(msg : string)\n" +"\n" +" Stampa un messaggio di utilizzo incorporando 'msg' nel stderr e " +"esce.\n" +" Se sovrascrivi questa funzione in una sottoclasse, non deve " +"restituire nulla -- \n" +" deve o uscire o lanciare un'eccezione.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1471 +msgid "" +"print_usage(file : file = stdout)\n" +"\n" +" Print the usage message for the current program (self.usage) to\n" +" 'file' (default stdout). Any occurence of the string \"%prog\" in\n" +" self.usage is replaced with the name of the current program\n" +" (basename of sys.argv[0]). Does nothing if self.usage is empty\n" +" or not defined.\n" +" " +msgstr "" +"print_usage(file : file = stdout)\n" +"\n" +" Stampa il messaggio d'uso per il programma corrente (self.usage) su\n" +" 'file' (predefinito stdout). Ogni occorrenza della stringa \"%prog" +"\" in\n" +" self.usage viene sostituita con il nome del programma corrente\n" +" (nome base di sys.argv[0]). Non fa nulla se self.usage è vuoto\n" +" o non definito.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1489 +msgid "" +"print_version(file : file = stdout)\n" +"\n" +" Print the version message for this program (self.version) to\n" +" 'file' (default stdout). As with print_usage(), any occurence\n" +" of \"%prog\" in self.version is replaced by the current program's\n" +" name. Does nothing if self.version is empty or undefined.\n" +" " +msgstr "" +"print_version(file : file = stdout)\n" +"\n" +" Stampa il messaggio di versione per questo programma (self.version) " +"su\n" +" 'file' (predefinito stdout). Come per print_usage(), ogni " +"occorrenza\n" +" di \"%prog\" in self.version viene sostituita dal nome del " +"programma\n" +" corrente. Non fa nulla se self.version è vuoto o non definito.\n" +" " + +#: /usr/lib/python2.4/optparse.py:1504 +msgid "options" +msgstr "opzioni" + +#: /usr/lib/python2.4/optparse.py:1528 +msgid "" +"print_help(file : file = stdout)\n" +"\n" +" Print an extended help message, listing all options and any\n" +" help text provided with them, to 'file' (default stdout).\n" +" " +msgstr "" +"print_help(file : file = stdout)\n" +"\n" +" Stampa un messaggio di aiuto esteso, elencando tutte le opzioni e\n" +" ogni testo associato ad esse, in 'file' (stdout predefinito).\n" +" " + +#: /usr/lib/python2.4/optparse.py:1541 +msgid "" +"_match_abbrev(s : string, wordmap : {string : Option}) -> string\n" +"\n" +" Return the string key in 'wordmap' for which 's' is an unambiguous\n" +" abbreviation. If 's' is found to be ambiguous or doesn't match any of\n" +" 'words', raise BadOptionError.\n" +" " +msgstr "" + +#: /usr/lib/python2.4/optparse.py:1562 +msgid "ambiguous option: %s (%s?)" +msgstr "opzione ambigua: %s (%s?)" + +#: pisi-cli:46 +msgid "Keyboard Interrupt: Exiting..." +msgstr "Interruzione da tastiera: uscita..." + +#: pisi-cli:49 +msgid "Program Terminated." +msgstr "Programma terminato." + +#: pisi-cli:52 +msgid "" +"A database operation has been aborted. You should run pisi\n" +"again for normal DB recovery procedure. Make sure you have free disk " +"space. \n" +"You have to run rebuild-db only when there is file corruption and database " +"upgrades." +msgstr "" +"Una operazione sul database è stata annullata. Dovresti lanciare\n" +"nuovamente PiSi per la procedura di correzione del database. Assicurati\n" +"di avere spazio libero a sufficienza. Devi eseguire rebuild-db solo quando " +"si\n" +"riscontra la corruzione di file o ci sono aggiornamenti del database." + +#: pisi-cli:57 +msgid "" +"Unhandled internal exception.\n" +"Please file a bug report. (http://bugs.uludag.org.tr)" +msgstr "" +"Eccezione interna non gestita.\n" +"Invia per piacere una segnalazione di un bug (http://bugs.uludag.org.tr)" + +#: pisi-cli:63 +msgid "System Error. Program Terminated." +msgstr "Errore di sistema. Programma terminato." + +#: pisi-cli:70 +msgid "Please use 'pisi help' for general help." +msgstr "Utilizza per favore 'pisi help' per un aiuto generico." + +#: pisi-cli:73 +msgid "Traceback:" +msgstr "Traceback:" + +#: pisi-cli:77 +msgid "Use --debug to see a traceback." +msgstr "Utilizza --debug per vedere il traceback." + +#: pisi/actionsapi/autotools.py:36 pisi/actionsapi/cmaketools.py:36 +msgid "" +"Please attach the config.log to your bug report:\n" +"%s/config.log" +msgstr "" +"Includi per favore anche il file config.log nella segnalazione di bug:\n" +"%s/config.log" + +#: pisi/actionsapi/autotools.py:75 pisi/actionsapi/autotools.py:85 +#: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 +#: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 +msgid "Configure failed." +msgstr "Configure fallito." + +#: pisi/actionsapi/autotools.py:77 pisi/actionsapi/autotools.py:87 +#: pisi/actionsapi/kde.py:67 +msgid "No configure script found." +msgstr "Nessun script configure trovato." + +#: pisi/actionsapi/autotools.py:96 pisi/actionsapi/cmaketools.py:70 +#: pisi/actionsapi/kde.py:72 pisi/actionsapi/perlmodules.py:63 +#: pisi/actionsapi/perlmodules.py:72 pisi/actionsapi/pythonmodules.py:49 +#: pisi/actionsapi/scons.py:39 +msgid "Make failed." +msgstr "Make fallito." + +#: pisi/actionsapi/autotools.py:124 pisi/actionsapi/autotools.py:134 +#: pisi/actionsapi/cmaketools.py:100 pisi/actionsapi/cmaketools.py:110 +#: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 +#: pisi/actionsapi/scons.py:43 +msgid "Install failed." +msgstr "Install fallito." + +#: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 +#: pisi/actionsapi/cmaketools.py:72 pisi/actionsapi/cmaketools.py:102 +#: pisi/actionsapi/cmaketools.py:112 pisi/actionsapi/kde.py:81 +msgid "No Makefile found." +msgstr "File makefile non trovato." + +#: pisi/actionsapi/autotools.py:143 +msgid "Running aclocal failed." +msgstr "Esecuzione di aclocal fallita." + +#: pisi/actionsapi/autotools.py:148 +msgid "Running autoconf failed." +msgstr "Esecuzione di autoconf fallita." + +#: pisi/actionsapi/autotools.py:153 +msgid "Running autoreconf failed." +msgstr "Esecuzione di autoreconf fallita." + +#: pisi/actionsapi/autotools.py:158 +msgid "Running automake failed." +msgstr "Esecuzione di automake fallita." + +#: pisi/actionsapi/autotools.py:163 +msgid "Running autoheader failed." +msgstr "Esecuzione di autoheader fallita." + +#: pisi/actionsapi/cmaketools.py:64 +#, fuzzy +msgid "No configure script found for cmake." +msgstr "Nessun script configure trovato." + +#: pisi/actionsapi/get.py:160 +msgid "Util %s cannot be found" +msgstr "Utilità %s non trovata" + +#: pisi/actionsapi/get.py:162 +msgid "Warning: %s does not exist, using plain name %s" +msgstr "Attenzione: %s non esiste, utilizzo il nome semplice %s" + +#: pisi/actionsapi/kde.py:34 +msgid "" +"\n" +"!!! Please attach the config.log to your bug report:\n" +"%s/config.log" +msgstr "" +"\n" +"!!! Allega per favore il file config.log quando segnali il bug:\n" +"%s/config.log" + +#: pisi/actionsapi/libtools.py:38 +msgid "Running ldconfig failed." +msgstr "Esecuzione di ldconfig fallita." + +#: pisi/actionsapi/libtools.py:49 +msgid "GNU Config Update Finished." +msgstr "Aggiornamento GNU Config concluso." + +#: pisi/actionsapi/libtools.py:53 +msgid "Running libtoolize failed." +msgstr "Esecuzione di libtoolize fallita." + +#: pisi/actionsapi/perlmodules.py:66 +msgid "perl build failed." +msgstr "build Perl fallito." + +#: pisi/actionsapi/perlmodules.py:75 +msgid "perl install failed." +msgstr "install Perl fallito." + +#: pisi/actionsapi/pisitools.py:126 +msgid "ActionsAPI [doman]: Wrong man page file: %s" +msgstr "ActionsAPI [doman]: file di pagina man sbagliato: %s" + +#: pisi/actionsapi/pisitools.py:164 +msgid "ActionsAPI [rename]: No such file or directory: %s" +msgstr "ActionsAPI [rename]: File o cartella non esistente: %s" + +#: pisi/actionsapi/pisitools.py:181 +msgid "File does not exist or permission denied: %s" +msgstr "Il file non esiste o non si hanno i permessi necessari: %s" + +#: pisi/actionsapi/pisitools.py:198 +msgid "ActionsAPI [dosym]: File exists: %s" +msgstr "ActionsAPI [dosym]: Il file esiste" + +#: pisi/actionsapi/pisitoolsfunctions.py:45 +#: pisi/actionsapi/pisitoolsfunctions.py:59 +#: pisi/actionsapi/pisitoolsfunctions.py:72 +msgid "Insufficient arguments." +msgstr "Argomenti insufficienti." + +#: pisi/actionsapi/pythonmodules.py:66 +msgid "Running %s failed." +msgstr "Esecuzione di %s fallita." + +#: pisi/actionsapi/shelltools.py:49 +msgid "Cannot create directory %s" +msgstr "Impossibile creare la cartella %s" + +#: pisi/actionsapi/shelltools.py:57 +msgid "ActionsAPI [echo]: Can't append to file %s." +msgstr "ActionsAPI [echo]: Impossibile appendere al file %s." + +#: pisi/actionsapi/shelltools.py:66 +msgid "ActionsAPI [chmod]: Operation not permitted: %s (mode: %s)" +msgstr "ActionsAPI [chmod]: Operazione non permessa: %s (modalità: %s)" + +#: pisi/actionsapi/shelltools.py:69 +msgid "ActionsAPI [chmod]: File %s doesn't exists." +msgstr "ActionsAPI [chmod]: Il file %s non esiste." + +#: pisi/actionsapi/shelltools.py:77 +msgid "ActionsAPI [chown]: Operation not permitted: %s (uid: %s, gid: %s)" +msgstr "ActionsAPI [chown]: Operazione non permessa: %s (UID: %s, GID: %s)" + +#: pisi/actionsapi/shelltools.py:80 +msgid "ActionsAPI [chown]: File %s doesn't exists." +msgstr "ActionsAPI [chown]: Il file %s non esiste." + +#: pisi/actionsapi/shelltools.py:87 +msgid "ActionsAPI [sym]: Permission denied: %s to %s" +msgstr "ActionsAPI [sym]: Permesso negato: %s per %s" + +#: pisi/actionsapi/shelltools.py:95 +msgid "ActionsAPI [unlink]: Permission denied: %s." +msgstr "ActionsAPI [unlink]: Permesso negato: %s." + +#: pisi/actionsapi/shelltools.py:99 +msgid "ActionsAPI [unlink]: File %s doesn't exists." +msgstr "ActionsAPI [unlink]: Il file %s non esiste." + +#: pisi/actionsapi/shelltools.py:107 +msgid "ActionsAPI [unlinkDir]: Operation not permitted: %s" +msgstr "ActionsAPI [unlinkDir]: Operazione non permessa: %s" + +#: pisi/actionsapi/shelltools.py:111 +msgid "ActionsAPI [unlinkDir]: Directory %s doesn't exists." +msgstr "ActionsAPI [unlinkDir]: La cartella %s non esiste." + +#: pisi/actionsapi/shelltools.py:120 +msgid "ActionsAPI [move]: Permission denied: %s to %s" +msgstr "ActionsAPI [move]: Permesso negato: da %s a %s" + +#: pisi/actionsapi/shelltools.py:122 +msgid "ActionsAPI [move]: File %s doesn't exists." +msgstr "ActionsAPI [move]: Il file %s non esiste." + +#: pisi/actionsapi/shelltools.py:132 +msgid "ActionsAPI [copy]: Permission denied: %s to %s" +msgstr "ActionsAPI [copy]: Permesso negato: %s in %s" + +#: pisi/actionsapi/shelltools.py:148 +msgid "ActionsAPI [copy]: File %s does not exist." +msgstr "ActionsAPI [copy]: Il file %s non esiste." + +#: pisi/actionsapi/shelltools.py:163 +msgid "ActionsAPI [copytree] %s to %s: %s" +msgstr "ActionsAPI [copytree] %s in %s: %s" + +#: pisi/actionsapi/shelltools.py:165 +msgid "ActionsAPI [copytree]: Directory %s doesn't exists." +msgstr "ActionsAPI [copytree]: La cartella %s non esiste." + +#: pisi/actionsapi/shelltools.py:177 +msgid "ActionsAPI [touch]: Permission denied: %s" +msgstr "ActionsAPI [touch]: Permesso negato: %s" + +#: pisi/api.py:297 pisi/comariface.py:30 +msgid "comar package is not fully installed" +msgstr "il pacchetto COMAR non è completamente installato" + +#: pisi/api.py:309 +msgid "File %s not found" +msgstr "File %s non trovato" + +#: pisi/api.py:364 +msgid "Checking /%s " +msgstr "Verifica di /%s " + +#: pisi/api.py:368 +msgid "" +"\n" +"Corrupt file: %s" +msgstr "" +"\n" +"File corrotto: %s" + +#: pisi/api.py:370 pisi/cli/commands.py:1044 +msgid "OK" +msgstr "OK" + +#: pisi/api.py:383 +msgid "* Building index of PiSi files under %s" +msgstr "* Costruzione dell'indice dei file PiSi in %s" + +#: pisi/api.py:390 +msgid "* Index file written" +msgstr "* File di indice scritto" + +#: pisi/api.py:394 +msgid "Repo %s already present." +msgstr "Il repository %s è già presente." + +#: pisi/api.py:398 +msgid "Repo %s added to system." +msgstr "Il repository %s è stato aggiunto al sistema." + +#: pisi/api.py:404 +msgid "Repo %s removed from system." +msgstr "Il repository %s è stato rimosso dal sistema." + +#: pisi/api.py:406 +msgid "Repository %s does not exist. Cannot remove." +msgstr "Il repository %s non esiste. Impossibile rimuovere." + +#: pisi/api.py:413 +msgid "* Updating repository: %s" +msgstr "* Aggiornamento del repository: %s" + +#: pisi/api.py:421 +msgid "No updates available for repository %s." +msgstr "Nessun aggiornamento disponibile per il repository %s." + +#: pisi/api.py:423 +msgid "Updating database at any rate as requested" +msgstr "Aggiornamento del database alla frequenza richiesta" + +#: pisi/api.py:434 +msgid "* Package database updated." +msgstr "* Database dei pacchetti aggiornato." + +#: pisi/api.py:436 pisi/api.py:461 +msgid "No repository named %s found." +msgstr "Nessun repository di nome %s trovato." + +#: pisi/api.py:444 +msgid "* Rebuilding '%s' named repo... " +msgstr "* Ricostruzione del repository di nome '%s'... " + +#: pisi/api.py:457 +msgid "Input/Output error while reading %s: %s" +msgstr "Errore in Input/Output durante la lettura di %s: %s" + +#: pisi/api.py:514 +msgid "Rebuilding package database" +msgstr "Ricostruzione del database dei pacchetti" + +#: pisi/archive.py:36 +msgid "" +"An error has occured while running LZMA:\n" +"%s" +msgstr "" +"Errore durante l'esecuzione di LZMA:\n" +"%s" + +#: pisi/archive.py:101 pisi/archive.py:161 +msgid "Archive type not recognized" +msgstr "Tipo di archivio non riconosciuto" + +#: pisi/atomicoperations.py:67 +msgid "Package %s found in repository %s" +msgstr "Pacchetto %s trovato nel repository %s" + +#: pisi/atomicoperations.py:90 +msgid "Package URI: %s" +msgstr "URI pacchetto: %s" + +#: pisi/atomicoperations.py:94 +msgid "Package %s not found in any active repository." +msgstr "Il pacchetto %s non è stato trovato in alcun repository attivo." + +#: pisi/atomicoperations.py:113 +msgid "Installing %s, version %s, release %s, build %s" +msgstr "Installazione di %s, versione %s, release %s, build %s" + +#: pisi/atomicoperations.py:158 +msgid "%s package cannot be installed unless the dependencies are satisfied" +msgstr "" +"il pacchetto %s non può essere installato, a meno che le sue dipendenze " +"vengano soddisfatte" + +#: pisi/atomicoperations.py:177 +msgid "/%s from %s package\n" +msgstr "/%s dal pacchetto %s\n" + +#: pisi/atomicoperations.py:178 +msgid "" +"File conflicts:\n" +"%s" +msgstr "" +"Il file va in conflitto:\n" +"%s" + +#: pisi/atomicoperations.py:213 +msgid "Re-install same version package?" +msgstr "Reinstallare la stessa versione del pacchetto?" + +#: pisi/atomicoperations.py:214 +msgid "Package re-install declined" +msgstr "Reinstallazione del pacchetto rifiutata" + +#: pisi/atomicoperations.py:220 +msgid "Upgrading to new upstream version" +msgstr "Aggiornamento alla nuova versione upstream" + +#: pisi/atomicoperations.py:223 +msgid "Upgrading to new distribution release" +msgstr "Aggiornamento alla nuova versione rilasciata della distribuzione" + +#: pisi/atomicoperations.py:227 +msgid "Upgrading to new distribution build" +msgstr "Aggiornamento alla nuova build della distribuzione" + +#: pisi/atomicoperations.py:237 +msgid "Downgrade to old distribution release?" +msgstr "Ritornare alla vecchia versione rilasciata della distribuzione?" + +#: pisi/atomicoperations.py:239 +msgid "Downgrade to old distribution build?" +msgstr "Ritornare alla vecchia build della distribuzione?" + +#: pisi/atomicoperations.py:241 +msgid "Package downgrade declined" +msgstr "Ripristino pacchetto precedente rifiutato" + +#: pisi/atomicoperations.py:265 +msgid "%s configuration failed." +msgstr "configurazione di %s fallita." + +#: pisi/atomicoperations.py:388 +msgid "Storing %s, " +msgstr "Salvataggio di %s, " + +#: pisi/atomicoperations.py:391 +msgid "Storing %s." +msgstr "Salvataggio di %s." + +#: pisi/atomicoperations.py:398 +msgid "Storing %s" +msgstr "Salvataggio di %s" + +#: pisi/atomicoperations.py:454 +msgid "File list could not be read for package %s, continuing removal." +msgstr "" +"Impossibile leggere la lista dei file per il pacchetto %s, proseguo con la " +"rimozione." + +#: pisi/atomicoperations.py:460 +msgid "Removing package %s" +msgstr "Rimozione del pacchetto %s in corso" + +#: pisi/atomicoperations.py:463 +msgid "Trying to remove nonexistent package " +msgstr "Tentativo di rimozione di un pacchetto non esistente " + +#: pisi/atomicoperations.py:502 +msgid "Not removing conflicted file : %s" +msgstr "File in conflitto non rimossi: %s" + +#: pisi/atomicoperations.py:522 +msgid "" +"Installed file %s is not exists on system [Probably you manually deleted]" +msgstr "" +"Il file installato %s non è presente nel sistema [Probabilmente è stato " +"eliminato manualmente]" + +#: pisi/atomicoperations.py:581 +msgid "Metadata XML '%s' cannot be found" +msgstr "Impossibile trovare i Metadata XML'%s'" + +#: pisi/atomicoperations.py:589 +msgid "MetaData format wrong (%s)" +msgstr "Formato Metadata errato (%s)" + +#: pisi/atomicoperations.py:591 +msgid "* Adding '%s' to db... " +msgstr "* Aggiunta di %s al database... " + +#: pisi/atomicoperations.py:597 +msgid "Files XML '%s' cannot be found" +msgstr "Impossibile trovare i file XML '%s'" + +#: pisi/atomicoperations.py:602 pisi/package.py:141 +msgid "Invalid %s" +msgstr "%s non valido" + +#: pisi/atomicoperations.py:611 +msgid "OK." +msgstr "OK." + +#: pisi/build.py:86 +msgid "Path %s belongs in multiple packages" +msgstr "Il percorso '%s' si trova in più pacchetti" + +#: pisi/build.py:112 +msgid "Source URI: %s" +msgstr "URI di origine: %s" + +#: pisi/build.py:116 +msgid "Source %s not found in any active repository." +msgstr "Il sorgente %s non è stato trovato in alcun repository attivo." + +#: pisi/build.py:181 +msgid "Building PiSi source package: %s" +msgstr "Costruzione del pacchetto sorgente PiSi %s" + +#: pisi/build.py:229 +msgid "IceCream detected. Make sure your daemon is up and running..." +msgstr "" +"Rilevato IceCream. Assicurati che il tuo demone sia in esecuzione e attivo..." + +#: pisi/build.py:234 +msgid "CCache detected..." +msgstr "Rilevato CCache..." + +#: pisi/build.py:287 +msgid "PartOf tag not defined, looking for component" +msgstr "Tag PartOf non definito, ricerca del componente" + +#: pisi/build.py:297 +msgid "Cannot find component.xml in upper directory" +msgstr "Impossibile trovare il file component.xml nella cartella superiore" + +#: pisi/build.py:301 +msgid "Source is part of %s component" +msgstr "Il sorgente fa parte del componente %s" + +#: pisi/build.py:305 +msgid "Fetching source from: %s" +msgstr "Recupero sorgente da: %s" + +#: pisi/build.py:307 +msgid "Source archive is stored: %s/%s" +msgstr "Archivio sorgente memorizzato: %s/%s" + +#: pisi/build.py:311 +msgid "Unpacking archive..." +msgstr "Scompattazione archivio..." + +#: pisi/build.py:313 +msgid " unpacked (%s)" +msgstr "scompattato (%s)" + +#: pisi/build.py:318 +msgid "Setting up source..." +msgstr "Configurazione sorgente..." + +#: pisi/build.py:323 +msgid "Building source..." +msgstr "Compilazione sorgente..." + +#: pisi/build.py:328 +#, fuzzy +msgid "Testing package..." +msgstr "Creazione del pacchetto PiSi %s." + +#: pisi/build.py:332 +msgid "Installing..." +msgstr "Installazione in corso..." + +#: pisi/build.py:374 +msgid "Unable to read Actions Script (%s): %s" +msgstr "Impossibile leggere Actions Script (%s): %s" + +#: pisi/build.py:376 +msgid "SyntaxError in Actions Script (%s): %s" +msgstr "Errore di sintassi in Actions Script (%s): %s" + +#: pisi/build.py:393 +msgid "Unable to read COMAR script (%s): %s" +msgstr "Impossibile leggere script COMAR (%s): %s" + +#: pisi/build.py:395 +msgid "SyntaxError in COMAR file (%s): %s" +msgstr "Errore di sintassi nel file COMAR (%s): %s" + +#: pisi/build.py:421 +msgid "unable to call function from actions: %s" +msgstr "impossibile chiamare la funzione dalle azioni: %s" + +#: pisi/build.py:437 +msgid "" +"Safety switch: following extra packages in system.devel will be installed: " +msgstr "" +"Switch di sicurezza: i seguenti pacchetti aggiuntivi in system.devel " +"verranno installati: " + +#: pisi/build.py:442 +msgid "Safety switch: system.devel is already installed" +msgstr "Switch di sicurezza: system.devel è già installato" + +#: pisi/build.py:444 +msgid "Safety switch: the component system.devel cannot be found" +msgstr "Switch di sicurezza: il componente system.devel non è stato trovato" + +#: pisi/build.py:453 +msgid "Unsatisfied Build Dependencies:" +msgstr "Dipendenze di compilazione non soddisfatte:" + +#: pisi/build.py:457 +msgid "Cannot build package due to unsatisfied build dependencies" +msgstr "" +"Impossibile compilare il pacchetto a casa di dipendenze non soddisfatte" + +#: pisi/build.py:465 +msgid "Build dependency %s cannot be satisfied" +msgstr "La dipendenza di compilazione %s non può essere soddisfatta" + +#: pisi/build.py:467 +msgid "Do you want to install the unsatisfied build dependencies" +msgstr "Desideri installare le dipendenze di compilazione non soddisfatte" + +#: pisi/build.py:468 +msgid "Installing build dependencies." +msgstr "Installazione dipendenze di compilazione." + +#: pisi/build.py:473 +msgid "Ignoring build dependencies." +msgstr "Ignoro le dipendenze di compilazione." + +#: pisi/build.py:483 +msgid "Patch file is missing: %s\n" +msgstr "Il file di patch è mancante: %s\n" + +#: pisi/build.py:496 +msgid "* Applying patch: %s" +msgstr "* Applicazione della patch: %s" + +#: pisi/build.py:554 +msgid "Stripping files.." +msgstr "" + +#: pisi/build.py:654 +msgid "(found old version %s)" +msgstr "(trovata vecchia versione %s)" + +#: pisi/build.py:656 +msgid "Skipping %s with wrong pkg name " +msgstr "Salto %s con nome del pacchetto errato" + +#: pisi/build.py:677 +msgid "(no previous build found, setting build no to 1.)" +msgstr "(nessuna build precedente trovata, imposto il numero di build a 1)" + +#: pisi/build.py:722 +msgid "(old package lacks a build no, setting build no to 1.)" +msgstr "(il vecchio pacchetto non ha un numero di build, lo imposto a 1)" + +#: pisi/build.py:725 +msgid "There are changes, incrementing build no to %d" +msgstr "Cambiamenti rilevati, incremento del numero di build a %d" + +#: pisi/build.py:728 +msgid "There is no change from previous build %d" +msgstr "Nessun cambiamento dalla build precedente %d" + +#: pisi/build.py:793 +msgid "No user named '%s' found on the system" +msgstr "Utente '%s' non trovato nel sistema" + +#: pisi/build.py:798 +msgid "No group named '%s' found on the system" +msgstr "Gruppo '%s' non trovato nel sistema" + +#: pisi/build.py:801 +msgid "** Building package %s" +msgstr "** Compilazione del pacchetto %s" + +#: pisi/build.py:803 pisi/build.py:806 +msgid "Generating %s," +msgstr "Generazione di %s," + +#: pisi/build.py:812 +msgid "" +"Build number is not available. For repo builds you must enable buildno in " +"pisi.conf." +msgstr "" +"Il numero di build non è disponibile. Per le build dal repository devi " +"attivare buildno in pisi.conf." + +#: pisi/build.py:830 +msgid "Creating PiSi package %s." +msgstr "Creazione del pacchetto PiSi %s." + +#: pisi/build.py:875 pisi/delta.py:93 +msgid "Done." +msgstr "Fatto." + +#: pisi/build.py:881 +msgid "Abandoned files under the install dir (%s):" +msgstr "File abbandonati nella cartella di installazione (%s):" + +#: pisi/build.py:885 +msgid "" +"All of the files under the install dir (%s) has been collected by package(s)" +msgstr "" +"Tutti i file nella cartella di installazione (%s) sono stati raccolti dai " +"pacchetti" + +#: pisi/build.py:889 +msgid "Cleaning Build Directory..." +msgstr "Pulizia della cartella di compilazione..." + +#: pisi/build.py:892 +msgid "Keeping Build Directory" +msgstr "La cartella di compilazione verrà conservata" + +#: pisi/cli/__init__.py:76 +msgid "Warning: " +msgstr "Avviso: " + +#: pisi/cli/__init__.py:85 +msgid "Error: " +msgstr "Errore: " + +#: pisi/cli/__init__.py:117 +msgid " (yes/no)" +msgstr " (si/no)" + +#: pisi/cli/__init__.py:138 +msgid " [complete]\n" +msgstr " [completato]\n" + +#: pisi/cli/__init__.py:148 +msgid "Installed %s" +msgstr "Installato %s" + +#: pisi/cli/__init__.py:150 +msgid "Removed %s" +msgstr "Rimosso %s" + +#: pisi/cli/__init__.py:152 +msgid "Upgraded %s" +msgstr "Aggiornato %s" + +#: pisi/cli/__init__.py:154 +msgid "Configured %s" +msgstr "Configurato %s" + +#: pisi/cli/__init__.py:156 +msgid "Extracting the files of %s" +msgstr "Estrazione dei file di %s" + +#: pisi/cli/commands.py:92 +msgid "generic help string for any command" +msgstr "testo di aiuto generico per qualsiasi comando" + +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 +msgid "Unrecognized command: %s" +msgstr "Comando non riconosciuto %s" + +#: pisi/cli/commands.py:143 +msgid "common options" +msgstr "opzioni comuni" + +#: pisi/cli/commands.py:146 +msgid "general options" +msgstr "opzioni generali" + +#: pisi/cli/commands.py:149 +msgid "Change the system root for PiSi commands" +msgstr "Cambia la root di sistema per i comandi PiSi" + +#: pisi/cli/commands.py:151 +msgid "Assume yes in all yes/no queries" +msgstr "Assumi una risposta positiva in tutte le domande sì/no" + +#: pisi/cli/commands.py:156 +msgid "Detailed output" +msgstr "Output dettagliato" + +#: pisi/cli/commands.py:158 +msgid "Show debugging information" +msgstr "Mostra informazioni di debug" + +#: pisi/cli/commands.py:160 +msgid "Suppresses all coloring of PiSi's output" +msgstr "Annulla tutta la colorazione dell'output di PiSi" + +#: pisi/cli/commands.py:167 +msgid "" +"This is a fall back function. If the implementer module provides an\n" +" options function it will be called" +msgstr "" +"Questa è una funzione di fallback. Se il modulo implementante fornisce\n" +" una funzione di opzione essa verrà chiamata" + +#: pisi/cli/commands.py:179 +msgid "Destination directory %s does not exist. Creating directory.\n" +msgstr "La cartella di destinazione %s non esiste. Creazione in corso...\n" + +#: pisi/cli/commands.py:201 +msgid "Password: " +msgstr "Password: " + +#: pisi/cli/commands.py:207 +msgid "initialize PiSi components" +msgstr "inizializza i componenti di PiSi" + +#: pisi/cli/commands.py:215 +msgid "do cleanup work for PiSi components" +msgstr "effettua lavoro di pulizia per i componenti PiSi" + +#: pisi/cli/commands.py:229 +msgid "print help for the command" +msgstr "stampa l'aiuto per il comando" + +#: pisi/cli/commands.py:235 +msgid "exit program" +msgstr "esce dal programma" + +#: pisi/cli/commands.py:237 +msgid "Command terminated abnormally." +msgstr "Comando terminato in maniera anormale." + +#: pisi/cli/commands.py:247 +msgid "Command lacks name" +msgstr "Manca il nome del comando" + +#: pisi/cli/commands.py:251 +msgid "Duplicate command %s" +msgstr "Comando duplicato %s" + +#: pisi/cli/commands.py:260 +msgid "" +"Prints help for given commands\n" +"\n" +"Usage: help [ ... ]\n" +"\n" +"If run without parameters, it prints the general help." +msgstr "" +"Stampa l'aiuto per i comandi forniti\n" +"\n" +"Utilizzo: help [ ... ]\n" +"\n" +"In assenza di parametri, stampa l'aiuto generale." + +#: pisi/cli/commands.py:294 +msgid "" +"Clean stale locks\n" +"\n" +"Usage: clean\n" +"\n" +"PiSi uses filesystem locks for managing database access.\n" +"This command deletes unused locks from the database directory." +msgstr "" +"Pulisce i lock inutilizzati\n" +"\n" +"Utilizzo: clean\n" +"\n" +"PiSi utilizza dei lock sul filesystem per gestire gli accessi al database.\n" +"Questo comando elimina i lock inutilizzati dalla cartella del database." + +#: pisi/cli/commands.py:313 +msgid "" +"Delete cache files\n" +"\n" +"Usage: delete-cache\n" +"\n" +"Sources, packages and temporary files are stored\n" +"under /var directory. Since these accumulate they can\n" +"consume a lot of disk space." +msgstr "" +"Elimina file nella cache\n" +"\n" +"Utilizzo: delete-cache\n" +"\n" +"I sorgenti, i pacchetti e i file temporanei sono memorizzati\n" +"nella cartella /var. Dato che questi file si accumulano col tempo\n" +"possono a lungo andare consumare molto spazio su disco." + +#: pisi/cli/commands.py:334 +msgid "" +"Graph package relations\n" +"\n" +"Usage: graph [ ...]\n" +"\n" +"Write a graph of package relations, tracking dependency and\n" +"conflicts relations starting from given packages. By default\n" +"shows the package relations among repository packages, and writes\n" +"the package in graphviz format to 'pgraph.dot'.\n" +msgstr "" +"Grafico delle relazioni tra i pacchetti\n" +"\n" +"Utilizzo: graph [ ...]\n" +"\n" +"Stampa un grafico delle relazioni tra i pacchetti, tenendo traccia delle " +"dipendenze\n" +"e dei conflitti a partire dai pacchetti forniti. Senza parametri\n" +"mostra le relazioni tra i pacchetti del repository e scrive il\n" +"pacchetti nel formato graphviz nel file 'pgraph.dot'.\n" + +#: pisi/cli/commands.py:351 +msgid "graph options" +msgstr "opzioni di graph" + +#: pisi/cli/commands.py:355 +msgid "Specify a particular repository" +msgstr "Specifica un repository particolare" + +#: pisi/cli/commands.py:358 +msgid "Graph of installed packages" +msgstr "Grafico dei pacchetti installati" + +#: pisi/cli/commands.py:361 +msgid "Do not show installed packages" +msgstr "Non mostrare i pacchetti installati" + +#: pisi/cli/commands.py:364 +msgid "Dot output file" +msgstr "File di output dot" + +#: pisi/cli/commands.py:375 +msgid "Plotting packages in repository %s" +msgstr "Disegno grafico dei pacchetti nel repository %s in corso" + +#: pisi/cli/commands.py:381 +msgid "Plotting a graph of relations among all repository packages" +msgstr "" +"Disegno di un grafico delle relazioni tra tutti i pacchetti del repository" + +#: pisi/cli/commands.py:388 +msgid "Plotting a graph of relations among all installed packages" +msgstr "Disegno di un grafico delle relazioni tra tutti i pacchetti installati" + +#: pisi/cli/commands.py:400 +msgid "Do not take build no into account." +msgstr "Non prendere in considerazione il numero di build." + +#: pisi/cli/commands.py:405 +msgid "Do not take dependency information into account" +msgstr "Non prendere in considerazione le informazioni sulle dipendenze" + +#: pisi/cli/commands.py:409 +msgid "" +"Build PiSi packages\n" +"\n" +"Usage: build [ | ] ...\n" +"\n" +"You can give a URI of the pspec.xml file. PiSi will\n" +"fetch all necessary files and build the package for you.\n" +"\n" +"Alternatively, you can give the name of a source package\n" +"to be downloaded from a repository containing sources.\n" +msgstr "" +"Costruisci pacchetti PiSi\n" +"\n" +"Utilizzo: build [ | ] ...\n" +"\n" +"Puoi fornire una URI del file pspec.xml. PiSi recupererà\n" +"tutti i file necessari e costruirà per te il pacchetto.\n" +"\n" +"In alternativa, puoi fornire il nome di un pacchetto sorgente\n" +"da scaricare da un repository contenente i sorgenti.\n" + +#: pisi/cli/commands.py:432 +msgid "build options" +msgstr "opzioni di costruzione" + +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 +msgid "Output directory for produced packages" +msgstr "Cartella di output per i pacchetti prodotti" + +#: pisi/cli/commands.py:443 +msgid "Bypass errors from ActionsAPI" +msgstr "Ignora errori dalle ActionsAPI" + +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 +msgid "Bypass safety switch" +msgstr "Ignora switch di sicurezza" + +#: pisi/cli/commands.py:447 +#, fuzzy +msgid "Bypass testing step" +msgstr "Ignora switch di sicurezza" + +#: pisi/cli/commands.py:449 +msgid "Create a static package with ar files" +msgstr "Crea un pacchetto statico con file ar" + +#: pisi/cli/commands.py:451 +msgid "" +"Do not install build dependencies, fail if a build dependency is present" +msgstr "" +"Non installare dipendenze di compilazione, fallisce se sono presenti delle " +"dipendenze" + +#: pisi/cli/commands.py:453 +msgid "PiSi binary package formats: '1.0', '1.1' (default)" +msgstr "Formati dei pacchetti binari PiSi: '1.0', '1.1' (predefinito)" + +#: pisi/cli/commands.py:456 +msgid "build steps" +msgstr "passi di costruzione" + +#: pisi/cli/commands.py:458 +msgid "Break build after fetching the source archive" +msgstr "Interrompi la costruzione dopo aver recuperato l'archivio dei sorgenti" + +#: pisi/cli/commands.py:460 +msgid "" +"Break build after unpacking the source archive, checking sha1sum and " +"applying patches" +msgstr "" +"Interrompi la costruzione dopo aver scompattato l'archivio dei sorgenti, " +"aver controllato sha1sum e applicato le patch" + +#: pisi/cli/commands.py:462 +msgid "Break build after running configure step" +msgstr "Interrompi la costruzione dopo l'esecuzione del passo di configure" + +#: pisi/cli/commands.py:464 +msgid "Break build after running compile step" +msgstr "Interrompi la costruzione dopo l'esecuzione del passo di compilazione" + +#: pisi/cli/commands.py:466 +#, fuzzy +msgid "Break build after running check step" +msgstr "Interrompi la costruzione dopo l'esecuzione del passo di compilazione" + +#: pisi/cli/commands.py:468 +msgid "Break build after running install step" +msgstr "Interrompi la costruzione dopo l'esecuzione del passo di install" + +#: pisi/cli/commands.py:470 +msgid "create PiSi package" +msgstr "crea pacchetto PiSi" + +#: pisi/cli/commands.py:484 +msgid "package_format must be one of %s " +msgstr "il formato del pacchetto deve essere uno tra %s" + +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 +msgid "Output directory: %s" +msgstr "Cartella di output: %s" + +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 +msgid "Outputting packages in the working directory." +msgstr "Crea i pacchetti nella cartella di lavoro." + +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +#, fuzzy +msgid "delta options" +msgstr "opzioni index" + +#: pisi/cli/commands.py:549 +msgid "" +"Build and install PiSi source packages from repository\n" +"\n" +"Usage: emerge ...\n" +"\n" +"You should give the name of a source package to be\n" +"downloaded from a repository containing sources.\n" +"\n" +"You can also give the name of a component.\n" +msgstr "" +"Costruisce e installa i pacchetti sorgenti PiSi da un repository\n" +"\n" +"Utilizzo: emerge ...\n" +"\n" +"Dovresti fornire il nome di un pacchetto sorgente da scaricare\n" +"da un repository che contiene i sorgenti.\n" +"\n" +"Puoi anche fornire il nome di un componente.\n" + +#: pisi/cli/commands.py:568 +msgid "emerge options" +msgstr "opzioni di emerge" + +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 +msgid "Ignore file conflicts" +msgstr "Ignora i conflitti tra i file" + +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 +msgid "Ignore package conflicts" +msgstr "Ignora i conflitti tra i pacchetti" + +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 +msgid "Bypass comar configuration agent" +msgstr "Ignora l'agente di configurazione di COMAR" + +#: pisi/cli/commands.py:587 +msgid "Outputting binary packages in the package cache." +msgstr "Output dei pacchetti binari nella cache dei pacchetti." + +#: pisi/cli/commands.py:595 +msgid "Abstract package operation command" +msgstr "" + +#: pisi/cli/commands.py:608 +msgid "Do not perform any action, just show what would be done" +msgstr "Non eseguire alcuna azione, mostra solo cosa verrebbe fatto" + +#: pisi/cli/commands.py:619 +msgid "" +"Install PiSi packages\n" +"\n" +"Usage: install ... \n" +"\n" +"You may use filenames, URI's or package names for packages. If you have\n" +"specified a package name, it should exist in a specified repository.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Installa pacchetti PiSi\n" +"\n" +"Utilizzo: install ... \n" +"\n" +"Puoi utilizzare nomi dei file, URI o nomi dei pacchetti. Se hai specificato\n" +"il nome di un pacchetto, esso deve esistere in un repository specificato.\n" +"\n" +"Puoi anche specificare i componenti invece dei nomi dei pacchetti; essi " +"verranno\n" +"poi espansi per ottenere i nomi dei pacchetti.\n" + +#: pisi/cli/commands.py:637 +msgid "install options" +msgstr "opzioni di installazione" + +#: pisi/cli/commands.py:642 +msgid "Reinstall already installed packages" +msgstr "Reinstalla i pacchetti già installati" + +#: pisi/cli/commands.py:648 +msgid "Install component's and recursive components' packages" +msgstr "Installa i pacchetti del componente e dei componenti ricorsivi" + +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 +msgid "Fetch upgrades but do not install." +msgstr "Recupera aggiornamenti ma non installarli." + +#: pisi/cli/commands.py:677 +msgid "" +"Upgrade PiSi packages\n" +"\n" +"Usage: Upgrade [ ... ]\n" +"\n" +": package name\n" +"\n" +"Upgrades the entire system if no package names are given\n" +"\n" +"You may use only package names to specify packages because\n" +"the package upgrade operation is defined only with respect\n" +"to repositories. If you have specified a package name, it\n" +"should exist in the package repositories. If you just want to\n" +"reinstall a package from a PiSi file, use the install command.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Aggiorna pacchetti PiSi\n" +"\n" +"Utilizzo: Upgrade [ ... ]\n" +"\n" +": nome del pacchetto\n" +"\n" +"Aggiorna l'intero sistema se non viene specificato alcun pacchetto\n" +"\n" +"Puoi utilizzare solo i nomi dei pacchetti per specificarli poiché\n" +"l'operazione di aggiornamento dei pacchetti è definita solo in releazione " +"ai\n" +"ai repository. Se hai specificato un nome di pacchetto, esso\n" +"deve esistere nei repository. Se desideri solo reinstallare\n" +"un pacchetto da un file PiSi, utilizza il comando install.\n" +"\n" +"Puoi anche specificare i componenti invece dei nomi dei pacchetti; essi " +"verranno\n" +"poi espansi per ottenere i nomi dei pacchetti.\n" + +#: pisi/cli/commands.py:703 +msgid "upgrade options" +msgstr "opzioni di aggiornamento" + +#: pisi/cli/commands.py:708 +msgid "Security related package upgrades only" +msgstr "Solo aggiornamenti dei pacchetti relativi alla sicurezza" + +#: pisi/cli/commands.py:710 +msgid "Do not update repositories" +msgstr "Non aggiornare i repository" + +#: pisi/cli/commands.py:716 +msgid "Upgrade component's and recursive components' packages" +msgstr "Aggiorna i pacchetti del componente e dei componenti ricorsivi" + +#: pisi/cli/commands.py:720 +msgid "" +"When upgrading system, ignore packages and components whose basenames match " +"pattern." +msgstr "" +"All'aggiornamento del sistema, ignora i pacchetti e i componenti i cui nomi " +"base corrispondono al modello." + +#: pisi/cli/commands.py:722 +msgid "" +"When upgrading system, ignore packages and components whose " +"basenames match any pattern contained in file." +msgstr "" +"All'aggiornamento del sistema, ignora i pacchetti e i componenti i cui nomi " +"base corrispondono a uno dei modelli contenuti nel file." + +#: pisi/cli/commands.py:766 +msgid "Updating repositories" +msgstr "Aggiornamento repository in corso" + +#: pisi/cli/commands.py:771 +msgid "Will not update repositories" +msgstr "Non aggiornerà i repository" + +#: pisi/cli/commands.py:796 +msgid "" +"Remove PiSi packages\n" +"\n" +"Usage: remove ... \n" +"\n" +"Remove package(s) from your system. Just give the package names to remove.\n" +"\n" +"You can also specify components instead of package names, which will be\n" +"expanded to package names.\n" +msgstr "" +"Rimuove i pacchetti PiSi\n" +"\n" +"Utilizzo: remove ... \n" +"\n" +"Rimuove uno o più pacchetti dal tuo sistema. Devi solo fornire i nomi dei " +"pacchetti da rimuovere.\n" +"\n" +"Puoi anche specificare i componenti invece dei nomi dei pacchetti; essi " +"verranno\n" +"poi espansi per ottenere i nomi dei pacchetti.\n" + +#: pisi/cli/commands.py:813 +msgid "remove options" +msgstr "opzioni di rimozione" + +#: pisi/cli/commands.py:816 +msgid "Remove component's and recursive components' packages" +msgstr "Rimuovi i pacchetti del componente e dei componenti ricorsivi" + +#: pisi/cli/commands.py:838 +msgid "" +"Configure pending packages\n" +"\n" +"If COMAR configuration of some packages were not\n" +"done at installation time, they are added to a list\n" +"of packages waiting to be configured. This command\n" +"configures those packages.\n" +msgstr "" +"Configura i pacchetti in sospeso\n" +"\n" +"Se la configurazione COMAR di qualche pacchetto non è\n" +"stata effettuata durante l'installazione, essi verranno aggiunti a\n" +"una lista di pacchetti in attesa di essere configurati. Questo\n" +"comando configura tali pacchetti.\n" + +#: pisi/cli/commands.py:854 +msgid "configure-pending options" +msgstr "opzioni configure-pending" + +#: pisi/cli/commands.py:866 +msgid "" +"Display package information\n" +"\n" +"Usage: info ... \n" +"\n" +" is either a package name or a .pisi file,\n" +msgstr "" +"Mostra informazioni sui pacchetti\n" +"\n" +"Utilizzo: info ... \n" +"\n" +" è o il nome di un pacchetto o un file .pisi,\n" + +#: pisi/cli/commands.py:881 +msgid "info options" +msgstr "opzioni di informazione" + +#: pisi/cli/commands.py:888 +msgid "Show a list of package files." +msgstr "Mostra una lista dei files dei pacchetti." + +#: pisi/cli/commands.py:890 +msgid "Info about the given component" +msgstr "Informazioni sul componente specificato" + +#: pisi/cli/commands.py:893 +msgid "Show only paths." +msgstr "Mostra solo i percorsi." + +#: pisi/cli/commands.py:895 +msgid "Do not show details" +msgstr "Non mostrare i dettagli" + +#: pisi/cli/commands.py:897 +msgid "Output in xml format" +msgstr "Output in formato xml" + +#: pisi/cli/commands.py:943 +msgid "Package file: %s" +msgstr "File pacchetto: %s" + +#: pisi/cli/commands.py:949 +msgid "[inst] " +msgstr "[inst] " + +#: pisi/cli/commands.py:951 +msgid "Installed package:" +msgstr "Pacchetto installato:" + +#: pisi/cli/commands.py:957 +msgid "[repo] " +msgstr "[repo] " + +#: pisi/cli/commands.py:959 +#, fuzzy +msgid "Package found in %s repository:" +msgstr "Pacchetto trovato nel repository:" + +#: pisi/cli/commands.py:963 +msgid "%s is not found in repositories" +msgstr "%s non è stato trovato nei repository" + +#: pisi/cli/commands.py:966 +msgid "%s is not installed" +msgstr "%s non è installato" + +#: pisi/cli/commands.py:979 +msgid "Reverse Dependencies:" +msgstr "Richiesto da:" + +#: pisi/cli/commands.py:982 +msgid "" +"\n" +"Files:" +msgstr "" +"\n" +"File:" + +#: pisi/cli/commands.py:990 +msgid "File information not available" +msgstr "Informazioni sul file non disponibili" + +#: pisi/cli/commands.py:996 +msgid "" +"Verify installation\n" +"\n" +"Usage: check [ ... ]\n" +"\n" +": package name\n" +"\n" +"A cryptographic checksum is stored for each installed\n" +"file. Check command uses the checksums to verify a package.\n" +"Just give the names of packages.\n" +"\n" +"If no packages are given, checks all installed packages.\n" +msgstr "" +"Verifica installazione\n" +"\n" +"Utilizzo: check [ ... ]\n" +"\n" +": nome del pacchetto\n" +"\n" +"Una somma di verifica crittografica viene memorizzata per ogni file\n" +"installato. Il comando check utilizza tali somme per verificare un " +"pacchetto.\n" +"Devi solamente fornire i nomi dei pacchetti.\n" +"\n" +"Se non vengono specificati dei pacchetti, vengono verificati tutti i " +"pacchetti installati.\n" + +#: pisi/cli/commands.py:1016 +#, fuzzy +msgid "check options" +msgstr "opzioni di ricerca" + +#: pisi/cli/commands.py:1018 +#, fuzzy +msgid "Check installed packages under given component" +msgstr "Elenca i pacchetti installati sotto il componente fornito" + +#: pisi/cli/commands.py:1034 +msgid "Checking all installed packages" +msgstr "Controllo di tutti i pacchetti installati" + +#: pisi/cli/commands.py:1038 +msgid "* Checking %s... " +msgstr "* Controllo di %s in corso... " + +#: pisi/cli/commands.py:1042 +msgid "" +"\n" +"Package %s is corrupt." +msgstr "" +"\n" +"Il pacchetto %s è corrotto." + +#: pisi/cli/commands.py:1046 +msgid "Package %s not installed" +msgstr "Il pacchetto %s non è installato" + +#: pisi/cli/commands.py:1051 +msgid "" +"Index PiSi files in a given directory\n" +"\n" +"Usage: index ...\n" +"\n" +"This command searches for all PiSi files in a directory, collects PiSi\n" +"tags from them and accumulates the information in an output XML file,\n" +"named by default 'pisi-index.xml'. In particular, it indexes both\n" +"source and binary packages.\n" +"\n" +"If you give multiple directories, the command still works, but puts\n" +"everything in a single index file.\n" +msgstr "" +"Indicizza i file PiSi in una cartella specificata\n" +"\n" +"Utilizzo: index ...\n" +"\n" +"Questo comando cerca tutti i file PiSi nella cartella, raccoglie i loro tag\n" +"PiSi e accumula le informazione in un file di output in formato XML,\n" +"il cui nome predefinito è 'pisi-index.xml'. In particolare, indicizza sia i " +"pacchetti\n" +"sorgente che quelli binari.\n" +"\n" +"Se fornisci più cartelle, il comando funziona comunque, ma\n" +"il risultato verrà scritto su un unico file di indice.\n" + +#: pisi/cli/commands.py:1072 +msgid "index options" +msgstr "opzioni index" + +#: pisi/cli/commands.py:1076 +msgid "Store absolute links for indexed files." +msgstr "Memorizza i collegamenti assoluti per i file indicizzati." + +#: pisi/cli/commands.py:1079 +msgid "Index output file" +msgstr "Indicizza file di output" + +#: pisi/cli/commands.py:1082 +msgid "Do not index PiSi spec files." +msgstr "Non indicizzare i file spec di PiSi." + +#: pisi/cli/commands.py:1085 +msgid "Do not sign index." +msgstr "Non firmare l'indice." + +#: pisi/cli/commands.py:1098 +msgid "Indexing current directory." +msgstr "Indicizzazione della cartella corrente." + +#: pisi/cli/commands.py:1106 +msgid "" +"Print the list of all installed packages\n" +"\n" +"Usage: list-installed\n" +msgstr "" +"Stampa la lista di tutti i pacchetti installati\n" +"\n" +"Utilizzo: list-installed\n" + +#: pisi/cli/commands.py:1120 +msgid "list-installed options" +msgstr "opzioni list-installed" + +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 +msgid "Show in long format" +msgstr "Mostra nel formato lungo" + +#: pisi/cli/commands.py:1125 +msgid "List installed packages under given component" +msgstr "Elenca i pacchetti installati sotto il componente fornito" + +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 +msgid "Show detailed install info" +msgstr "Mostra informazione dettagliate sull'installazione" + +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 +msgid "" +"Package Name |St| Version| Rel.| Build| Distro| Date" +msgstr "" +"Nome pacchetto |St| Versione| Rel.| Build| Distro| Data" + +#: pisi/cli/commands.py:1159 +msgid "" +"Rebuild Databases\n" +"\n" +"Usage: rebuilddb [ ... ]\n" +"\n" +"Rebuilds the PiSi databases\n" +"\n" +"If package specs are given, they should be the names of package\n" +"dirs under /var/lib/pisi\n" +msgstr "" +"Ricostruisce i database\n" +"\n" +"Utilizzo: rebuilddb [ ... ]\n" +"\n" +"Ricostruisce i database PiSi\n" +"\n" +"Se vengono forniti dei pacchetti, dovrebbero essere i nome delle cartelle " +"dei\n" +"pacchetti in /var/lib/pisi\n" + +#: pisi/cli/commands.py:1177 +msgid "rebuild-db options" +msgstr "opzioni rebuild-db" + +#: pisi/cli/commands.py:1180 +msgid "Rebuild files database" +msgstr "Ricostruisci il database dei file" + +#: pisi/cli/commands.py:1191 +msgid "Rebuild PiSi databases?" +msgstr "Ricostruire il database PiSi?" + +#: pisi/cli/commands.py:1198 +msgid "" +"Update repository databases\n" +"\n" +"Usage: update-repo [ ... ]\n" +"\n" +": repository name\n" +"\n" +"Synchronizes the PiSi databases with the current repository.\n" +"If no repository is given, all repositories are updated.\n" +msgstr "" +"Aggiorna i database dal repository\n" +"\n" +"Utilizzo: update-repo [ ... ]\n" +"\n" +": nome repository\n" +"\n" +"Sincronizza i database PiSi con il repository corrente.\n" +"Se nessun repository viene fornito, verranno aggiornati tutti i repository.\n" + +#: pisi/cli/commands.py:1216 +msgid "update-repo options" +msgstr "opzioni update-repo" + +#: pisi/cli/commands.py:1220 +msgid "Update database in any case" +msgstr "Aggiorna il database in ogni caso" + +#: pisi/cli/commands.py:1238 +msgid "" +"Add a repository\n" +"\n" +"Usage: add-repo \n" +"\n" +": name of repository to add\n" +": URI of index file\n" +"\n" +"If no repo is given, add-repo pardus-devel repo is added by default\n" +"\n" +"NB: We support only local files (e.g., /a/b/c) and http:// URIs at the " +"moment\n" +msgstr "" +"Aggiunge un repository\n" +"\n" +"Utilizzo: add-repo \n" +"\n" +": nome del repository da aggiungere\n" +": URI del file di indice\n" +"\n" +"Se non viene fornito alcun repository, viene aggiunto automaticamente il " +"repository pardus-devel\n" +"\n" +"NB: Sono supportati solo file locali (es., /a/b/c) e URI http:// per il " +"momento.\n" + +#: pisi/cli/commands.py:1258 +msgid "add-repo options" +msgstr "opzioni add-repo" + +#: pisi/cli/commands.py:1261 +msgid "Add repository at given position (0 is first)" +msgstr "Aggiunge il repository a una posizione specificata (0 è la prima)" + +#: pisi/cli/commands.py:1275 +msgid "Update PiSi database for repository %s?" +msgstr "Aggiorna il database PiSi per il repository %s?" + +#: pisi/cli/commands.py:1279 +msgid "%s repository could not be reached. Removing %s from system." +msgstr "" +"Il repository %s non può essere raggiunto. Rimozione di %s dal sistema in " +"corso." + +#: pisi/cli/commands.py:1288 +msgid "" +"Remove repositories\n" +"\n" +"Usage: remove-repo ... \n" +"\n" +"Remove all repository information from the system.\n" +msgstr "" +"Rimuove i repository\n" +"\n" +"Utilizzo: remove-repo ... \n" +"\n" +"Rimuove tutte le informazioni dei repository dal sistema.\n" + +#: pisi/cli/commands.py:1314 +msgid "" +"List repositories\n" +"\n" +"Usage: list-repo\n" +"\n" +"Lists currently tracked repositories.\n" +msgstr "" +"Elenca i repository\n" +"\n" +"Utilizzo: list-repo\n" +"\n" +"Elenca i repository tenuti al momento sotto controllo.\n" + +#: pisi/cli/commands.py:1337 +msgid "" +"List available packages in the repositories\n" +"\n" +"Usage: list-available [ ... repon ]\n" +"\n" +"Gives a brief list of PiSi packages published in the specified\n" +"repositories. If no repository is specified, we list packages in\n" +"all repositories.\n" +msgstr "" +"Elenca i pacchetti disponibili nei repository\n" +"\n" +"Utilizzo: list-available [ ... repon ]\n" +"\n" +"Fornisce una breve lista dei pacchetti PiSi pubblicati nei \n" +"repository specificati. Se non ne viene specificato nessuno,\n" +"verrà fornito una lista dei pacchetti di tutti i repository.\n" + +#: pisi/cli/commands.py:1354 +msgid "list-available options" +msgstr "opzioni list-available" + +#: pisi/cli/commands.py:1358 +msgid "List available packages under given component" +msgstr "Elenca i pacchetti disponibili sotto il componente fornito" + +#: pisi/cli/commands.py:1360 +msgid "Show uninstalled packages only" +msgstr "Mostra solo i pacchetti disinstallati" + +#: pisi/cli/commands.py:1368 +msgid "Installed packages are shown in this color" +msgstr "I pacchetti installati sono mostrati in questo colore" + +#: pisi/cli/commands.py:1376 +msgid "Repository : %s\n" +msgstr "Repository : %s\n" + +#: pisi/cli/commands.py:1403 +msgid "" +"List available components\n" +"\n" +"Usage: list-components\n" +"\n" +"Gives a brief list of PiSi components published in the\n" +"repositories.\n" +msgstr "" +"Elenca i componenti disponibili\n" +"\n" +"Utilizzo: list-components\n" +"\n" +"Fornisce una breve lista dei componenti PiSi pubblicati nei repository.\n" + +#: pisi/cli/commands.py:1418 +msgid "list-components options" +msgstr "opzioni list-components" + +#: pisi/cli/commands.py:1443 +msgid "" +"List available sources\n" +"\n" +"Usage: list-sources\n" +"\n" +"Gives a brief list of sources published in the repositories.\n" +msgstr "" +"Elenca i sorgenti disponibili\n" +"\n" +"Utilizzo: list-sources\n" +"\n" +"Fornisce una breve lista dei sorgenti pubblicati nei repository.\n" + +#: pisi/cli/commands.py:1457 +msgid "list-sources options" +msgstr "opzioni list-sources" + +#: pisi/cli/commands.py:1482 +msgid "" +"List packages to be upgraded\n" +"\n" +"Usage: list-upgrades\n" +"\n" +"Lists the packages that will be upgraded.\n" +msgstr "" +"Elenca i pacchetti da aggiornare\n" +"\n" +"Utilizzo: list-upgrades\n" +"\n" +"Elenca i pacchetti che verranno aggiornati.\n" + +#: pisi/cli/commands.py:1496 +msgid "list-upgrades options" +msgstr "opzioni list-upgrades" + +#: pisi/cli/commands.py:1501 +msgid "List upgradable packages under given component" +msgstr "Elenca i pacchetti aggiornabili sotto il componente fornito" + +#: pisi/cli/commands.py:1518 pisi/operations.py:460 +msgid "No packages to upgrade." +msgstr "Nessun pacchetto da aggiornare." + +#: pisi/cli/commands.py:1538 +msgid "" +"List pending packages\n" +"\n" +"Lists packages waiting to be configured.\n" +msgstr "" +"Elenca i pacchetti in attesa\n" +"\n" +"Elenca i pacchetti in attesa di essere configurati.\n" + +#: pisi/cli/commands.py:1560 +msgid "There are no packages waiting to be configured" +msgstr "Nessun pacchetto è in attesa di essere configurato" + +#: pisi/cli/commands.py:1565 +msgid "" +"Search packages\n" +"\n" +"Usage: search ... \n" +"\n" +"Finds a package containing specified search terms\n" +"in summary, description, and package name fields.\n" +msgstr "" +"Cerca i pacchetti\n" +"\n" +"Utilizzo: search ... \n" +"\n" +"Trova un pacchetto che contiene i termini di ricerca specificati\n" +"nei campi sommario, descrizione e nome del pacchetto.\n" + +#: pisi/cli/commands.py:1580 +msgid "search options" +msgstr "opzioni di ricerca" + +#: pisi/cli/commands.py:1586 +msgid "Show details" +msgstr "Mostra dettagli" + +#: pisi/cli/commands.py:1598 +msgid "%s packages found" +msgstr "%s pacchetti trovati" + +#: pisi/cli/commands.py:1607 +msgid "" +"Search for a file\n" +"\n" +"Usage: search-file ... \n" +"\n" +"Finds the installed package which contains the specified file.\n" +msgstr "" +"Cerca un file\n" +"\n" +"Utilizzo: search-file ... \n" +"\n" +"Trova il pacchetto installato che contiene il file specificato.\n" + +#: pisi/cli/commands.py:1621 +msgid "search-file options" +msgstr "opzioni search-file" + +#: pisi/cli/commands.py:1625 +msgid "Fuzzy search" +msgstr "Ricerca fuzzy" + +#: pisi/cli/commands.py:1627 +msgid "Show only package name" +msgstr "Mostra solo nomi dei pacchetti" + +#: pisi/cli/commands.py:1648 +msgid "Package %s has file %s" +msgstr "Il pacchetto %s contiene il file %s" + +#: pisi/cli/commands.py:1650 +msgid "Type: %s, Hash: %s" +msgstr "Tipo: %s, Hash: %s" + +#: pisi/cli/commands.py:1653 +msgid "Path '%s' does not belong to an installed package" +msgstr "Il percorso '%s' non appartiene a un pacchetto installato" + +#: pisi/cli/commands.py:1666 +msgid "Searching for %s" +msgstr "Ricerca di %s in corso" + +#: pisi/cli/commands.py:1676 +msgid "" +"%prog [options] [arguments]\n" +"\n" +"where is one of:\n" +"\n" +msgstr "" +"%prog [opzioni] [argomenti]\n" +"\n" +"dove è uno di:\n" +"\n" + +#: pisi/cli/commands.py:1682 +msgid "" +"\n" +"Use \"%prog help \" for help on a specific command.\n" +msgstr "" +"\n" +"Utilizzo \"%prog help \" per aiuto su un comando specifico.\n" + +#: pisi/cli/pisicli.py:56 +msgid "Options must precede non-option arguments" +msgstr "Le opzioni devono precedere gli argomenti non opzioni" + +#: pisi/cli/pisicli.py:97 +msgid "No command given" +msgstr "Nessun comando fornito" + +#: pisi/cli/pisicli.py:100 +msgid "Command line parsing error" +msgstr "Errore nell'analisi della linea di comando" + +#: pisi/comariface.py:54 +msgid "cannot connect to comar" +msgstr "impossibile collegarsi a comar" + +#: pisi/comariface.py:72 +msgid "Could not restart comar" +msgstr "impossibile riavviare comar" + +#: pisi/comariface.py:77 +msgid "connection with comar unexpectedly closed" +msgstr "connessione con comar chiusa inaspettatamente" + +#: pisi/comariface.py:90 +msgid "Configuration error: %s" +msgstr "Errore di configurazione: %s" + +#: pisi/comariface.py:92 +msgid "Script error: %s" +msgstr "Errore nello script: %s" + +#: pisi/comariface.py:94 +msgid "comar denied our access" +msgstr "comar ha negato l'accesso" + +#: pisi/comariface.py:99 +msgid "Configuring %s package" +msgstr "Configurazione %s pacchetto in corso" + +#: pisi/comariface.py:104 +msgid "Registering %s comar script" +msgstr "Registrazione script COMAR %s" + +#: pisi/comariface.py:110 +msgid "Calling post install handlers" +msgstr "Chiamata dei gestori di post installazione" + +#: pisi/comariface.py:115 +msgid "Running package's post install script" +msgstr "Esecuzione dello script post installazione del pacchetto" + +#: pisi/comariface.py:122 +msgid "Configuring %s package for removal" +msgstr "Configurazione del pacchetto %s per la rimozione" + +#: pisi/comariface.py:125 +msgid "Running package's pre remove script" +msgstr "Esecuzione dello script pre rimozione del pacchetto" + +#: pisi/comariface.py:129 +msgid "Calling pre remove handlers" +msgstr "Chiamata dei gestori di pre rimozione" + +#: pisi/comariface.py:133 +msgid "Unregistering comar scripts" +msgstr "Deregistrazionescript COMAR" + +#: pisi/component.py:105 pisi/component.py:111 +msgid "Component %s not found" +msgstr "Componente %s non trovato" + +#: pisi/component.py:207 pisi/component.py:233 +msgid "Information for component %s not available" +msgstr "Nessuna informazione disponibile per il pacchetto %s" + +#: pisi/config.py:60 +msgid "Destination directory %s does not exist. Creating it." +msgstr "La cartella di destinazione %s non esiste. La sto creando." + +#: pisi/configfile.py:107 +msgid "No section by name '%s'" +msgstr "Nessuna sezione di nome '%s'" + +#: pisi/conflict.py:39 pisi/dependency.py:40 +msgid " version >= " +msgstr " versione >= " + +#: pisi/conflict.py:41 pisi/dependency.py:42 +msgid " version <= " +msgstr " versione <= " + +#: pisi/conflict.py:43 pisi/dependency.py:44 +msgid " version " +msgstr " versione" + +#: pisi/conflict.py:45 pisi/dependency.py:46 +msgid " release >= " +msgstr " release >= " + +#: pisi/conflict.py:47 pisi/dependency.py:48 +msgid " release <= " +msgstr " release <= " + +#: pisi/conflict.py:49 pisi/dependency.py:50 +msgid " release " +msgstr " release " + +#: pisi/constants.py:30 +msgid "Can't rebind constant: %s" +msgstr "Impossibile ricollegare la costante: %s" + +#: pisi/constants.py:36 +msgid "Can't unbind constant: %s" +msgstr "Impossibile scollegare la costante: %s" + +#: pisi/delta.py:27 +#, fuzzy +msgid "Cannot create delta for same package!" +msgstr "Impossibile creare la cartella %s" + +#: pisi/delta.py:41 +#, fuzzy +msgid "Creating delta PiSi package between %s %s" +msgstr "Creazione del pacchetto PiSi %s." + +#: pisi/dependency.py:107 +msgid "%s dependency of package %s is not satisfied" +msgstr "La dipendenza %s del pacchetto %s non è soddisfatta" + +#: pisi/dependency.py:120 +msgid "Package %s is not present in the package database" +msgstr "Il pacchetto %s non è presente nel database dei pacchetti" + +#: pisi/fetcher.py:81 +msgid "Filename error" +msgstr "Errore nel nome del file" + +#: pisi/fetcher.py:84 +msgid "Access denied to write to destination directory: \"%s\"" +msgstr "Accesso negato in scrittura nella cartella di destinazione: \"%s\"" + +#: pisi/fetcher.py:89 +msgid "Access denied to destination file: \"%s\"" +msgstr "Accesso negato al file di destinazione: \"%s\"" + +#: pisi/fetcher.py:100 +msgid "" +"A problem occured. Please check the archive address and/or permissions again." +msgstr "" +"C'è stato un problema. Controlla per favore di nuovo l'indirizzo " +"dell'archivio e/o i permessi." + +#: pisi/fetcher.py:158 +msgid "No such file or no permission to read" +msgstr "File non esistente o permesso di lettura negato" + +#: pisi/fetcher.py:182 +msgid "Requested range not satisfiable, starting again." +msgstr "Impossibile soddisfare l'intervallo richiesto, inizio di nuovo." + +#: pisi/fetcher.py:189 +msgid "Cannot fetch %s; value error: %s" +msgstr "Impossibile recuperare %s; valore errore: %s" + +#: pisi/fetcher.py:191 pisi/fetcher.py:195 +msgid "Cannot fetch %s; %s" +msgstr "Impossibile recuperare %s; %s" + +#: pisi/fetcher.py:193 +msgid "Please check your network connections and try again. (%s)" +msgstr "Controlla per favore la tua connessione di rete e riprova. (%s)" + +#: pisi/fetcher.py:197 +msgid "Cannot fetch %s; (%s): %s" +msgstr "Impossibile recuperare %s; (%s): %s" + +#: pisi/fetcher.py:243 +msgid "Proxy configuration has been found for '%s' protocol" +msgstr "Trovata configurazione proxy per il protocollo '%s'" + +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 +msgid "ftp error" +msgstr "errore ftp" + +#: pisi/file.py:66 +msgid "uri must have type either URI or string" +msgstr "la uri deve avere come tipo o URI o stringa" + +#: pisi/file.py:89 +msgid "zip compression not supported yet" +msgstr "la compressione zip non è ancora supportata " + +#: pisi/file.py:117 +msgid "Fetching %s" +msgstr "Recupero di %s" + +#: pisi/file.py:122 +msgid "Copying %s to transfer dir" +msgstr "Copia di %s alla cartella di trasferimento" + +#: pisi/file.py:127 +msgid "File '%s' not found." +msgstr "File '%s' non trovato." + +#: pisi/file.py:135 +msgid "File integrity of %s compromised." +msgstr "Integrità del file %s compromessa." + +#: pisi/file.py:155 +msgid "File mode must be either File.read or File.write" +msgstr "Il modo del file deve essere o File.read o FIle.write" + +#: pisi/file.py:160 +msgid "Remote write not implemented" +msgstr "La scrittura remota non è ancora implementata" + +#: pisi/file.py:187 +msgid "gzip compression not supported yet" +msgstr "la compressione gzip non è ancora supportata " + +#: pisi/file.py:202 pisi/file.py:205 +msgid "ERROR: gpg --detach-sig %s failed" +msgstr "ERRORE: gpg --detach-sig %s fallito" + +#: pisi/graph.py:31 +msgid "Encountered cycle %s" +msgstr "Riscontrato ciclo %s" + +#: pisi/index.py:100 +msgid "Adding %s to component index" +msgstr "Aggiunta di %s all'indice dei componenti" + +#: pisi/index.py:112 +msgid "Adding %s to package index" +msgstr "Aggiunta di %s all'indice dei pacchetti" + +#: pisi/index.py:126 +msgid "Updating package database of %s" +msgstr "Aggiornamento del database dei pacchetti di %s" + +#: pisi/index.py:154 +msgid "Package %s: metadata corrupt, skipping..." +msgstr "Pacchetto %s: metadata corrotti, lo salto..." + +#: pisi/index.py:193 +msgid "Adding %s to source index" +msgstr "Aggiunta di %s all'indice dei sorgenti" + +#: pisi/installdb.py:55 +msgid "installed" +msgstr "installato" + +#: pisi/installdb.py:55 +msgid "installed-pending" +msgstr "installato-in sospeso" + +#: pisi/installdb.py:56 +msgid "purged" +msgstr "rimosso completamente" + +#: pisi/installdb.py:56 +msgid "removed" +msgstr "rimosso" + +#: pisi/installdb.py:59 +msgid "" +"State: %s\n" +"Version: %s, Release: %s, Build: %s\n" +msgstr "" +"Stato: %s\n" +"Versione: %s, Release: %s, Build: %s\n" + +#: pisi/installdb.py:64 +msgid "Distribution: %s, Install Time: %s\n" +msgstr "Distribuzione: %s, Data installazione: %s\n" + +#: pisi/installdb.py:151 +msgid "Already installed" +msgstr "Già installato" + +#: pisi/itembyrepodb.py:120 +msgid "Invalid repository string" +msgstr "Stringa del repository non valida" + +#: pisi/itembyrepodb.py:142 +msgid "Key %s not found" +msgstr "Chiave %s non trovata" + +#: pisi/itembyrepodb.py:152 +msgid "Key %s in repo %s not found" +msgstr "Chiave %s nel repository %s non trovata" + +#: pisi/lockeddbshelve.py:46 +msgid "Database version for %s insufficient. Please run rebuild-db command." +msgstr "" +"Versione del database per %s insufficiente. Lancia per favore il comando " +"rebuild-db." + +#: pisi/lockeddbshelve.py:50 +msgid "" +"Database version for %s greater than PiSi version. You need a newer PiSi." +msgstr "" +"La versione del database per %s è maggiore della versione di PiSi. Ti serve " +"una versione più recente di PiSi." + +#: pisi/lockeddbshelve.py:61 +msgid "Cannot attain write access to database environment" +msgstr "Impossibile ottenere accesso in scrittura all'ambiente del database" + +#: pisi/lockeddbshelve.py:63 +msgid "Database version %s not present." +msgstr "Versione del database %s non presente." + +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 +msgid "" +"Another instance of PiSi is running. Only one instance is allowed to modify " +"the PiSi database at a time." +msgstr "" +"Un'altra istanza di PiSi è in esecuzione. La modifica del database di PiSi è " +"consentita a un'unica istanza alla volta." + +#: pisi/lockeddbshelve.py:80 +msgid "Cannot attain read access to database environment" +msgstr "Impossibile ottenere accesso in lettura all'ambiente del database" + +#: pisi/lockeddbshelve.py:94 +msgid "" +"Cannot attain write access to PiSi database. You have to be root for this " +"operation." +msgstr "" +"Impossibile ottenere accesso in lettura al database PiSi. Devi essere root " +"per eseguire questa operazione." + +#: pisi/lockeddbshelve.py:112 +msgid "Cannot attain read or write access to database %s" +msgstr "Impossibile ottenere accesso in lettura o scrittura al database %s" + +#: pisi/lockeddbshelve.py:138 +msgid "" +"Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" +msgstr "" +"I flag devono essere uno di 'r', 'w, 'c', o 'n' oppure utilizza i flag bsddb." +"db.DB_*" + +#: pisi/metadata.py:74 +msgid "Distribution: %s, Dist. Release: %s\n" +msgstr "Distribuzione: %s, Versione: %s\n" + +#: pisi/metadata.py:76 +msgid "Architecture: %s, Installed Size: %s" +msgstr "Architettura: %s, Dimensione file installati: %s" + +#: pisi/mirrors.py:46 +msgid "Mirrors file %s does not exist. Could not resolve mirrors://" +msgstr "Il file dei mirror %s non esiste. Impossibile trovare mirrors://" + +#: pisi/operations.py:107 +msgid "Mixing file names and package names not supported yet." +msgstr "Non è ancora possibile mescolare nomi dei file e nomi dei pacchetti." + +#: pisi/operations.py:149 +msgid "" +"The following packages will be installed\n" +"in the respective order to satisfy extra dependencies:\n" +msgstr "" +"I seguenti pacchetti verranno installati nel\n" +"rispettivo ordine per soddisfare le dipendenze aggiuntive:\n" + +#: pisi/operations.py:152 pisi/operations.py:615 +msgid "Do you want to continue?" +msgstr "Vuoi proseguire?" + +#: pisi/operations.py:153 +msgid "External dependencies not satisfied" +msgstr "Dipendenze esterne non soddisfatte" + +#: pisi/operations.py:165 pisi/operations.py:332 +msgid "No packages to install." +msgstr "Nessun pacchetto da installare." + +#: pisi/operations.py:196 +msgid "Installation order: " +msgstr "Ordine di installazione: " + +#: pisi/operations.py:250 pisi/operations.py:272 +msgid "Conflicts remain" +msgstr "Il conflitto rimane" + +#: pisi/operations.py:260 +msgid "Selected packages [%s] are in conflict with each other." +msgstr "I pacchetti selezionati [%s] sono in conflitto tra loro." + +#: pisi/operations.py:266 +msgid "[%s conflicts with: %s]\n" +msgstr "[%s va in conflitto con: %s]\n" + +#: pisi/operations.py:268 +msgid "" +"The following packages have conflicts:\n" +"%s" +msgstr "" +"I pacchetti seguenti hanno dei conflitti:\n" +"%s" + +#: pisi/operations.py:271 +msgid "Remove the following conflicting packages?" +msgstr "Rimuovere i seguenti pacchetti conflittanti?" + +#: pisi/operations.py:298 +msgid "Safety switch: Following packages in system.base will be installed: " +msgstr "" +"Switch di sicurezza: i seguenti pacchetti in system.base verranno " +"installati: " + +#: pisi/operations.py:304 +msgid "Safety switch: Following packages in system.base will be upgraded: " +msgstr "" +"Switch di sicurezza: i seguenti pacchetti in system.base verranno " +"aggiornati: " + +#: pisi/operations.py:310 pisi/operations.py:591 +msgid "Safety switch: the component system.base cannot be found" +msgstr "Switch di sicurezza: il componente system.base non è stato trovato" + +#: pisi/operations.py:327 +msgid "" +"The following package(s) are already installed and are not going to be " +"installed again:\n" +msgstr "" +"I seguenti pacchetti sono già installati e non verranno installati " +"nuovamente:\n" + +#: pisi/operations.py:348 +msgid "" +"Following packages will be installed in the respective order to satisfy " +"dependencies:\n" +msgstr "" +"I seguenti pacchetti verranno installati nel\n" +"rispettivo ordine per soddisfare le dipendenze:\n" + +#: pisi/operations.py:353 pisi/operations.py:485 +msgid "Total size of package(s): %.2f %s" +msgstr "Dimensione totale dei pacchetti: %.2f %s" + +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 +msgid "There are extra packages due to dependencies. Do you want to continue?" +msgstr "" +"Sono inclusi dei pacchetti extra per via delle dipendenze. Desideri " +"proseguire?" + +#: pisi/operations.py:425 +msgid "Warning: package *name* ends with '.pisi'" +msgstr "Attenzione: il *nome* del pacchetto termina con '.pisi'" + +#: pisi/operations.py:428 +msgid "Package %s is not installed." +msgstr "Il pacchetto %s non è installato." + +#: pisi/operations.py:434 +msgid "Package %s is not available in repositories." +msgstr "Il pacchetto %s non è disponibile nei repository." + +#: pisi/operations.py:447 +msgid "Package %s is already at the latest release %s." +msgstr "Il pacchetto %s è già alla versione più recente %s." + +#: pisi/operations.py:453 +msgid "Package %s is already at the latest build %s." +msgstr "Il pacchetto %s è già alla build più recente %s." + +#: pisi/operations.py:480 +msgid "The following packages will be upgraded: " +msgstr "I seguenti pacchetti verranno aggiornati: " + +#: pisi/operations.py:546 +msgid "Dependency %s of %s cannot be satisfied" +msgstr "Impossibile soddisfare la dipendenza %s di %s" + +#: pisi/operations.py:547 +msgid "Upgrade is not possible." +msgstr "L'aggiornamento non è possibile." + +#: pisi/operations.py:562 +#, fuzzy +msgid "Reverse dependency %s of %s cannot be satisfied" +msgstr "La dipendenza inversa %s di %s non può essere soddisfatta" + +#: pisi/operations.py:587 +msgid "Safety switch: cannot remove the following packages in system.base: " +msgstr "" +"Switch di sicurezza: impossibile rimuovere i seguenti pacchetti in system." +"base: " + +#: pisi/operations.py:598 +msgid "Package %s does not exist. Cannot remove." +msgstr "Il pacchetto %s non esiste. Impossibile rimuovere." + +#: pisi/operations.py:602 +msgid "No packages to remove." +msgstr "Nessun pacchetto da rimuovere." + +#: pisi/operations.py:611 +msgid "" +"The following minimal list of packages will be removed\n" +"in the respective order to satisfy dependencies:\n" +msgstr "" +"La seguente lista minimale di pacchetti verrà rimossa\n" +"nel rispettivo ordine per soddisfare le dipendenze:\n" + +#: pisi/operations.py:616 +msgid "Package removal declined" +msgstr "Rimozione dei pacchetti rifiutata" + +#: pisi/operations.py:628 +msgid "Package %s is not installed. Cannot remove." +msgstr "Il pacchetto %s non è installato. Impossibile rimuovere." + +#: pisi/operations.py:677 +msgid "No packages to emerge." +msgstr "Nessun pacchetto su cui effettuare emerge." + +#: pisi/operations.py:692 +msgid "" +"The following minimal list of packages will be installed\n" +"from repository in the respective order to satisfy dependencies:\n" +msgstr "" +"La seguente lista minimale di pacchetti verrà installata\n" +"dal repository nel rispettivo ordine per soddisfare le dipendenze:\n" + +#: pisi/operations.py:695 +msgid "" +"The following minimal list of packages will be built and\n" +"installed in the respective order to satisfy dependencies:\n" +msgstr "" +"La seguente lista minimale dei pacchetti verrà costruita e\n" +"installata nel rispettivo ordine per soddisfare le dipendenze:\n" + +#: pisi/operations.py:737 +msgid "Cannot find source package: %s" +msgstr "Impossibile trovare il pacchetto di sorgenti: %s" + +#: pisi/package.py:56 +msgid "" +"There was a problem while fetching '%s'.\n" +"The package may have been upgraded. Please try to upgrade the package." +msgstr "" +"C'è stato un problema durante il recupero di '%s'.\n" +"Il pacchetto potrebbe essere stato aggiornato. Prova per favore ad " +"aggiornare il pacchetto." + +#: pisi/package.py:60 pisi/sourcearchive.py:92 +msgid "%s [cached]" +msgstr "%s [nella cache]" + +#: pisi/package.py:136 +msgid "MetaData format wrong" +msgstr "Formato MetaData errato" + +#: pisi/packagedb.py:65 +msgid "Package %s not found" +msgstr "Pacchetto %s non trovato" + +#: pisi/pxml/autoxml.py:79 +msgid "At least one '%s' tag should have local text" +msgstr "Almeno un tag '%s' dovrebbe aver del testo localizzato" + +#: pisi/pxml/autoxml.py:86 +msgid "'%s' language of tag '%s' is empty" +msgstr "lingua '%s' del tag '%s' è vuoto" + +#: pisi/pxml/autoxml.py:114 +msgid "LocalText: unable to get either current or default locale" +msgstr "" +"LocalText: impossibile ottenere sia il locale corrente che quello predefinito" + +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 +msgid "" +"Tag should have at least the current locale, or failing that an English or " +"Turkish version" +msgstr "" +"Il tag dovrebbe avere almeno il locale corrente, o in mancanza di esso una " +"versione inglese o turca" + +#: pisi/pxml/autoxml.py:372 +msgid "autoxml.check: '%s' errors" +msgstr "autoxml.check: errori '%s'" + +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 +msgid "autoxml.parse: String '%s' has errors" +msgstr "autoxml.parse: La stringa '%s' contiene degli errori" + +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 +msgid "autoxml.read: File '%s' has errors" +msgstr "autoxml.read: Il file '%s' contiene degli errori" + +#: pisi/pxml/autoxml.py:465 +msgid "autoxml.write: object validation has failed" +msgstr "autoxml.write: validazione dell'oggetto fallita" + +#: pisi/pxml/autoxml.py:473 +msgid "autoxml.write: File encoding '%s' has errors" +msgstr "autoxml.write: La codifica del file '%s' contiene degli errori" + +#: pisi/pxml/autoxml.py:523 +msgid "gen_tag: unrecognized tag type %s in spec" +msgstr "gen_tag: tipo di tag %s non riconosciuto in spec" + +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 +msgid "Mandatory variable %s not available" +msgstr "La variabile obbligatoria %s non è disponibile" + +#: pisi/pxml/autoxml.py:652 +msgid "Type mismatch: read text cannot be decoded" +msgstr "" +"Errore non corrispondenza di tipo: impossibile decodificare il testo letto" + +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 +msgid "Mandatory token %s not available" +msgstr "Il token obbligatorio %s non è disponibile" + +#: pisi/pxml/autoxml.py:670 +msgid "Type mismatch. Expected %s, got %s" +msgstr "Scambio di tipo. Atteso %s, rilevato %s" + +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 +msgid "Type mismatch: DOM cannot be decoded" +msgstr "Scambio di tipo: il DOM non può essere decodificato" + +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 +msgid "Mandatory argument not available" +msgstr "Argomento obbligatorio non disponibile" + +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 +msgid "Object cannot be encoded" +msgstr "Impossibile codificare l'oggetto" + +#: pisi/pxml/autoxml.py:741 +msgid "List type must contain only one element" +msgstr "Il tipo lista deve contenere solo un elemento" + +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 +msgid "Mandatory list \"%s\" under \"%s\" node is empty." +msgstr "La lista obbligatoria \"%s\" sotto il nodo \"%s\" è vuota." + +#: pisi/pxml/xmlext.py:79 +msgid "getNodeText: Expected text node, got something else!" +msgstr "getNodeText: Atteso il testo del nodo, ottenuto qualcos'altro!" + +#: pisi/pxml/xmlfile.py:63 +msgid "String '%s' has invalid XML" +msgstr "La stringa '%s' contiene XML non valido" + +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 +msgid "File '%s' has invalid XML" +msgstr "Il file '%s' contiene XML non valido" + +#: pisi/repodb.py:73 +msgid "No repository named %s exists" +msgstr "Non esiste alcun repository di nome %s" + +#: pisi/repodb.py:82 +msgid "Repository %s already exists" +msgstr "Il repository %s esiste già" + +#: pisi/repodb.py:89 +msgid "Cannot add repository at position %s" +msgstr "Impossibile aggiungere un repository in posizione %s" + +#: pisi/scenarioapi/package.py:67 +msgid "No pisi package: %s* found." +msgstr "Nessun pacchetto pisi: %s* trovato." + +#: pisi/scenarioapi/repoops.py:28 +msgid "Repo already has package named %s." +msgstr "Il repository ha già un pacchetto di nome %s." + +#: pisi/scenarioapi/repoops.py:52 pisi/scenarioapi/repoops.py:59 +msgid "Repo does not have package named %s." +msgstr "Il repository non ha un pacchetto di nome %s." + +#: pisi/sourcearchive.py:61 +msgid "Trying fallback address: %s" +msgstr "Tentativo con l'indirizzo di fallback: %s" + +#: pisi/sourcearchive.py:72 +msgid "%s mirrors are not defined." +msgstr "Mirror di %s non definiti." + +#: pisi/sourcearchive.py:77 +msgid "Fetching source from mirror: %s" +msgstr "Prelevamento dei sorgenti dal mirror: %s" + +#: pisi/sourcearchive.py:83 +msgid "Could not fetch source from %s mirrors." +msgstr "Impossibile recuperare il sorgente dai mirror %s." + +#: pisi/sourcearchive.py:101 +msgid "unpack: check_file_hash failed" +msgstr "unpack: check_file_hash fallito" + +#: pisi/sourcedb.py:59 pisi/sourcedb.py:65 +msgid "Source package %s not found" +msgstr "Pacchetto sorgente %s non trovato" + +#: pisi/specfile.py:140 +msgid "URI: %s, type: %s, sha1sum: %s" +msgstr "URI: %s, tipo: %s, sha1sum: %s" + +#: pisi/specfile.py:207 +msgid "Name: %s, version: %s, release: %s, build %s\n" +msgstr "Nome: %s, versione: %s, release: %s, build %s\n" + +#: pisi/specfile.py:209 +msgid "Summary: %s\n" +msgstr "Sommario: %s\n" + +#: pisi/specfile.py:210 +msgid "Description: %s\n" +msgstr "Descrizione: %s\n" + +#: pisi/specfile.py:211 +msgid "Component: %s\n" +msgstr "Componente: %s\n" + +#: pisi/specfile.py:212 +msgid "Provides: " +msgstr "Fornisce: " + +#: pisi/specfile.py:216 +msgid "Dependencies: " +msgstr "Dipendenze: " + +#: pisi/uri.py:80 +msgid "setAuthInfo needs a tuple (user, pass)" +msgstr "setAuthInfo vuole una tupla (utente, password)" + +#: pisi/util.py:122 pisi/util.py:143 +msgid "Running " +msgstr "In esecuzione" + +#: pisi/util.py:126 pisi/util.py:161 +msgid "return value for \"%s\" is %s" +msgstr "il valore di ritorno per \"%s\" è %s" + +#: pisi/util.py:361 +msgid "Including external link '%s'" +msgstr "Includendo il collegamento esterno '%s'" + +#: pisi/util.py:363 +msgid "Including directory '%s'" +msgstr "Includendo la cartella '%s'" + +#: pisi/util.py:448 +msgid "I/O Error: Cannot calculate SHA1 hash of %s" +msgstr "Errore I/O: Impossibile calcolare l'hash SHA1 di %s" + +#: pisi/util.py:459 +msgid "Cannot calculate SHA1 hash of given data" +msgstr "Impossibile calcolare l'hash SHA1 dei dati forniti" + +#: pisi/util.py:498 +msgid "ERROR: patch (%s) failed" +msgstr "ERRORE: patch (%s) fallita" + +#: pisi/util.py:500 +msgid "ERROR: patch (%s) failed: %s" +msgstr "ERRORE: patch (%s) fallita: %s" + +#: pisi/util.py:546 +msgid "strip command failed for file '%s'!" +msgstr "" + +#: pisi/util.py:553 +msgid "objcopy (keep-debug) command failed for file '%s'!" +msgstr "comando objcopy (keep-debug) fallito per il file '%s'!" + +#: pisi/util.py:559 +msgid "objcopy (add-debuglink) command failed for file '%s'!" +msgstr "comando objcopy (add-debuglink) fallito per il file '%s'!" + +#: pisi/util.py:620 +msgid "Updating environment..." +msgstr "Aggiornamento dell'ambiente..." + +#: scripts/repostats.py:226 +msgid "" +"Duplicate binary packages:\n" +"%s\n" +"%s\n" +msgstr "" +"Pacchetti binari duplicati:\n" +"%s\n" +"%s\n" + +#: scripts/repostats.py:301 +msgid "" +"Duplicate source packages:\n" +"%s\n" +"%s\n" +msgstr "" +"Pacchetti sorgenti duplicati:\n" +"%s\n" +"%s\n" + +#: scripts/repostats.py:371 +msgid "" +"Developer '%s <%s>' has another mail address '%s' in source package '%s'" +msgstr "" +"Lo sviluppatore '%s <%s>' ha un altro indirizzo di posta elettronica '%s' " +"nel pacchetto sorgente '%s'" + +#: scripts/repostats.py:467 +msgid "" +"Cannot parse '%s':\n" +"%s\n" +msgstr "" +"Impossibile analizzare '%s':\n" +"%s\n" + +#: scripts/repostats.py:553 +msgid "Usage: repostats.py [OPTIONS] source-repo-path [binary-repo-path]\n" +msgstr "" +"Utilizzo: repostats.py [OPZIONI] percorso-repo-sorgente [percorso-repo-" +"binario]\n" + +#: scripts/repostats.py:554 +msgid "Dont generate the web site.\n" +msgstr "Non generare il sito web.\n" + +#: scripts/repostats.py:575 +msgid "Scanning source repository...\n" +msgstr "Scansione del repository sorgente in corso...\n" + +#: scripts/repostats.py:579 +msgid "Scanning binary packages...\n" +msgstr "Scansione dei pacchetti binari in corso...\n" + +#~ msgid "Set search language" +#~ msgstr "Imposta lingua della ricerca" + +#~ msgid "Unknown file type '%s' in package '%s'" +#~ msgstr "Tipo di file sconosciuto '%s' nel pacchetto '%s'" + +#~ msgid "Source package '%s' has wrong date format '%s'" +#~ msgstr "Il pacchetto sorgente '%s' ha il formato della data errato '%s'" + +#~ msgid "Encountered %d errors! Fix them immediately!\n" +#~ msgstr "Sono stati riscontrati %d errori! Correggili immediatamente!\n" + +#~ msgid "These dependencies are not available in repository:\n" +#~ msgstr "Queste dipendenze non sono disponibili nel repository:\n" diff --git a/po/nl.po b/po/nl.po index d43f367a..33ddfb2d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" -"POT-Creation-Date: 2007-03-02 16:01+EET\n" -"PO-Revision-Date: 2007-03-02 16:06+0200\n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2007-05-13 23:11+0300\n" "Last-Translator: Faik Uygur \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgstr "" " Raised if an invalid or ambiguous option is seen on the command-line.\n" " " -#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 msgid "Return a comma-separated list of option strings & metavariables." msgstr "Return a comma-separated list of option strings & metavariables." @@ -107,7 +107,7 @@ msgstr "" "Format help with indented section bodies.\n" " " -#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:44 +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 msgid "usage: %s\n" msgstr "usage: %s\n" @@ -445,7 +445,7 @@ msgstr "ambiguous option: %s (%s?)" #: pisi-cli:46 msgid "Keyboard Interrupt: Exiting..." -msgstr "Toetsenbord onderbreking: sluit af..." +msgstr "Toetsenbord onderbreking: afsluiten..." #: pisi-cli:49 msgid "Program Terminated." @@ -502,7 +502,7 @@ msgstr "" #: pisi/actionsapi/cmaketools.py:62 pisi/actionsapi/kde.py:65 #: pisi/actionsapi/perlmodules.py:54 pisi/actionsapi/perlmodules.py:57 msgid "Configure failed." -msgstr "Configuratie is mislukt." +msgstr "Configuratie mislukt." # pisi/actionsapi/autotools.py:77 :87 #: pisi/actionsapi/autotools.py:77 pisi/actionsapi/autotools.py:87 @@ -523,7 +523,7 @@ msgstr "Make mislukt." #: pisi/actionsapi/kde.py:79 pisi/actionsapi/pythonmodules.py:54 #: pisi/actionsapi/scons.py:43 msgid "Install failed." -msgstr "Installatie mislukt." +msgstr "Install mislukt." # pisi/actionsapi/autotools.py:121 :129 #: pisi/actionsapi/autotools.py:126 pisi/actionsapi/autotools.py:136 @@ -556,14 +556,15 @@ msgstr "Uitvoeren autoheader mislukt." # pisi/actionsapi/autotools.py:77 :87 #: pisi/actionsapi/cmaketools.py:64 +#, fuzzy msgid "No configure script found for cmake." -msgstr "Geen cmake configuratiescript gevonden." +msgstr "Geen configuratiescript gevonden." -#: pisi/actionsapi/get.py:163 +#: pisi/actionsapi/get.py:160 msgid "Util %s cannot be found" msgstr "Hulpprogramma %s niet gevonden" -#: pisi/actionsapi/get.py:165 +#: pisi/actionsapi/get.py:162 msgid "Warning: %s does not exist, using plain name %s" msgstr "Waarschuwing: %s bestaat niet, %s wordt gebruikt" @@ -698,11 +699,11 @@ msgstr "ActionsAPI [copytree]: map %s bestaat niet." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: toegang geweigerd: %s" -#: pisi/api.py:299 pisi/comariface.py:30 +#: pisi/api.py:297 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "comar-pakket is niet volledig geïnstalleerd" -#: pisi/api.py:311 +#: pisi/api.py:309 msgid "File %s not found" msgstr "Bestand %s niet gevonden." @@ -718,7 +719,7 @@ msgstr "" "\n" "Bestand met fouten: %s" -#: pisi/api.py:370 pisi/cli/commands.py:967 +#: pisi/api.py:370 pisi/cli/commands.py:1044 msgid "OK" msgstr "OK" @@ -748,19 +749,19 @@ msgstr "Repository %s bestaat niet. Kan niet verwijderen." #: pisi/api.py:413 msgid "* Updating repository: %s" -msgstr "* Bijwerken repository: %s " +msgstr "* Updaten repository: %s " #: pisi/api.py:421 msgid "No updates available for repository %s." -msgstr "Geen bijgewerkte pakketten op repository %s." +msgstr "Geen bijgewerkte pakketten in repository %s." #: pisi/api.py:423 msgid "Updating database at any rate as requested" -msgstr "Database bijwerken op elke snelheid zoals verzocht" +msgstr "Updaten database op elke snelheid zoals verzocht" #: pisi/api.py:434 msgid "* Package database updated." -msgstr "* Pakketdatabase bijgewerkt." +msgstr "* Pakketdatabase geupdate." #: pisi/api.py:436 pisi/api.py:461 msgid "No repository named %s found." @@ -790,33 +791,33 @@ msgstr "" msgid "Archive type not recognized" msgstr "Archieftype niet herkend" -#: pisi/atomicoperations.py:66 +#: pisi/atomicoperations.py:67 msgid "Package %s found in repository %s" msgstr "Pakket %s gevonden in repository %s " -#: pisi/atomicoperations.py:78 +#: pisi/atomicoperations.py:90 msgid "Package URI: %s" msgstr "Pakket-URI: %s" -#: pisi/atomicoperations.py:82 +#: pisi/atomicoperations.py:94 msgid "Package %s not found in any active repository." msgstr "Pakket %s niet gevonden in de actieve repositories." -#: pisi/atomicoperations.py:101 +#: pisi/atomicoperations.py:113 msgid "Installing %s, version %s, release %s, build %s" msgstr "Installatie %s, versie %s, uitgave %s, bouw %s" -#: pisi/atomicoperations.py:146 +#: pisi/atomicoperations.py:158 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" "%s pakket kan niet geïnstalleerd worden als er niet aan de afhankelijkheden " "is voldaan" -#: pisi/atomicoperations.py:165 +#: pisi/atomicoperations.py:177 msgid "/%s from %s package\n" msgstr "/%s van %s pakket\n" -#: pisi/atomicoperations.py:166 +#: pisi/atomicoperations.py:178 msgid "" "File conflicts:\n" "%s" @@ -824,116 +825,116 @@ msgstr "" "Bestandsconflicten:\n" "%s" -#: pisi/atomicoperations.py:201 +#: pisi/atomicoperations.py:213 msgid "Re-install same version package?" msgstr "Zelfde versie van het pakket herinstalleren?" -#: pisi/atomicoperations.py:202 +#: pisi/atomicoperations.py:214 msgid "Package re-install declined" msgstr "Herinstalleren van het pakket geweigerd" -#: pisi/atomicoperations.py:208 +#: pisi/atomicoperations.py:220 msgid "Upgrading to new upstream version" msgstr "Opwaarderen naar nieuwe upstream-versie" -#: pisi/atomicoperations.py:211 +#: pisi/atomicoperations.py:223 msgid "Upgrading to new distribution release" msgstr "Opwaarderen naar nieuwe distributie-uitgave" -#: pisi/atomicoperations.py:215 +#: pisi/atomicoperations.py:227 msgid "Upgrading to new distribution build" msgstr "Opwaarderen naar nieuwe distributie bouw" -#: pisi/atomicoperations.py:225 +#: pisi/atomicoperations.py:237 msgid "Downgrade to old distribution release?" msgstr "Terugwaarderen naar oude distributie uitgave?" -#: pisi/atomicoperations.py:227 +#: pisi/atomicoperations.py:239 msgid "Downgrade to old distribution build?" msgstr "Terugwaarderen naar oude distributie bouw?" -#: pisi/atomicoperations.py:229 +#: pisi/atomicoperations.py:241 msgid "Package downgrade declined" msgstr "Pakket terugwaarderen geweigerd" # pisi/actionsapi/autotools.py:75 :85 -#: pisi/atomicoperations.py:253 +#: pisi/atomicoperations.py:265 msgid "%s configuration failed." msgstr "%s configuratie mislukt." -#: pisi/atomicoperations.py:340 +#: pisi/atomicoperations.py:388 msgid "Storing %s, " msgstr "Opslaan %s, " -#: pisi/atomicoperations.py:343 +#: pisi/atomicoperations.py:391 msgid "Storing %s." msgstr "Opslaan %s." -#: pisi/atomicoperations.py:350 +#: pisi/atomicoperations.py:398 msgid "Storing %s" msgstr "Opslaan %s" -#: pisi/atomicoperations.py:406 +#: pisi/atomicoperations.py:454 msgid "File list could not be read for package %s, continuing removal." msgstr "" "Bestandslijst kon niet gelezen worden voor pakket %s, voortzetten " "verwijderen." -#: pisi/atomicoperations.py:412 +#: pisi/atomicoperations.py:460 msgid "Removing package %s" msgstr "Verwijderen pakket %s" -#: pisi/atomicoperations.py:415 +#: pisi/atomicoperations.py:463 msgid "Trying to remove nonexistent package " msgstr "Proberen niet-bestaand pakket te verwijderen " -#: pisi/atomicoperations.py:454 +#: pisi/atomicoperations.py:502 msgid "Not removing conflicted file : %s" msgstr "Niet verwijderen conflicterend bestand: %s" -#: pisi/atomicoperations.py:474 +#: pisi/atomicoperations.py:522 msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" "Geïnstalleerd bestand %s bestaat niet op systeem [mogelijk met de hand " "verwijderd]" -#: pisi/atomicoperations.py:535 +#: pisi/atomicoperations.py:581 msgid "Metadata XML '%s' cannot be found" msgstr "Metadata-XML '%s' kan niet worden gevonden" -#: pisi/atomicoperations.py:543 +#: pisi/atomicoperations.py:589 msgid "MetaData format wrong (%s)" msgstr "Metadata opmaak fout (%s)" -#: pisi/atomicoperations.py:545 +#: pisi/atomicoperations.py:591 msgid "* Adding '%s' to db... " msgstr "* Toevoegen '%s' aan db... " -#: pisi/atomicoperations.py:551 +#: pisi/atomicoperations.py:597 msgid "Files XML '%s' cannot be found" msgstr "Bestanden XML '%s' kunnen niet worden gevonden" -#: pisi/atomicoperations.py:556 pisi/package.py:136 +#: pisi/atomicoperations.py:602 pisi/package.py:141 msgid "Invalid %s" msgstr "Onjuist %s" -#: pisi/atomicoperations.py:565 +#: pisi/atomicoperations.py:611 msgid "OK." msgstr "OK." -#: pisi/build.py:88 +#: pisi/build.py:86 msgid "Path %s belongs in multiple packages" msgstr "Pad %s behoort bij meerdere pakketten" -#: pisi/build.py:114 +#: pisi/build.py:112 msgid "Source URI: %s" msgstr "Bron URI: %s" -#: pisi/build.py:118 +#: pisi/build.py:116 msgid "Source %s not found in any active repository." msgstr "Bron %s niet gevonden in actieve repositories." -#: pisi/build.py:183 +#: pisi/build.py:181 msgid "Building PiSi source package: %s" msgstr "Bouwen PiSi-bronpakket: %s " @@ -982,122 +983,126 @@ msgid "Building source..." msgstr "Bouwen bron..." #: pisi/build.py:328 +#, fuzzy +msgid "Testing package..." +msgstr "Aanmaken PiSi-pakket %s." + +#: pisi/build.py:332 msgid "Installing..." msgstr "Installeren..." -#: pisi/build.py:370 +#: pisi/build.py:374 msgid "Unable to read Actions Script (%s): %s" msgstr "Kan Actions Script niet lezen (%s): %s" -#: pisi/build.py:372 +#: pisi/build.py:376 msgid "SyntaxError in Actions Script (%s): %s" msgstr "Syntaxfout in Actions Script (%s): %s" -#: pisi/build.py:389 +#: pisi/build.py:393 msgid "Unable to read COMAR script (%s): %s" msgstr "Kan COMAR script niet lezen (%s): %s" -#: pisi/build.py:391 +#: pisi/build.py:395 msgid "SyntaxError in COMAR file (%s): %s" msgstr "Syntaxfout in COMAR bestand (%s): %s" -#: pisi/build.py:417 +#: pisi/build.py:421 msgid "unable to call function from actions: %s" msgstr "kan functie niet aanroepen vanuit actions: %s" -#: pisi/build.py:433 +#: pisi/build.py:437 msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Veiligheidsprocedure: de volgende extra pakketten in system.devel zullen " "geïnstalleerd worden:" -#: pisi/build.py:438 +#: pisi/build.py:442 msgid "Safety switch: system.devel is already installed" msgstr "Veiligheidsprocedure: system.devel is al geïnstalleerd" -#: pisi/build.py:440 +#: pisi/build.py:444 msgid "Safety switch: the component system.devel cannot be found" msgstr "Veiligheidsprocedure: het component system.devel niet gevonden" -#: pisi/build.py:449 +#: pisi/build.py:453 msgid "Unsatisfied Build Dependencies:" msgstr "Niet-opgeloste bouwafhankelijkheden:" -#: pisi/build.py:453 +#: pisi/build.py:457 msgid "Cannot build package due to unsatisfied build dependencies" msgstr "Kan pakket niet bouwen wegens niet-opgeloste compileerafhankelijkheden" -#: pisi/build.py:461 +#: pisi/build.py:465 msgid "Build dependency %s cannot be satisfied" msgstr "Bouwafhankelijkheid %s niet opgelost." -#: pisi/build.py:463 +#: pisi/build.py:467 msgid "Do you want to install the unsatisfied build dependencies" msgstr "Wilt u de niet-opgeloste bouwafhankelijkheden installeren?" -#: pisi/build.py:464 +#: pisi/build.py:468 msgid "Installing build dependencies." msgstr "Installeren bouwafhankelijkheden." -#: pisi/build.py:469 +#: pisi/build.py:473 msgid "Ignoring build dependencies." msgstr "Negeren bouwafhankelijkheden." -#: pisi/build.py:479 +#: pisi/build.py:483 msgid "Patch file is missing: %s\n" msgstr "Patch-bestand ontbreekt: %s\n" -#: pisi/build.py:492 +#: pisi/build.py:496 msgid "* Applying patch: %s" msgstr "* Toepassen patch: %s" -#: pisi/build.py:550 +#: pisi/build.py:554 msgid "Stripping files.." msgstr "Strippen bestanden..." -#: pisi/build.py:656 +#: pisi/build.py:654 msgid "(found old version %s)" msgstr "(gevonden oude versie %s)" -#: pisi/build.py:658 +#: pisi/build.py:656 msgid "Skipping %s with wrong pkg name " msgstr "Overslaan %s met onjuiste pakketnaam" -#: pisi/build.py:679 -#, fuzzy +#: pisi/build.py:677 msgid "(no previous build found, setting build no to 1.)" msgstr "(geen eerdere bouw gevonden, zet compilatienummer op 1.)" -#: pisi/build.py:724 +#: pisi/build.py:722 msgid "(old package lacks a build no, setting build no to 1.)" msgstr "(oud pakket heeft geen bouwnummer, zet compilatienummer op 1.)" -#: pisi/build.py:727 +#: pisi/build.py:725 msgid "There are changes, incrementing build no to %d" msgstr "Er zijn wijzigingen, zet bouwnummer op %d " -#: pisi/build.py:730 +#: pisi/build.py:728 msgid "There is no change from previous build %d" msgstr "Er zijn geen wijzigingen sinds vorige bouw %d" -#: pisi/build.py:795 +#: pisi/build.py:793 msgid "No user named '%s' found on the system" msgstr "Geen gebruiker met de naam '%s' gevonden op het systeem" -#: pisi/build.py:800 +#: pisi/build.py:798 msgid "No group named '%s' found on the system" msgstr "Geen groep met de naam '%s' gevonden op het systeem" -#: pisi/build.py:803 +#: pisi/build.py:801 msgid "** Building package %s" msgstr "** bouwen pakket %s" # pisi/build.py:503 :506 -#: pisi/build.py:805 pisi/build.py:808 +#: pisi/build.py:803 pisi/build.py:806 msgid "Generating %s," msgstr "Genereren %s." -#: pisi/build.py:814 +#: pisi/build.py:812 msgid "" "Build number is not available. For repo builds you must enable buildno in " "pisi.conf." @@ -1105,105 +1110,105 @@ msgstr "" "Bouwnummer is niet aanwezig. Bij repo-compilaties moet u buildno inschakelen " "in pisi.conf." -#: pisi/build.py:832 +#: pisi/build.py:830 msgid "Creating PiSi package %s." msgstr "Aanmaken PiSi-pakket %s." -#: pisi/build.py:877 +#: pisi/build.py:875 pisi/delta.py:93 msgid "Done." msgstr "Gereed." -#: pisi/build.py:883 +#: pisi/build.py:881 msgid "Abandoned files under the install dir (%s):" msgstr "Verlaten bestanden in de installatiemap (%s):" -#: pisi/build.py:887 +#: pisi/build.py:885 msgid "All of the files under the install dir (%s) has been collected by package(s)" msgstr "Alle bestanden in de installatiemap (%s) zijn verzameld door pakket(ten)." -#: pisi/build.py:891 +#: pisi/build.py:889 msgid "Cleaning Build Directory..." msgstr "Opschonen bouwmap..." -#: pisi/build.py:894 +#: pisi/build.py:892 msgid "Keeping Build Directory" msgstr "Behouden bouwmap" -#: pisi/cli/__init__.py:79 +#: pisi/cli/__init__.py:76 msgid "Warning: " msgstr "Waarschuwing: " -#: pisi/cli/__init__.py:88 +#: pisi/cli/__init__.py:85 msgid "Error: " msgstr "Fout: " -#: pisi/cli/__init__.py:120 +#: pisi/cli/__init__.py:117 msgid " (yes/no)" msgstr " (ja/nee)" -#: pisi/cli/__init__.py:141 +#: pisi/cli/__init__.py:138 msgid " [complete]\n" msgstr " [compleet]\n" -#: pisi/cli/__init__.py:151 +#: pisi/cli/__init__.py:148 msgid "Installed %s" msgstr "Geïnstalleerd %s" -#: pisi/cli/__init__.py:153 +#: pisi/cli/__init__.py:150 msgid "Removed %s" msgstr "Verwijderd %s" -#: pisi/cli/__init__.py:155 +#: pisi/cli/__init__.py:152 msgid "Upgraded %s" msgstr "Opgewaardeerd %s" # pisi/actionsapi/autotools.py:75 :85 -#: pisi/cli/__init__.py:157 +#: pisi/cli/__init__.py:154 msgid "Configured %s" msgstr "Geconfigureerd %s" -#: pisi/cli/__init__.py:159 +#: pisi/cli/__init__.py:156 msgid "Extracting the files of %s" msgstr "Uitpakken bestanden uitpakken van %s" -#: pisi/cli/commands.py:94 +#: pisi/cli/commands.py:92 msgid "generic help string for any command" msgstr "algemene helptekst voor elk commando" -#: pisi/cli/commands.py:123 pisi/cli/pisicli.py:104 +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 msgid "Unrecognized command: %s" msgstr "Niet herkend commando: %s" -#: pisi/cli/commands.py:145 +#: pisi/cli/commands.py:143 msgid "common options" msgstr "standaard opties" # pisi/build.py:503 :506 -#: pisi/cli/commands.py:148 +#: pisi/cli/commands.py:146 msgid "general options" msgstr "algemene opties" -#: pisi/cli/commands.py:151 +#: pisi/cli/commands.py:149 msgid "Change the system root for PiSi commands" msgstr "Wijzig de systeem root voor PiSi commando's" -#: pisi/cli/commands.py:153 +#: pisi/cli/commands.py:151 msgid "Assume yes in all yes/no queries" msgstr "Uitgaan van ja bij alle ja/nee vragen" -#: pisi/cli/commands.py:158 +#: pisi/cli/commands.py:156 msgid "Detailed output" msgstr "Gedetailleerde uitvoer" -#: pisi/cli/commands.py:160 +#: pisi/cli/commands.py:158 msgid "Show debugging information" msgstr "Toon debuginformatie" -#: pisi/cli/commands.py:162 +#: pisi/cli/commands.py:160 msgid "Suppresses all coloring of PiSi's output" msgstr "Onderdrukt kleuren van PiSi uitvoer" -#: pisi/cli/commands.py:169 +#: pisi/cli/commands.py:167 msgid "" "This is a fall back function. If the implementer module provides an\n" " options function it will be called" @@ -1211,43 +1216,43 @@ msgstr "" "Dit is een terugvalfunctie. Als de geïmplementeerde module een\n" " opties-functie heeft wordt deze aangeroepen" -#: pisi/cli/commands.py:181 +#: pisi/cli/commands.py:179 msgid "Destination directory %s does not exist. Creating directory.\n" msgstr "Doelmap %s bestaat niet. Aanmaken map.\n" -#: pisi/cli/commands.py:203 +#: pisi/cli/commands.py:201 msgid "Password: " msgstr "Wachtwoord: " -#: pisi/cli/commands.py:209 +#: pisi/cli/commands.py:207 msgid "initialize PiSi components" msgstr "Initialiseren PiSi-componenten" -#: pisi/cli/commands.py:217 +#: pisi/cli/commands.py:215 msgid "do cleanup work for PiSi components" msgstr "opruimwerk voor PiSi-componenten uitvoeren" -#: pisi/cli/commands.py:231 +#: pisi/cli/commands.py:229 msgid "print help for the command" msgstr "toon hulp over het commando" -#: pisi/cli/commands.py:237 +#: pisi/cli/commands.py:235 msgid "exit program" msgstr "afsluiten programma" -#: pisi/cli/commands.py:239 +#: pisi/cli/commands.py:237 msgid "Command terminated abnormally." msgstr "Commando abnormaal gestopt." -#: pisi/cli/commands.py:249 +#: pisi/cli/commands.py:247 msgid "Command lacks name" msgstr "Commando is naamloos" -#: pisi/cli/commands.py:253 +#: pisi/cli/commands.py:251 msgid "Duplicate command %s" msgstr "Dupliceer commando %s" -#: pisi/cli/commands.py:262 +#: pisi/cli/commands.py:260 msgid "" "Prints help for given commands\n" "\n" @@ -1261,7 +1266,7 @@ msgstr "" "\n" "Zonder parameters toont het algemene hulp." -#: pisi/cli/commands.py:296 +#: pisi/cli/commands.py:294 msgid "" "Clean stale locks\n" "\n" @@ -1277,7 +1282,7 @@ msgstr "" "PiSi gebruikt bestandssysteemsloten voor het beheren van de databasetoegang\n" "Dit commando verwijdert ongebruikte sloten in de databasemap." -#: pisi/cli/commands.py:315 +#: pisi/cli/commands.py:313 msgid "" "Delete cache files\n" "\n" @@ -1295,7 +1300,7 @@ msgstr "" "in de map /var. Omdat ze opstapelen kunnen ze veel \n" "schijfruimte in beslag nemen." -#: pisi/cli/commands.py:336 +#: pisi/cli/commands.py:334 msgid "" "Graph package relations\n" "\n" @@ -1315,47 +1320,47 @@ msgstr "" "worden pakketrelaties tussen repositoy-pakketten weergegeven, en\n" "worden pakketten in graphviz-formaat naar pgraph.dot geschreven.\n" -#: pisi/cli/commands.py:353 +#: pisi/cli/commands.py:351 msgid "graph options" msgstr "grafische opties" -#: pisi/cli/commands.py:357 +#: pisi/cli/commands.py:355 msgid "Specify a particular repository" msgstr "Geef een bepaalde repository aan" -#: pisi/cli/commands.py:360 +#: pisi/cli/commands.py:358 msgid "Graph of installed packages" msgstr "Grafiek van geïnstalleerde pakketten" -#: pisi/cli/commands.py:363 +#: pisi/cli/commands.py:361 msgid "Do not show installed packages" msgstr "Geïnstalleerde pakketten niet weergeven" -#: pisi/cli/commands.py:366 +#: pisi/cli/commands.py:364 msgid "Dot output file" msgstr "Dot uitvoerbestand" -#: pisi/cli/commands.py:377 +#: pisi/cli/commands.py:375 msgid "Plotting packages in repository %s" msgstr "Plot pakketten in repository %s" -#: pisi/cli/commands.py:383 +#: pisi/cli/commands.py:381 msgid "Plotting a graph of relations among all repository packages" msgstr "Plot een grafiek van de relaties tussen alle repositoy-pakketten" -#: pisi/cli/commands.py:390 +#: pisi/cli/commands.py:388 msgid "Plotting a graph of relations among all installed packages" msgstr "Plot een grafiek van de relaties tussen alle geïnstalleerde pakketten" -#: pisi/cli/commands.py:402 +#: pisi/cli/commands.py:400 msgid "Do not take build no into account." msgstr "Bouwnummer niet meerekenen." -#: pisi/cli/commands.py:407 +#: pisi/cli/commands.py:405 msgid "Do not take dependency information into account" msgstr "Geen rekening houden met afhankelijkheidsinformatie" -#: pisi/cli/commands.py:411 +#: pisi/cli/commands.py:409 msgid "" "Build PiSi packages\n" "\n" @@ -1377,22 +1382,27 @@ msgstr "" "Als alternatief kunt u de naam van het bronpakket opgeven\n" "dat gedownload moet worden van een repository die de broncode bevat.\n" -#: pisi/cli/commands.py:434 +#: pisi/cli/commands.py:432 msgid "build options" msgstr "bouw opties" -#: pisi/cli/commands.py:442 +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 msgid "Output directory for produced packages" msgstr "Doelmap voor geproduceerde pakketten" -#: pisi/cli/commands.py:445 +#: pisi/cli/commands.py:443 msgid "Bypass errors from ActionsAPI" msgstr "Omzeilen fouten van ActionsAPI" -#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 msgid "Bypass safety switch" msgstr "Omzeilen veiligheidsprocedure" +#: pisi/cli/commands.py:447 +#, fuzzy +msgid "Bypass testing step" +msgstr "Omzeilen veiligheidsprocedure" + #: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Maak een statisch pakket met ar-bestanden aan" @@ -1432,26 +1442,48 @@ msgid "Break build after running compile step" msgstr "Breek bouwen af na uitvoeren van de compilatie stap" #: pisi/cli/commands.py:466 +#, fuzzy +msgid "Break build after running check step" +msgstr "Breek bouwen af na uitvoeren van de compilatie stap" + +#: pisi/cli/commands.py:468 msgid "Break build after running install step" msgstr "Breek bouwen af na uitvoeren van de installatie stap" -#: pisi/cli/commands.py:468 +#: pisi/cli/commands.py:470 msgid "create PiSi package" msgstr "Aanmaken PiSi-pakket" -#: pisi/cli/commands.py:482 +#: pisi/cli/commands.py:484 msgid "package_format must be one of %s " msgstr "package_format moet zijn %s " -#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 msgid "Output directory: %s" msgstr "Doelmap: %s" -#: pisi/cli/commands.py:487 +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 msgid "Outputting packages in the working directory." msgstr "Uitvoeren pakketten naar de werkmap." -#: pisi/cli/commands.py:498 +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +msgid "delta options" +msgstr "delta opties" + +#: pisi/cli/commands.py:549 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1471,35 +1503,35 @@ msgstr "" "\n" "U kunt ook de naam van een component opgeven.\n" -#: pisi/cli/commands.py:517 +#: pisi/cli/commands.py:568 msgid "emerge options" msgstr "duik opties op" -#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 msgid "Ignore file conflicts" msgstr "Negeer bestandsconflicten" -#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 msgid "Ignore package conflicts" msgstr "Negeer pakketconflicten" -#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 msgid "Bypass comar configuration agent" msgstr "Omzeil Comar-configuratieagent" -#: pisi/cli/commands.py:536 +#: pisi/cli/commands.py:587 msgid "Outputting binary packages in the package cache." msgstr "Uitvoeren binaire pakketten naar de pakketcache." -#: pisi/cli/commands.py:544 +#: pisi/cli/commands.py:595 msgid "Abstract package operation command" msgstr "Abstract pakket handelingscommando" -#: pisi/cli/commands.py:557 +#: pisi/cli/commands.py:608 msgid "Do not perform any action, just show what would be done" msgstr "Geen acties uitvoeren, geef alleen weer wat er zou gebeuren" -#: pisi/cli/commands.py:568 +#: pisi/cli/commands.py:619 msgid "" "Install PiSi packages\n" "\n" @@ -1522,23 +1554,23 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen dan " "worden uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:586 +#: pisi/cli/commands.py:637 msgid "install options" msgstr "installatie opties" -#: pisi/cli/commands.py:591 +#: pisi/cli/commands.py:642 msgid "Reinstall already installed packages" msgstr "Herïnstalleer reeds geïnstalleerde pakketten" -#: pisi/cli/commands.py:597 +#: pisi/cli/commands.py:648 msgid "Install component's and recursive components' packages" msgstr "Installeer componenten en de pakketten van recursieve componenten" -#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 msgid "Fetch upgrades but do not install." msgstr "Haal bijgewerkte bestanden op maar installeer ze niet." -#: pisi/cli/commands.py:622 +#: pisi/cli/commands.py:677 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1576,23 +1608,23 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen worden " "uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:648 +#: pisi/cli/commands.py:703 msgid "upgrade options" msgstr "bijwerk opties" -#: pisi/cli/commands.py:653 +#: pisi/cli/commands.py:708 msgid "Security related package upgrades only" -msgstr "Alleen beveiligingspakketten bijwerken" +msgstr "Alleen beveiligingspakketten opwaarderen" -#: pisi/cli/commands.py:655 +#: pisi/cli/commands.py:710 msgid "Do not update repositories" -msgstr "Repositories niet bijwerken" +msgstr "Repositories niet updaten" -#: pisi/cli/commands.py:661 +#: pisi/cli/commands.py:716 msgid "Upgrade component's and recursive components' packages" msgstr "Opwaarderen componenten en recursieve componenten pakketten" -#: pisi/cli/commands.py:665 +#: pisi/cli/commands.py:720 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1600,23 +1632,24 @@ msgstr "" "Bij het opwaarderen van het systeem, pakketten en componenten negeren " "waarbij basenames overeenkomen met patroon." -#: pisi/cli/commands.py:667 +#: pisi/cli/commands.py:722 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." msgstr "" -"Als het systeem bijgewerkt wordt, pakketten en componenten negeren waarbij " -"basenames overeenkomen met ieder patroon in bestand." +"Als het systeem opgewaardeerd wordt, pakketten en componenten negeren " +"waarbij basenames overeenkomen met ieder patroon in " +"bestand." -#: pisi/cli/commands.py:707 +#: pisi/cli/commands.py:766 msgid "Updating repositories" -msgstr "Bijwerken repositories" +msgstr "Updaten repositories" -#: pisi/cli/commands.py:712 +#: pisi/cli/commands.py:771 msgid "Will not update repositories" -msgstr "Zal repositories niet bijwerken" +msgstr "Zal repositories niet updaten" -#: pisi/cli/commands.py:734 +#: pisi/cli/commands.py:796 msgid "" "Remove PiSi packages\n" "\n" @@ -1637,15 +1670,15 @@ msgstr "" "U kunt ook componenten opgeven in plaats van pakketnamen, deze zullen " "worden uitgebreid tot pakketnamen.\n" -#: pisi/cli/commands.py:751 +#: pisi/cli/commands.py:813 msgid "remove options" msgstr "verwijder opties" -#: pisi/cli/commands.py:754 +#: pisi/cli/commands.py:816 msgid "Remove component's and recursive components' packages" msgstr "Verwijder componenten en de pakketten van recursieve componenten" -#: pisi/cli/commands.py:776 +#: pisi/cli/commands.py:838 msgid "" "Configure pending packages\n" "\n" @@ -1661,11 +1694,11 @@ msgstr "" "een lijst van pakketten in de wachtrij voor configuratie. Dit commando\n" "configureert deze pakketten.\n" -#: pisi/cli/commands.py:792 +#: pisi/cli/commands.py:854 msgid "configure-pending options" msgstr "wachtende configuratie opties" -#: pisi/cli/commands.py:804 +#: pisi/cli/commands.py:866 msgid "" "Display package information\n" "\n" @@ -1679,63 +1712,63 @@ msgstr "" "\n" " is ofwel een pakketnaam ofwel een .pisi bestand.\n" -#: pisi/cli/commands.py:819 +#: pisi/cli/commands.py:881 msgid "info options" msgstr "info opties" -#: pisi/cli/commands.py:826 +#: pisi/cli/commands.py:888 msgid "Show a list of package files." msgstr "Toon een lijst van pakketbestanden." -#: pisi/cli/commands.py:828 +#: pisi/cli/commands.py:890 msgid "Info about the given component" msgstr "Info van het gegeven component" -#: pisi/cli/commands.py:831 +#: pisi/cli/commands.py:893 msgid "Show only paths." msgstr "Toon alleen paden." -#: pisi/cli/commands.py:833 +#: pisi/cli/commands.py:895 msgid "Do not show details" msgstr "Geen details tonen" -#: pisi/cli/commands.py:835 +#: pisi/cli/commands.py:897 msgid "Output in xml format" msgstr "Uitvoer in xml-opmaak" -#: pisi/cli/commands.py:881 +#: pisi/cli/commands.py:943 msgid "Package file: %s" msgstr "Pakketbestand: %s" -#: pisi/cli/commands.py:887 +#: pisi/cli/commands.py:949 msgid "[inst] " msgstr "[inst] " -#: pisi/cli/commands.py:889 +#: pisi/cli/commands.py:951 msgid "Installed package:" msgstr "Geïnstalleerd pakket:" -#: pisi/cli/commands.py:895 +#: pisi/cli/commands.py:957 msgid "[repo] " msgstr "[repo] " -#: pisi/cli/commands.py:897 -msgid "Package found in repository:" -msgstr "Pakket gevonden in repository:" +#: pisi/cli/commands.py:959 +msgid "Package found in %s repository:" +msgstr "Pakket gevonden in %s repository:" -#: pisi/cli/commands.py:901 +#: pisi/cli/commands.py:963 msgid "%s is not found in repositories" msgstr "%s niet gevonden in de repositories" -#: pisi/cli/commands.py:904 +#: pisi/cli/commands.py:966 msgid "%s is not installed" msgstr "%s is niet geïnstalleerd." -#: pisi/cli/commands.py:917 +#: pisi/cli/commands.py:979 msgid "Reverse Dependencies:" msgstr "Omgekeerde afhankelijkheden:" -#: pisi/cli/commands.py:920 +#: pisi/cli/commands.py:982 msgid "" "\n" "Files:" @@ -1743,11 +1776,11 @@ msgstr "" "\n" "Bestanden:" -#: pisi/cli/commands.py:928 +#: pisi/cli/commands.py:990 msgid "File information not available" msgstr "Bestandsinformatie niet aanwezig" -#: pisi/cli/commands.py:934 +#: pisi/cli/commands.py:996 msgid "" "Verify installation\n" "\n" @@ -1774,15 +1807,24 @@ msgstr "" "\n" "Als er geen pakketten opgegeven worden, worden alle pakketen nagekeken.\n" -#: pisi/cli/commands.py:958 +#: pisi/cli/commands.py:1016 +msgid "check options" +msgstr "check opties" + +#: pisi/cli/commands.py:1018 +#, fuzzy +msgid "Check installed packages under given component" +msgstr "Toon geïnstalleerde pakketten onder gegeven component" + +#: pisi/cli/commands.py:1034 msgid "Checking all installed packages" msgstr "Controleren alle geïnstalleerde pakketten" -#: pisi/cli/commands.py:961 +#: pisi/cli/commands.py:1038 msgid "* Checking %s... " msgstr "* Contrôle %s... " -#: pisi/cli/commands.py:965 +#: pisi/cli/commands.py:1042 msgid "" "\n" "Package %s is corrupt." @@ -1790,11 +1832,11 @@ msgstr "" "\n" "Pakket %s is beschadigd." -#: pisi/cli/commands.py:969 +#: pisi/cli/commands.py:1046 msgid "Package %s not installed" msgstr "Pakket %s niet geïnstalleerd" -#: pisi/cli/commands.py:974 +#: pisi/cli/commands.py:1051 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1820,31 +1862,31 @@ msgstr "" "Als u meerdere mappen opgeeft, werkt het commando nog steeds, maar\n" "zal het alles in één index bestand zetten.\n" -#: pisi/cli/commands.py:995 +#: pisi/cli/commands.py:1072 msgid "index options" msgstr "index opties" -#: pisi/cli/commands.py:999 +#: pisi/cli/commands.py:1076 msgid "Store absolute links for indexed files." msgstr "Opslaan absolute koppelingen voor geïndexeerde bestanden." -#: pisi/cli/commands.py:1002 +#: pisi/cli/commands.py:1079 msgid "Index output file" msgstr "Index-uitvoerbestand" -#: pisi/cli/commands.py:1005 +#: pisi/cli/commands.py:1082 msgid "Do not index PiSi spec files." msgstr "Niet indexeren PiSi-specifieke bestanden." -#: pisi/cli/commands.py:1008 +#: pisi/cli/commands.py:1085 msgid "Do not sign index." msgstr "Niet ondertekenen index." -#: pisi/cli/commands.py:1021 +#: pisi/cli/commands.py:1098 msgid "Indexing current directory." msgstr "Indexeren huidige map." -#: pisi/cli/commands.py:1029 +#: pisi/cli/commands.py:1106 msgid "" "Print the list of all installed packages\n" "\n" @@ -1854,30 +1896,30 @@ msgstr "" "\n" "Gebruik: list-installed\n" -#: pisi/cli/commands.py:1043 +#: pisi/cli/commands.py:1120 msgid "list-installed options" msgstr "list-installed opties" -#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 -#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 -#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 msgid "Show in long format" msgstr "Toon in lang formaat" -#: pisi/cli/commands.py:1048 +#: pisi/cli/commands.py:1125 msgid "List installed packages under given component" msgstr "Toon geïnstalleerde pakketten onder gegeven component" -#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 msgid "Show detailed install info" msgstr "Toon gedetailleerde installatie-informatie" # pisi/cli/commands.py:542 :729 -#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "Pakketnaam |St| Versie| Rel.| Bouw | Distro| Datum" -#: pisi/cli/commands.py:1082 +#: pisi/cli/commands.py:1159 msgid "" "Rebuild Databases\n" "\n" @@ -1897,19 +1939,19 @@ msgstr "" "Als pakketspecificaties worden gegeven, geef dan de namen van de\n" "pakketmappen onder /var/lib/pisi\n" -#: pisi/cli/commands.py:1100 +#: pisi/cli/commands.py:1177 msgid "rebuild-db options" msgstr "rebuild-db opties" -#: pisi/cli/commands.py:1103 +#: pisi/cli/commands.py:1180 msgid "Rebuild files database" msgstr "Herbouw bestanden database" -#: pisi/cli/commands.py:1114 +#: pisi/cli/commands.py:1191 msgid "Rebuild PiSi databases?" msgstr "PiSi-databases herbouwen?" -#: pisi/cli/commands.py:1121 +#: pisi/cli/commands.py:1198 msgid "" "Update repository databases\n" "\n" @@ -1920,24 +1962,24 @@ msgid "" "Synchronizes the PiSi databases with the current repository.\n" "If no repository is given, all repositories are updated.\n" msgstr "" -"Bijwerken repositorydatabases\n" +"Update repositorydatabases\n" "\n" "Gebruik: update-repo [ ... ]\n" "\n" ": repositorynaam\n" "\n" "Synchroniseert de PiSi-databases met de huidige repository.\n" -"Indien geen repository opgegeven is worden alle repositories bijgewerkt.\n" +"Indien geen repository opgegeven is worden alle repositories geupdate.\n" -#: pisi/cli/commands.py:1139 +#: pisi/cli/commands.py:1216 msgid "update-repo options" msgstr "update-repo opties" -#: pisi/cli/commands.py:1143 +#: pisi/cli/commands.py:1220 msgid "Update database in any case" -msgstr "Database altijd bijwerken" +msgstr "Altijd database updaten" -#: pisi/cli/commands.py:1161 +#: pisi/cli/commands.py:1238 msgid "" "Add a repository\n" "\n" @@ -1964,23 +2006,23 @@ msgstr "" "Opmerking: we ondersteunen vooralsnog alleen lokale bestanden (b.v. /a/b/c) " "en http: // URI's.\n" -#: pisi/cli/commands.py:1181 +#: pisi/cli/commands.py:1258 msgid "add-repo options" msgstr "add-repo opties" -#: pisi/cli/commands.py:1184 +#: pisi/cli/commands.py:1261 msgid "Add repository at given position (0 is first)" msgstr "Toevoegen repository op gegeven positie (0 is eerst)" -#: pisi/cli/commands.py:1198 +#: pisi/cli/commands.py:1275 msgid "Update PiSi database for repository %s?" -msgstr "Bijwerken PiSi-database voor repository %s?" +msgstr "Update PiSi-database voor repository %s?" -#: pisi/cli/commands.py:1202 +#: pisi/cli/commands.py:1279 msgid "%s repository could not be reached. Removing %s from system." msgstr "%s repository kan niet bereikt worden. Verwijderd %s van systeem." -#: pisi/cli/commands.py:1211 +#: pisi/cli/commands.py:1288 msgid "" "Remove repositories\n" "\n" @@ -1994,7 +2036,7 @@ msgstr "" "\n" "Verwijdert alle repository-informatie van het systeem.\n" -#: pisi/cli/commands.py:1237 +#: pisi/cli/commands.py:1314 msgid "" "List repositories\n" "\n" @@ -2008,7 +2050,7 @@ msgstr "" "\n" "Toont de huidige opgespoorde repositories.\n" -#: pisi/cli/commands.py:1260 +#: pisi/cli/commands.py:1337 msgid "" "List available packages in the repositories\n" "\n" @@ -2027,27 +2069,27 @@ msgstr "" "opgegeven is worden de pakketten in alle repositories\n" "getoond.\n" -#: pisi/cli/commands.py:1277 +#: pisi/cli/commands.py:1354 msgid "list-available options" msgstr "list-available opties" -#: pisi/cli/commands.py:1281 +#: pisi/cli/commands.py:1358 msgid "List available packages under given component" msgstr "Toon aanwezige pakketten onder gegeven component" -#: pisi/cli/commands.py:1283 +#: pisi/cli/commands.py:1360 msgid "Show uninstalled packages only" msgstr "Toon alleen niet-geïnstalleerde pakketten" -#: pisi/cli/commands.py:1291 +#: pisi/cli/commands.py:1368 msgid "Installed packages are shown in this color" msgstr "Geïnstalleerde pakketten worden in deze kleur weergegeven" -#: pisi/cli/commands.py:1299 +#: pisi/cli/commands.py:1376 msgid "Repository : %s\n" msgstr "Repository: %s\n" -#: pisi/cli/commands.py:1326 +#: pisi/cli/commands.py:1403 msgid "" "List available components\n" "\n" @@ -2063,11 +2105,11 @@ msgstr "" "Geeft een korte lijst van PiSi componenten gepubliceerd in \n" "de repositories.\n" -#: pisi/cli/commands.py:1341 +#: pisi/cli/commands.py:1418 msgid "list-components options" msgstr "list-components opties" -#: pisi/cli/commands.py:1366 +#: pisi/cli/commands.py:1443 msgid "" "List available sources\n" "\n" @@ -2081,11 +2123,11 @@ msgstr "" "\n" "Geeft een korte lijst van bronnen in de repositories.\n" -#: pisi/cli/commands.py:1380 +#: pisi/cli/commands.py:1457 msgid "list-sources options" msgstr "list-sources opties" -#: pisi/cli/commands.py:1405 +#: pisi/cli/commands.py:1482 msgid "" "List packages to be upgraded\n" "\n" @@ -2099,19 +2141,19 @@ msgstr "" "\n" "Toont pakketten die opgewaardeerd zullen worden.\n" -#: pisi/cli/commands.py:1419 +#: pisi/cli/commands.py:1496 msgid "list-upgrades options" msgstr "list-upgrades opties" -#: pisi/cli/commands.py:1424 +#: pisi/cli/commands.py:1501 msgid "List upgradable packages under given component" msgstr "Toon op te waarderen pakketten onder opgegeven component" -#: pisi/cli/commands.py:1441 pisi/operations.py:466 +#: pisi/cli/commands.py:1518 pisi/operations.py:460 msgid "No packages to upgrade." msgstr "Geen pakketten op te waarderen." -#: pisi/cli/commands.py:1461 +#: pisi/cli/commands.py:1538 msgid "" "List pending packages\n" "\n" @@ -2121,11 +2163,11 @@ msgstr "" "\n" "Toont pakketten wachtend op configuratie\n" -#: pisi/cli/commands.py:1483 +#: pisi/cli/commands.py:1560 msgid "There are no packages waiting to be configured" msgstr "Er zijn geen pakketten die wachten op configuratie" -#: pisi/cli/commands.py:1488 +#: pisi/cli/commands.py:1565 msgid "" "Search packages\n" "\n" @@ -2141,23 +2183,19 @@ msgstr "" "Vindt een pakket met de opgegeven zoekterm\n" "in de samenvatting, beschrijving en/of pakketnaam.\n" -#: pisi/cli/commands.py:1503 +#: pisi/cli/commands.py:1580 msgid "search options" msgstr "search opties" -#: pisi/cli/commands.py:1506 -msgid "Set search language" -msgstr "Stel zoektaal in" - -#: pisi/cli/commands.py:1511 +#: pisi/cli/commands.py:1586 msgid "Show details" msgstr "Toon details" -#: pisi/cli/commands.py:1523 +#: pisi/cli/commands.py:1598 msgid "%s packages found" msgstr "%s pakketten gevonden" -#: pisi/cli/commands.py:1532 +#: pisi/cli/commands.py:1607 msgid "" "Search for a file\n" "\n" @@ -2171,35 +2209,35 @@ msgstr "" "\n" "Vindt het geïnstalleerde pakket dat het opgegeven bestand bevat.\n" -#: pisi/cli/commands.py:1546 +#: pisi/cli/commands.py:1621 msgid "search-file options" msgstr "search-file opties" -#: pisi/cli/commands.py:1550 +#: pisi/cli/commands.py:1625 msgid "Fuzzy search" msgstr "Vage zoekopdracht" -#: pisi/cli/commands.py:1552 +#: pisi/cli/commands.py:1627 msgid "Show only package name" msgstr "Toon alleen pakketnaam" -#: pisi/cli/commands.py:1573 +#: pisi/cli/commands.py:1648 msgid "Package %s has file %s" msgstr "Pakket %s bevat bestand %s" -#: pisi/cli/commands.py:1575 +#: pisi/cli/commands.py:1650 msgid "Type: %s, Hash: %s" msgstr "Type: %s, Hash: %s" -#: pisi/cli/commands.py:1578 +#: pisi/cli/commands.py:1653 msgid "Path '%s' does not belong to an installed package" msgstr "Pad '%s' hoort niet bij een geïnstalleerd pakket" -#: pisi/cli/commands.py:1591 +#: pisi/cli/commands.py:1666 msgid "Searching for %s" msgstr "Zoekt naar %s" -#: pisi/cli/commands.py:1601 +#: pisi/cli/commands.py:1676 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2211,7 +2249,7 @@ msgstr "" "waar één is van:\n" "\n" -#: pisi/cli/commands.py:1607 +#: pisi/cli/commands.py:1682 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2288,19 +2326,19 @@ msgstr "Aanroepen pre-verwijder afhandelingen" msgid "Unregistering comar scripts" msgstr "Deregistreren comar-scripts" -#: pisi/component.py:106 pisi/component.py:112 +#: pisi/component.py:105 pisi/component.py:111 msgid "Component %s not found" msgstr "Component %s niet gevonden" -#: pisi/component.py:208 pisi/component.py:234 +#: pisi/component.py:207 pisi/component.py:233 msgid "Information for component %s not available" msgstr "Informatie voor component %s niet beschikbaar" -#: pisi/config.py:61 +#: pisi/config.py:60 msgid "Destination directory %s does not exist. Creating it." msgstr "Doelmap %s bestaat niet. Deze wordt nu aangemaakt." -#: pisi/configfile.py:105 +#: pisi/configfile.py:107 msgid "No section by name '%s'" msgstr "Geen sectie met de naam '%s'" @@ -2336,6 +2374,16 @@ msgstr "Kan niet opnieuw koppelen aan constante: %s " msgid "Can't unbind constant: %s" msgstr "Kan niet ontkoppelen van contante: %s" +#: pisi/delta.py:27 +#, fuzzy +msgid "Cannot create delta for same package!" +msgstr "Kan map %s niet aanmaken" + +#: pisi/delta.py:41 +#, fuzzy +msgid "Creating delta PiSi package between %s %s" +msgstr "Aanmaken PiSi-pakket %s." + #: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "%s afhankelijkheid van pakket %s is niet bevredigend" @@ -2366,31 +2414,31 @@ msgstr "" msgid "No such file or no permission to read" msgstr "Bestand niet gevonden of geen leesrechten" -#: pisi/fetcher.py:183 +#: pisi/fetcher.py:182 msgid "Requested range not satisfiable, starting again." msgstr "Verzocht bereik niet verwezenlijkbaar, opnieuw gestart." -#: pisi/fetcher.py:190 +#: pisi/fetcher.py:189 msgid "Cannot fetch %s; value error: %s" msgstr "Kan %s niet ophalen. Foutcode: %s" -#: pisi/fetcher.py:192 pisi/fetcher.py:196 +#: pisi/fetcher.py:191 pisi/fetcher.py:195 msgid "Cannot fetch %s; %s" msgstr "Kan niet ophalen %s; %s" -#: pisi/fetcher.py:194 +#: pisi/fetcher.py:193 msgid "Please check your network connections and try again. (%s)" msgstr "Controleer uw netwerk verbindingen en probeer opnieuw. (%s)" -#: pisi/fetcher.py:198 +#: pisi/fetcher.py:197 msgid "Cannot fetch %s; (%s): %s" msgstr "Kan niet ophalen %s; (%s): %s" -#: pisi/fetcher.py:244 +#: pisi/fetcher.py:243 msgid "Proxy configuration has been found for '%s' protocol" msgstr "Proxy-configuratie gevonden voor '%s' protocol" -#: pisi/fetcher.py:328 pisi/fetcher.py:349 pisi/fetcher.py:362 +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 msgid "ftp error" msgstr "ftp fout" @@ -2438,43 +2486,43 @@ msgstr "FOUT: gpg --detach-sig %s is mislukt" msgid "Encountered cycle %s" msgstr "Ondekt cyclus %s" -#: pisi/index.py:96 +#: pisi/index.py:100 msgid "Adding %s to component index" msgstr "Toevoegen %s aan componentindex" -#: pisi/index.py:108 +#: pisi/index.py:112 msgid "Adding %s to package index" msgstr "Toevoegen %s aan pakketindex" -#: pisi/index.py:122 +#: pisi/index.py:126 msgid "Updating package database of %s" -msgstr "Bijwerken pakketdatabase van %s" +msgstr "Updaten pakketdatabase van %s" -#: pisi/index.py:150 +#: pisi/index.py:154 msgid "Package %s: metadata corrupt, skipping..." msgstr "Pakket %s: metadata is corrupt, wordt overgeslagen..." -#: pisi/index.py:178 +#: pisi/index.py:193 msgid "Adding %s to source index" msgstr "Toevoegen %s aan bronindex" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed" msgstr "geïnstalleerd" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed-pending" msgstr "geïnstalleerd-wachtend" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "purged" msgstr "gezuiverd" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "removed" msgstr "verwijderd" -#: pisi/installdb.py:62 +#: pisi/installdb.py:59 msgid "" "State: %s\n" "Version: %s, Release: %s, Build: %s\n" @@ -2482,11 +2530,11 @@ msgstr "" "Status: %s\n" "Versie: %s, uitgave: %s, bouw: %s\n" -#: pisi/installdb.py:67 +#: pisi/installdb.py:64 msgid "Distribution: %s, Install Time: %s\n" msgstr "Distributie: %s, installatietijd: %s\n" -#: pisi/installdb.py:154 +#: pisi/installdb.py:151 msgid "Already installed" msgstr "Reeds geïnstalleerd." @@ -2502,27 +2550,27 @@ msgstr "Sleutel %s niet gevonden" msgid "Key %s in repo %s not found" msgstr "Sleutel %s in repo %s niet gevonden" -#: pisi/lockeddbshelve.py:47 +#: pisi/lockeddbshelve.py:46 msgid "Database version for %s insufficient. Please run rebuild-db command." msgstr "" "Databaseversie van %s is niet toereikend. Voer a.u.b. het commando rebuild-" "db uit." -#: pisi/lockeddbshelve.py:51 +#: pisi/lockeddbshelve.py:50 msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Databaseversie van %s is hoger dan de PiSi-versie. Een nieuwere versie van " "PiSi is nodig." -#: pisi/lockeddbshelve.py:62 +#: pisi/lockeddbshelve.py:61 msgid "Cannot attain write access to database environment" msgstr "Kan geen schrijftoegang tot de databaseomgeving krijgen" -#: pisi/lockeddbshelve.py:64 +#: pisi/lockeddbshelve.py:63 msgid "Database version %s not present." msgstr "Databaseversie %s is niet aanwezig." -#: pisi/lockeddbshelve.py:71 pisi/lockeddbshelve.py:153 +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 msgid "" "Another instance of PiSi is running. Only one instance is allowed to modify " "the PiSi database at a time." @@ -2530,11 +2578,11 @@ msgstr "" "Er draait nog een exemplaar van PiSi. Slechts één PiSi tegelijk kan de " "database aanpassen." -#: pisi/lockeddbshelve.py:81 +#: pisi/lockeddbshelve.py:80 msgid "Cannot attain read access to database environment" msgstr "Kan geen leestoegang tot de databaseomgeving krijgen" -#: pisi/lockeddbshelve.py:95 +#: pisi/lockeddbshelve.py:94 msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." @@ -2542,21 +2590,21 @@ msgstr "" "Kan geen schrijftoegang tot de PiSi database krijgen. U dient root te zijn " "voor deze handeling." -#: pisi/lockeddbshelve.py:113 +#: pisi/lockeddbshelve.py:112 msgid "Cannot attain read or write access to database %s" msgstr "Kan geen lees- of schrijftoegang krijgen tot de database %s" -#: pisi/lockeddbshelve.py:139 +#: pisi/lockeddbshelve.py:138 msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Opties moeten een van 'r', 'w', 'c' of 'n' zijn of gebruik de opties bsddb." "db.DB_*" -#: pisi/metadata.py:58 +#: pisi/metadata.py:74 msgid "Distribution: %s, Dist. Release: %s\n" msgstr "Distributie: %s, distributie-uitgave: %s\n" -#: pisi/metadata.py:60 +#: pisi/metadata.py:76 msgid "Architecture: %s, Installed Size: %s" msgstr "Architectuur: %s, installatiegrootte: %s" @@ -2564,11 +2612,11 @@ msgstr "Architectuur: %s, installatiegrootte: %s" msgid "Mirrors file %s does not exist. Could not resolve mirrors://" msgstr "Mirror bestand %s bestaat niet. Kan mirrors niet oplossen://" -#: pisi/operations.py:114 +#: pisi/operations.py:107 msgid "Mixing file names and package names not supported yet." msgstr "Combineren van bestands- en pakketnamen nog niet ondersteund." -#: pisi/operations.py:156 +#: pisi/operations.py:149 msgid "" "The following packages will be installed\n" "in the respective order to satisfy extra dependencies:\n" @@ -2576,36 +2624,36 @@ msgstr "" "De volgende pakketten zullen geïnstalleerd worden\n" "in de meest gunstige volgorde voor extra afhankelijkheden:\n" -#: pisi/operations.py:159 pisi/operations.py:621 +#: pisi/operations.py:152 pisi/operations.py:615 msgid "Do you want to continue?" msgstr "Wilt u doorgaan?" -#: pisi/operations.py:160 +#: pisi/operations.py:153 msgid "External dependencies not satisfied" msgstr "Externe afhankelijkheden zijn niet voldaan" # pisi/api.py:168 :215 -#: pisi/operations.py:172 pisi/operations.py:339 +#: pisi/operations.py:165 pisi/operations.py:332 msgid "No packages to install." msgstr "Geen te installeren pakketten." -#: pisi/operations.py:203 +#: pisi/operations.py:196 msgid "Installation order: " msgstr "Installatievolgorde: " -#: pisi/operations.py:257 pisi/operations.py:279 +#: pisi/operations.py:250 pisi/operations.py:272 msgid "Conflicts remain" msgstr "Conflicten blijven bestaan" -#: pisi/operations.py:267 +#: pisi/operations.py:260 msgid "Selected packages [%s] are in conflict with each other." msgstr "Geselecteerde pakketten [%s] zijn in conflict met elkaar." -#: pisi/operations.py:273 +#: pisi/operations.py:266 msgid "[%s conflicts with: %s]\n" msgstr "[%s in conflict met %s]\n" -#: pisi/operations.py:275 +#: pisi/operations.py:268 msgid "" "The following packages have conflicts:\n" "%s" @@ -2613,27 +2661,27 @@ msgstr "" "De volgende pakketten hebben conflicten:\n" "%s" -#: pisi/operations.py:278 +#: pisi/operations.py:271 msgid "Remove the following conflicting packages?" msgstr "De volgende pakketten met conflicten verwijderen?" -#: pisi/operations.py:305 +#: pisi/operations.py:298 msgid "Safety switch: Following packages in system.base will be installed: " msgstr "" "Veiligheidsprocedure: de volgende pakketten in system.base worden " "geïnstalleerd: " -#: pisi/operations.py:311 +#: pisi/operations.py:304 msgid "Safety switch: Following packages in system.base will be upgraded: " msgstr "" "Veiligheidsprocedure: de volgende pakketten in system.base worden " "opgewaardeerd: " -#: pisi/operations.py:317 pisi/operations.py:597 +#: pisi/operations.py:310 pisi/operations.py:591 msgid "Safety switch: the component system.base cannot be found" msgstr "Veiligheidsprocedure: component system.base is niet gevonden" -#: pisi/operations.py:334 +#: pisi/operations.py:327 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" @@ -2641,7 +2689,7 @@ msgstr "" "De volgende pakket(ten) zijn al geïnstalleerd en zullen niet opnieuw worden " "geïnstalleerd:\n" -#: pisi/operations.py:355 +#: pisi/operations.py:348 msgid "" "Following packages will be installed in the respective order to satisfy " "dependencies:\n" @@ -2649,65 +2697,65 @@ msgstr "" "De volgende pakketten zullen geïnstalleerd worden in de respectievelijke " "volgorde voor de afhankelijkheden:\n" -#: pisi/operations.py:360 pisi/operations.py:491 +#: pisi/operations.py:353 pisi/operations.py:485 msgid "Total size of package(s): %.2f %s" msgstr "Totale grootte van pakket(ten): %.2f %s" -#: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 msgid "There are extra packages due to dependencies. Do you want to continue?" msgstr "Er zijn extra pakketten wegens afhankelijkheden. Wilt u doorgaan?" -#: pisi/operations.py:432 +#: pisi/operations.py:425 msgid "Warning: package *name* ends with '.pisi'" msgstr "Waarschuwing: pakket *naam* eindigt met '.pisi'" -#: pisi/operations.py:435 +#: pisi/operations.py:428 msgid "Package %s is not installed." msgstr "Pakket %s is niet geïnstalleerd." -#: pisi/operations.py:441 +#: pisi/operations.py:434 msgid "Package %s is not available in repositories." msgstr "Pakket %s is niet beschikbaar in de repositories." -#: pisi/operations.py:453 +#: pisi/operations.py:447 msgid "Package %s is already at the latest release %s." msgstr "Pakket %s is al de laatste uitgave %s" -#: pisi/operations.py:459 +#: pisi/operations.py:453 msgid "Package %s is already at the latest build %s." msgstr "Pakket %s is al de laatste bouw %s." -#: pisi/operations.py:486 +#: pisi/operations.py:480 msgid "The following packages will be upgraded: " msgstr "De volgende pakketen zullen worden opgewaardeerd: " -#: pisi/operations.py:552 +#: pisi/operations.py:546 msgid "Dependency %s of %s cannot be satisfied" msgstr "Afhankelijkheid %s van %s kan niet worden voldaan" -#: pisi/operations.py:553 +#: pisi/operations.py:547 msgid "Upgrade is not possible." msgstr "Opwaarderen niet mogelijk." -#: pisi/operations.py:568 +#: pisi/operations.py:562 msgid "Reverse dependency %s of %s cannot be satisfied" msgstr "Omgekeerde afhankelijkheid %s van %s kan niet worden voldaan" -#: pisi/operations.py:593 +#: pisi/operations.py:587 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "" "Veiligheidsprocedure: kan de volgende pakketten niet verwijderen uit system." "base: " -#: pisi/operations.py:604 +#: pisi/operations.py:598 msgid "Package %s does not exist. Cannot remove." msgstr "Pakket %s bestaat niet." -#: pisi/operations.py:608 +#: pisi/operations.py:602 msgid "No packages to remove." msgstr "Geen te verwijderen pakketten." -#: pisi/operations.py:617 +#: pisi/operations.py:611 msgid "" "The following minimal list of packages will be removed\n" "in the respective order to satisfy dependencies:\n" @@ -2715,19 +2763,19 @@ msgstr "" "De volgende minimale lijst van pakketten zullen verwijderd worden\n" "in de respectievelijke volgorde om aan afhankelijkheden te voldoen:\n" -#: pisi/operations.py:622 +#: pisi/operations.py:616 msgid "Package removal declined" msgstr "Verwijderen van pakket afgewezen." -#: pisi/operations.py:634 +#: pisi/operations.py:628 msgid "Package %s is not installed. Cannot remove." msgstr "Pakket %s niet geïnstalleerd. Kan niet verwijderen." -#: pisi/operations.py:683 +#: pisi/operations.py:677 msgid "No packages to emerge." msgstr "Geen samen te voegen pakketten." -#: pisi/operations.py:698 +#: pisi/operations.py:692 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" @@ -2736,7 +2784,7 @@ msgstr "" "uit de repository in de respectievelijke volgorde om aan afhankelijkheden te " "voldoen:\n" -#: pisi/operations.py:701 +#: pisi/operations.py:695 msgid "" "The following minimal list of packages will be built and\n" "installed in the respective order to satisfy dependencies:\n" @@ -2745,7 +2793,7 @@ msgstr "" "en geïnstalleerd worden in de respectievelijke volgorde om\n" "aan afhankelijkheden te voldoen:\n" -#: pisi/operations.py:743 +#: pisi/operations.py:737 msgid "Cannot find source package: %s" msgstr "Kan bronpakket %s niet vinden" @@ -2755,33 +2803,33 @@ msgid "" "The package may have been upgraded. Please try to upgrade the package." msgstr "" "Er was een probleem bij ophalen van '%s'.\n" -"Het pakket kan bijgewerkt zijn. Probeer het pakket bij te werken." +"Het pakket kan opgewaardeerd zijn. Probeer het pakket op te waarderen." -#: pisi/package.py:60 pisi/sourcearchive.py:94 +#: pisi/package.py:60 pisi/sourcearchive.py:92 msgid "%s [cached]" msgstr "%s [cached]" -#: pisi/package.py:131 +#: pisi/package.py:136 msgid "MetaData format wrong" msgstr "Opmaak van metadata is onjuist" -#: pisi/packagedb.py:66 +#: pisi/packagedb.py:65 msgid "Package %s not found" msgstr "Pakket %s niet gevonden" -#: pisi/pxml/autoxml.py:77 +#: pisi/pxml/autoxml.py:79 msgid "At least one '%s' tag should have local text" msgstr "Minstens één '%s' tag moet lokale tekst bevatten" -#: pisi/pxml/autoxml.py:84 +#: pisi/pxml/autoxml.py:86 msgid "'%s' language of tag '%s' is empty" msgstr "'%s' taal van tag %s is leeg" -#: pisi/pxml/autoxml.py:112 +#: pisi/pxml/autoxml.py:114 msgid "LocalText: unable to get either current or default locale" msgstr "Localtext: huidige of standaard locale kon niet worden verkregen." -#: pisi/pxml/autoxml.py:118 pisi/pxml/autoxml.py:133 +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 msgid "" "Tag should have at least the current locale, or failing that an English or " "Turkish version" @@ -2789,68 +2837,68 @@ msgstr "" "De tag dient tenminste de huidige locale bevatten, of anders een Engelse, " "Nederlandse of Turkse versie" -#: pisi/pxml/autoxml.py:374 +#: pisi/pxml/autoxml.py:372 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' fouten" -#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.parse: lijn '%s' bevat fouten" -#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: bestand '%s' bevat fouten" -#: pisi/pxml/autoxml.py:467 +#: pisi/pxml/autoxml.py:465 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: objectvalidatie is mislukt" -#: pisi/pxml/autoxml.py:475 +#: pisi/pxml/autoxml.py:473 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: bestandscodering '%s' bevat fouten" -#: pisi/pxml/autoxml.py:525 +#: pisi/pxml/autoxml.py:523 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: onherkenbare tag %s in spec" -#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 msgid "Mandatory variable %s not available" msgstr "Verplichte variabele %s niet beschikbaar" -#: pisi/pxml/autoxml.py:654 +#: pisi/pxml/autoxml.py:652 msgid "Type mismatch: read text cannot be decoded" msgstr "Ongeldig type: leestekst kan niet ontcijferd worden" -#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 msgid "Mandatory token %s not available" msgstr "Verplichte teken %s niet beschikbaar" -#: pisi/pxml/autoxml.py:672 +#: pisi/pxml/autoxml.py:670 msgid "Type mismatch. Expected %s, got %s" msgstr "Ongeldig type: %s werd verwacht, %s is gekregen" # pisi/xmlfile.py:420 :521 -#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 msgid "Type mismatch: DOM cannot be decoded" msgstr "Ongeldig type: DOM kan niet ontcijferd worden" # pisi/xmlfile.py:392 :423 :439 :446 :524 :538 :545 -#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 -#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 msgid "Mandatory argument not available" msgstr "Verplicht argument niet beschikbaar" # pisi/xmlfile.py:436 :535 -#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 msgid "Object cannot be encoded" msgstr "Object kan niet gecodeerd worden" -#: pisi/pxml/autoxml.py:743 +#: pisi/pxml/autoxml.py:741 msgid "List type must contain only one element" msgstr "Lijsttype mag maar één element bevatten" # pisi/xmlfile.py:470 :485 -#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "De verplichte lijst \"%s\" onder de \"%s\" nodus is leeg." @@ -2858,23 +2906,23 @@ msgstr "De verplichte lijst \"%s\" onder de \"%s\" nodus is leeg." msgid "getNodeText: Expected text node, got something else!" msgstr "getNodeText:verwachte tekstverbinding, iets anders gevondenı!" -#: pisi/pxml/xmlfile.py:64 +#: pisi/pxml/xmlfile.py:63 msgid "String '%s' has invalid XML" msgstr "Regel '%s' bevat ongeldige XML" -#: pisi/pxml/xmlfile.py:72 pisi/pxml/xmlfile.py:87 +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 msgid "File '%s' has invalid XML" msgstr "Bestand '%s' bevat ongeldige XML" -#: pisi/repodb.py:74 +#: pisi/repodb.py:73 msgid "No repository named %s exists" msgstr "Er bestaat geen repository met de naam %s" -#: pisi/repodb.py:83 +#: pisi/repodb.py:82 msgid "Repository %s already exists" msgstr "Repository %s bestaat al" -#: pisi/repodb.py:90 +#: pisi/repodb.py:89 msgid "Cannot add repository at position %s" msgstr "Kan geen repository toevoegen op de positie %s" @@ -2890,23 +2938,23 @@ msgstr "Repo bevat al een pakket met de naam %s." msgid "Repo does not have package named %s." msgstr "Repo bevat geen pakket met de naam %s." -#: pisi/sourcearchive.py:63 +#: pisi/sourcearchive.py:61 msgid "Trying fallback address: %s" msgstr "Pogen terugval adres: %s" -#: pisi/sourcearchive.py:74 +#: pisi/sourcearchive.py:72 msgid "%s mirrors are not defined." msgstr "%s mirrors zijn niet benoemd." -#: pisi/sourcearchive.py:79 +#: pisi/sourcearchive.py:77 msgid "Fetching source from mirror: %s" msgstr "Bron ophalen van mirror: %s " -#: pisi/sourcearchive.py:85 +#: pisi/sourcearchive.py:83 msgid "Could not fetch source from %s mirrors." msgstr "Kon de bron van de %s mirrors niet ophalen." -#: pisi/sourcearchive.py:103 +#: pisi/sourcearchive.py:101 msgid "unpack: check_file_hash failed" msgstr "uitpakken: check_file_hash mislukt" @@ -2914,31 +2962,31 @@ msgstr "uitpakken: check_file_hash mislukt" msgid "Source package %s not found" msgstr "Bronpakket %s niet gevonden." -#: pisi/specfile.py:141 +#: pisi/specfile.py:140 msgid "URI: %s, type: %s, sha1sum: %s" msgstr "URI: %s, type: %s, sha1sum: %s" -#: pisi/specfile.py:208 +#: pisi/specfile.py:207 msgid "Name: %s, version: %s, release: %s, build %s\n" msgstr "Naam: %s, versie %s, uitgave %s, bouw %s\n" -#: pisi/specfile.py:210 +#: pisi/specfile.py:209 msgid "Summary: %s\n" msgstr "Inhoud: %s\n" -#: pisi/specfile.py:211 +#: pisi/specfile.py:210 msgid "Description: %s\n" msgstr "Beschrijving: %s\n" -#: pisi/specfile.py:212 +#: pisi/specfile.py:211 msgid "Component: %s\n" msgstr "Component: %s\n" -#: pisi/specfile.py:213 +#: pisi/specfile.py:212 msgid "Provides: " msgstr "Levert: " -#: pisi/specfile.py:217 +#: pisi/specfile.py:216 msgid "Dependencies: " msgstr "Afhankelijkheden: " @@ -2954,45 +3002,45 @@ msgstr "Actief " msgid "return value for \"%s\" is %s" msgstr "return-waarde voor \"%s\" is %s" -#: pisi/util.py:364 +#: pisi/util.py:361 msgid "Including external link '%s'" msgstr "Bijsluiten externe koppeling '%s'" -#: pisi/util.py:366 +#: pisi/util.py:363 msgid "Including directory '%s'" msgstr "Bijsluiten map '%s'" -#: pisi/util.py:440 +#: pisi/util.py:448 msgid "I/O Error: Cannot calculate SHA1 hash of %s" msgstr "I/O-fout: kan SHA1 hash van%s niet berekenen" -#: pisi/util.py:451 +#: pisi/util.py:459 msgid "Cannot calculate SHA1 hash of given data" msgstr "Kan SHA1 hash van opgegeven gegevens niet berekenen" -#: pisi/util.py:488 +#: pisi/util.py:498 msgid "ERROR: patch (%s) failed" msgstr "Fout: patch (%s) mislukt" -#: pisi/util.py:490 +#: pisi/util.py:500 msgid "ERROR: patch (%s) failed: %s" msgstr "Fout: patch (%s) mislukt: %s" -#: pisi/util.py:536 +#: pisi/util.py:546 msgid "strip command failed for file '%s'!" msgstr "Commando 'strip' mislukte voor bestand '%s'!" -#: pisi/util.py:543 +#: pisi/util.py:553 msgid "objcopy (keep-debug) command failed for file '%s'!" msgstr "Commando 'objcopy' (keep-debug) mislukte voor bestand '%s'!" -#: pisi/util.py:549 +#: pisi/util.py:559 msgid "objcopy (add-debuglink) command failed for file '%s'!" msgstr "Commando 'objcopy' (add-debuglink) mislukte voor bestand '%s'!" -#: pisi/util.py:610 +#: pisi/util.py:620 msgid "Updating environment..." -msgstr "Omgeving bijwerken..." +msgstr "Updaten omgeving..." #: scripts/repostats.py:226 msgid "" diff --git a/po/pisi.pot b/po/pisi.pot index 2a243cee..894d4372 100644 --- a/po/pisi.pot +++ b/po/pisi.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-03-02 16:01+EET\n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,7 +67,7 @@ msgid "" " " msgstr "" -#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 #, docstring msgid "Return a comma-separated list of option strings & metavariables." msgstr "" @@ -79,7 +79,7 @@ msgid "" " " msgstr "" -#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:44 +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 msgid "" "usage: %s\n" msgstr "" @@ -420,11 +420,11 @@ msgstr "" msgid "No configure script found for cmake." msgstr "" -#: pisi/actionsapi/get.py:163 +#: pisi/actionsapi/get.py:160 msgid "Util %s cannot be found" msgstr "" -#: pisi/actionsapi/get.py:165 +#: pisi/actionsapi/get.py:162 msgid "Warning: %s does not exist, using plain name %s" msgstr "" @@ -553,11 +553,11 @@ msgstr "" msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "" -#: pisi/api.py:299 pisi/comariface.py:30 +#: pisi/api.py:297 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "" -#: pisi/api.py:311 +#: pisi/api.py:309 msgid "File %s not found" msgstr "" @@ -571,7 +571,7 @@ msgid "" "Corrupt file: %s" msgstr "" -#: pisi/api.py:370 pisi/cli/commands.py:967 +#: pisi/api.py:370 pisi/cli/commands.py:1044 msgid "OK" msgstr "" @@ -641,142 +641,142 @@ msgstr "" msgid "Archive type not recognized" msgstr "" -#: pisi/atomicoperations.py:66 +#: pisi/atomicoperations.py:67 msgid "Package %s found in repository %s" msgstr "" -#: pisi/atomicoperations.py:78 +#: pisi/atomicoperations.py:90 msgid "Package URI: %s" msgstr "" -#: pisi/atomicoperations.py:82 +#: pisi/atomicoperations.py:94 msgid "Package %s not found in any active repository." msgstr "" -#: pisi/atomicoperations.py:101 +#: pisi/atomicoperations.py:113 msgid "Installing %s, version %s, release %s, build %s" msgstr "" -#: pisi/atomicoperations.py:146 +#: pisi/atomicoperations.py:158 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" -#: pisi/atomicoperations.py:165 +#: pisi/atomicoperations.py:177 msgid "" "/%s from %s package\n" msgstr "" -#: pisi/atomicoperations.py:166 +#: pisi/atomicoperations.py:178 msgid "" "File conflicts:\n" "%s" msgstr "" -#: pisi/atomicoperations.py:201 +#: pisi/atomicoperations.py:213 msgid "Re-install same version package?" msgstr "" -#: pisi/atomicoperations.py:202 +#: pisi/atomicoperations.py:214 msgid "Package re-install declined" msgstr "" -#: pisi/atomicoperations.py:208 +#: pisi/atomicoperations.py:220 msgid "Upgrading to new upstream version" msgstr "" -#: pisi/atomicoperations.py:211 +#: pisi/atomicoperations.py:223 msgid "Upgrading to new distribution release" msgstr "" -#: pisi/atomicoperations.py:215 +#: pisi/atomicoperations.py:227 msgid "Upgrading to new distribution build" msgstr "" -#: pisi/atomicoperations.py:225 +#: pisi/atomicoperations.py:237 msgid "Downgrade to old distribution release?" msgstr "" -#: pisi/atomicoperations.py:227 +#: pisi/atomicoperations.py:239 msgid "Downgrade to old distribution build?" msgstr "" -#: pisi/atomicoperations.py:229 +#: pisi/atomicoperations.py:241 msgid "Package downgrade declined" msgstr "" -#: pisi/atomicoperations.py:253 +#: pisi/atomicoperations.py:265 msgid "%s configuration failed." msgstr "" -#: pisi/atomicoperations.py:340 +#: pisi/atomicoperations.py:388 msgid "Storing %s, " msgstr "" -#: pisi/atomicoperations.py:343 +#: pisi/atomicoperations.py:391 msgid "Storing %s." msgstr "" -#: pisi/atomicoperations.py:350 +#: pisi/atomicoperations.py:398 msgid "Storing %s" msgstr "" -#: pisi/atomicoperations.py:406 +#: pisi/atomicoperations.py:454 msgid "File list could not be read for package %s, continuing removal." msgstr "" -#: pisi/atomicoperations.py:412 +#: pisi/atomicoperations.py:460 msgid "Removing package %s" msgstr "" -#: pisi/atomicoperations.py:415 +#: pisi/atomicoperations.py:463 msgid "Trying to remove nonexistent package " msgstr "" -#: pisi/atomicoperations.py:454 +#: pisi/atomicoperations.py:502 msgid "Not removing conflicted file : %s" msgstr "" -#: pisi/atomicoperations.py:474 +#: pisi/atomicoperations.py:522 msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "" -#: pisi/atomicoperations.py:535 +#: pisi/atomicoperations.py:581 msgid "Metadata XML '%s' cannot be found" msgstr "" -#: pisi/atomicoperations.py:543 +#: pisi/atomicoperations.py:589 msgid "MetaData format wrong (%s)" msgstr "" -#: pisi/atomicoperations.py:545 +#: pisi/atomicoperations.py:591 msgid "* Adding '%s' to db... " msgstr "" -#: pisi/atomicoperations.py:551 +#: pisi/atomicoperations.py:597 msgid "Files XML '%s' cannot be found" msgstr "" -#: pisi/atomicoperations.py:556 pisi/package.py:136 +#: pisi/atomicoperations.py:602 pisi/package.py:141 msgid "Invalid %s" msgstr "" -#: pisi/atomicoperations.py:565 +#: pisi/atomicoperations.py:611 msgid "OK." msgstr "" -#: pisi/build.py:88 +#: pisi/build.py:86 msgid "Path %s belongs in multiple packages" msgstr "" -#: pisi/build.py:114 +#: pisi/build.py:112 msgid "Source URI: %s" msgstr "" -#: pisi/build.py:118 +#: pisi/build.py:116 msgid "Source %s not found in any active repository." msgstr "" -#: pisi/build.py:183 +#: pisi/build.py:181 msgid "Building PiSi source package: %s" msgstr "" @@ -825,270 +825,274 @@ msgid "Building source..." msgstr "" #: pisi/build.py:328 +msgid "Testing package..." +msgstr "" + +#: pisi/build.py:332 msgid "Installing..." msgstr "" -#: pisi/build.py:370 +#: pisi/build.py:374 msgid "Unable to read Actions Script (%s): %s" msgstr "" -#: pisi/build.py:372 +#: pisi/build.py:376 msgid "SyntaxError in Actions Script (%s): %s" msgstr "" -#: pisi/build.py:389 +#: pisi/build.py:393 msgid "Unable to read COMAR script (%s): %s" msgstr "" -#: pisi/build.py:391 +#: pisi/build.py:395 msgid "SyntaxError in COMAR file (%s): %s" msgstr "" -#: pisi/build.py:417 +#: pisi/build.py:421 msgid "unable to call function from actions: %s" msgstr "" -#: pisi/build.py:433 +#: pisi/build.py:437 msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" -#: pisi/build.py:438 +#: pisi/build.py:442 msgid "Safety switch: system.devel is already installed" msgstr "" -#: pisi/build.py:440 +#: pisi/build.py:444 msgid "Safety switch: the component system.devel cannot be found" msgstr "" -#: pisi/build.py:449 +#: pisi/build.py:453 msgid "Unsatisfied Build Dependencies:" msgstr "" -#: pisi/build.py:453 +#: pisi/build.py:457 msgid "Cannot build package due to unsatisfied build dependencies" msgstr "" -#: pisi/build.py:461 +#: pisi/build.py:465 msgid "Build dependency %s cannot be satisfied" msgstr "" -#: pisi/build.py:463 +#: pisi/build.py:467 msgid "Do you want to install the unsatisfied build dependencies" msgstr "" -#: pisi/build.py:464 +#: pisi/build.py:468 msgid "Installing build dependencies." msgstr "" -#: pisi/build.py:469 +#: pisi/build.py:473 msgid "Ignoring build dependencies." msgstr "" -#: pisi/build.py:479 +#: pisi/build.py:483 msgid "" "Patch file is missing: %s\n" msgstr "" -#: pisi/build.py:492 +#: pisi/build.py:496 msgid "* Applying patch: %s" msgstr "" -#: pisi/build.py:550 +#: pisi/build.py:554 msgid "Stripping files.." msgstr "" -#: pisi/build.py:656 +#: pisi/build.py:654 msgid "(found old version %s)" msgstr "" -#: pisi/build.py:658 +#: pisi/build.py:656 msgid "Skipping %s with wrong pkg name " msgstr "" -#: pisi/build.py:679 +#: pisi/build.py:677 msgid "(no previous build found, setting build no to 1.)" msgstr "" -#: pisi/build.py:724 +#: pisi/build.py:722 msgid "(old package lacks a build no, setting build no to 1.)" msgstr "" -#: pisi/build.py:727 +#: pisi/build.py:725 msgid "There are changes, incrementing build no to %d" msgstr "" -#: pisi/build.py:730 +#: pisi/build.py:728 msgid "There is no change from previous build %d" msgstr "" -#: pisi/build.py:795 +#: pisi/build.py:793 msgid "No user named '%s' found on the system" msgstr "" -#: pisi/build.py:800 +#: pisi/build.py:798 msgid "No group named '%s' found on the system" msgstr "" -#: pisi/build.py:803 +#: pisi/build.py:801 msgid "** Building package %s" msgstr "" -#: pisi/build.py:805 pisi/build.py:808 +#: pisi/build.py:803 pisi/build.py:806 msgid "Generating %s," msgstr "" -#: pisi/build.py:814 +#: pisi/build.py:812 msgid "Build number is not available. For repo builds you must enable buildno in pisi.conf." msgstr "" -#: pisi/build.py:832 +#: pisi/build.py:830 msgid "Creating PiSi package %s." msgstr "" -#: pisi/build.py:877 +#: pisi/build.py:875 pisi/delta.py:93 msgid "Done." msgstr "" -#: pisi/build.py:883 +#: pisi/build.py:881 msgid "Abandoned files under the install dir (%s):" msgstr "" -#: pisi/build.py:887 +#: pisi/build.py:885 msgid "All of the files under the install dir (%s) has been collected by package(s)" msgstr "" -#: pisi/build.py:891 +#: pisi/build.py:889 msgid "Cleaning Build Directory..." msgstr "" -#: pisi/build.py:894 +#: pisi/build.py:892 msgid "Keeping Build Directory" msgstr "" -#: pisi/cli/__init__.py:79 +#: pisi/cli/__init__.py:76 msgid "Warning: " msgstr "" -#: pisi/cli/__init__.py:88 +#: pisi/cli/__init__.py:85 msgid "Error: " msgstr "" -#: pisi/cli/__init__.py:120 +#: pisi/cli/__init__.py:117 msgid " (yes/no)" msgstr "" -#: pisi/cli/__init__.py:141 +#: pisi/cli/__init__.py:138 msgid "" " [complete]\n" msgstr "" -#: pisi/cli/__init__.py:151 +#: pisi/cli/__init__.py:148 msgid "Installed %s" msgstr "" -#: pisi/cli/__init__.py:153 +#: pisi/cli/__init__.py:150 msgid "Removed %s" msgstr "" -#: pisi/cli/__init__.py:155 +#: pisi/cli/__init__.py:152 msgid "Upgraded %s" msgstr "" -#: pisi/cli/__init__.py:157 +#: pisi/cli/__init__.py:154 msgid "Configured %s" msgstr "" -#: pisi/cli/__init__.py:159 +#: pisi/cli/__init__.py:156 msgid "Extracting the files of %s" msgstr "" -#: pisi/cli/commands.py:94 +#: pisi/cli/commands.py:92 #, docstring msgid "generic help string for any command" msgstr "" -#: pisi/cli/commands.py:123 pisi/cli/pisicli.py:104 +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 msgid "Unrecognized command: %s" msgstr "" -#: pisi/cli/commands.py:145 +#: pisi/cli/commands.py:143 #, docstring msgid "common options" msgstr "" -#: pisi/cli/commands.py:148 +#: pisi/cli/commands.py:146 msgid "general options" msgstr "" -#: pisi/cli/commands.py:151 +#: pisi/cli/commands.py:149 msgid "Change the system root for PiSi commands" msgstr "" -#: pisi/cli/commands.py:153 +#: pisi/cli/commands.py:151 msgid "Assume yes in all yes/no queries" msgstr "" -#: pisi/cli/commands.py:158 +#: pisi/cli/commands.py:156 msgid "Detailed output" msgstr "" -#: pisi/cli/commands.py:160 +#: pisi/cli/commands.py:158 msgid "Show debugging information" msgstr "" -#: pisi/cli/commands.py:162 +#: pisi/cli/commands.py:160 msgid "Suppresses all coloring of PiSi's output" msgstr "" -#: pisi/cli/commands.py:169 +#: pisi/cli/commands.py:167 #, docstring msgid "" "This is a fall back function. If the implementer module provides an\n" " options function it will be called" msgstr "" -#: pisi/cli/commands.py:181 +#: pisi/cli/commands.py:179 msgid "" "Destination directory %s does not exist. Creating directory.\n" msgstr "" -#: pisi/cli/commands.py:203 +#: pisi/cli/commands.py:201 msgid "Password: " msgstr "" -#: pisi/cli/commands.py:209 +#: pisi/cli/commands.py:207 #, docstring msgid "initialize PiSi components" msgstr "" -#: pisi/cli/commands.py:217 +#: pisi/cli/commands.py:215 #, docstring msgid "do cleanup work for PiSi components" msgstr "" -#: pisi/cli/commands.py:231 +#: pisi/cli/commands.py:229 #, docstring msgid "print help for the command" msgstr "" -#: pisi/cli/commands.py:237 +#: pisi/cli/commands.py:235 #, docstring msgid "exit program" msgstr "" -#: pisi/cli/commands.py:239 +#: pisi/cli/commands.py:237 msgid "Command terminated abnormally." msgstr "" -#: pisi/cli/commands.py:249 +#: pisi/cli/commands.py:247 msgid "Command lacks name" msgstr "" -#: pisi/cli/commands.py:253 +#: pisi/cli/commands.py:251 msgid "Duplicate command %s" msgstr "" -#: pisi/cli/commands.py:262 +#: pisi/cli/commands.py:260 #, docstring msgid "" "Prints help for given commands\n" @@ -1098,7 +1102,7 @@ msgid "" "If run without parameters, it prints the general help." msgstr "" -#: pisi/cli/commands.py:296 +#: pisi/cli/commands.py:294 #, docstring msgid "" "Clean stale locks\n" @@ -1109,7 +1113,7 @@ msgid "" "This command deletes unused locks from the database directory." msgstr "" -#: pisi/cli/commands.py:315 +#: pisi/cli/commands.py:313 #, docstring msgid "" "Delete cache files\n" @@ -1121,7 +1125,7 @@ msgid "" "consume a lot of disk space." msgstr "" -#: pisi/cli/commands.py:336 +#: pisi/cli/commands.py:334 #, docstring msgid "" "Graph package relations\n" @@ -1134,47 +1138,47 @@ msgid "" "the package in graphviz format to 'pgraph.dot'.\n" msgstr "" -#: pisi/cli/commands.py:353 +#: pisi/cli/commands.py:351 msgid "graph options" msgstr "" -#: pisi/cli/commands.py:357 +#: pisi/cli/commands.py:355 msgid "Specify a particular repository" msgstr "" -#: pisi/cli/commands.py:360 +#: pisi/cli/commands.py:358 msgid "Graph of installed packages" msgstr "" -#: pisi/cli/commands.py:363 +#: pisi/cli/commands.py:361 msgid "Do not show installed packages" msgstr "" -#: pisi/cli/commands.py:366 +#: pisi/cli/commands.py:364 msgid "Dot output file" msgstr "" -#: pisi/cli/commands.py:377 +#: pisi/cli/commands.py:375 msgid "Plotting packages in repository %s" msgstr "" -#: pisi/cli/commands.py:383 +#: pisi/cli/commands.py:381 msgid "Plotting a graph of relations among all repository packages" msgstr "" -#: pisi/cli/commands.py:390 +#: pisi/cli/commands.py:388 msgid "Plotting a graph of relations among all installed packages" msgstr "" -#: pisi/cli/commands.py:402 +#: pisi/cli/commands.py:400 msgid "Do not take build no into account." msgstr "" -#: pisi/cli/commands.py:407 +#: pisi/cli/commands.py:405 msgid "Do not take dependency information into account" msgstr "" -#: pisi/cli/commands.py:411 +#: pisi/cli/commands.py:409 #, docstring msgid "" "Build PiSi packages\n" @@ -1188,22 +1192,26 @@ msgid "" "to be downloaded from a repository containing sources.\n" msgstr "" -#: pisi/cli/commands.py:434 +#: pisi/cli/commands.py:432 msgid "build options" msgstr "" -#: pisi/cli/commands.py:442 +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 msgid "Output directory for produced packages" msgstr "" -#: pisi/cli/commands.py:445 +#: pisi/cli/commands.py:443 msgid "Bypass errors from ActionsAPI" msgstr "" -#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 msgid "Bypass safety switch" msgstr "" +#: pisi/cli/commands.py:447 +msgid "Bypass testing step" +msgstr "" + #: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "" @@ -1237,26 +1245,46 @@ msgid "Break build after running compile step" msgstr "" #: pisi/cli/commands.py:466 -msgid "Break build after running install step" +msgid "Break build after running check step" msgstr "" #: pisi/cli/commands.py:468 +msgid "Break build after running install step" +msgstr "" + +#: pisi/cli/commands.py:470 msgid "create PiSi package" msgstr "" -#: pisi/cli/commands.py:482 +#: pisi/cli/commands.py:484 msgid "package_format must be one of %s " msgstr "" -#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 msgid "Output directory: %s" msgstr "" -#: pisi/cli/commands.py:487 +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 msgid "Outputting packages in the working directory." msgstr "" -#: pisi/cli/commands.py:498 +#: pisi/cli/commands.py:500 +#, docstring +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two releases.\n" +"\n" +msgstr "" + +#: pisi/cli/commands.py:517 +msgid "delta options" +msgstr "" + +#: pisi/cli/commands.py:549 #, docstring msgid "" "Build and install PiSi source packages from repository\n" @@ -1269,36 +1297,36 @@ msgid "" "You can also give the name of a component.\n" msgstr "" -#: pisi/cli/commands.py:517 +#: pisi/cli/commands.py:568 msgid "emerge options" msgstr "" -#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 msgid "Ignore file conflicts" msgstr "" -#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 msgid "Ignore package conflicts" msgstr "" -#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 msgid "Bypass comar configuration agent" msgstr "" -#: pisi/cli/commands.py:536 +#: pisi/cli/commands.py:587 msgid "Outputting binary packages in the package cache." msgstr "" -#: pisi/cli/commands.py:544 +#: pisi/cli/commands.py:595 #, docstring msgid "Abstract package operation command" msgstr "" -#: pisi/cli/commands.py:557 +#: pisi/cli/commands.py:608 msgid "Do not perform any action, just show what would be done" msgstr "" -#: pisi/cli/commands.py:568 +#: pisi/cli/commands.py:619 #, docstring msgid "" "Install PiSi packages\n" @@ -1312,23 +1340,23 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:586 +#: pisi/cli/commands.py:637 msgid "install options" msgstr "" -#: pisi/cli/commands.py:591 +#: pisi/cli/commands.py:642 msgid "Reinstall already installed packages" msgstr "" -#: pisi/cli/commands.py:597 +#: pisi/cli/commands.py:648 msgid "Install component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 msgid "Fetch upgrades but do not install." msgstr "" -#: pisi/cli/commands.py:622 +#: pisi/cli/commands.py:677 #, docstring msgid "" "Upgrade PiSi packages\n" @@ -1349,39 +1377,39 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:648 +#: pisi/cli/commands.py:703 msgid "upgrade options" msgstr "" -#: pisi/cli/commands.py:653 +#: pisi/cli/commands.py:708 msgid "Security related package upgrades only" msgstr "" -#: pisi/cli/commands.py:655 +#: pisi/cli/commands.py:710 msgid "Do not update repositories" msgstr "" -#: pisi/cli/commands.py:661 +#: pisi/cli/commands.py:716 msgid "Upgrade component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:665 +#: pisi/cli/commands.py:720 msgid "When upgrading system, ignore packages and components whose basenames match pattern." msgstr "" -#: pisi/cli/commands.py:667 +#: pisi/cli/commands.py:722 msgid "When upgrading system, ignore packages and components whose basenames match any pattern contained in file." msgstr "" -#: pisi/cli/commands.py:707 +#: pisi/cli/commands.py:766 msgid "Updating repositories" msgstr "" -#: pisi/cli/commands.py:712 +#: pisi/cli/commands.py:771 msgid "Will not update repositories" msgstr "" -#: pisi/cli/commands.py:734 +#: pisi/cli/commands.py:796 #, docstring msgid "" "Remove PiSi packages\n" @@ -1394,15 +1422,15 @@ msgid "" "expanded to package names.\n" msgstr "" -#: pisi/cli/commands.py:751 +#: pisi/cli/commands.py:813 msgid "remove options" msgstr "" -#: pisi/cli/commands.py:754 +#: pisi/cli/commands.py:816 msgid "Remove component's and recursive components' packages" msgstr "" -#: pisi/cli/commands.py:776 +#: pisi/cli/commands.py:838 #, docstring msgid "" "Configure pending packages\n" @@ -1413,11 +1441,11 @@ msgid "" "configures those packages.\n" msgstr "" -#: pisi/cli/commands.py:792 +#: pisi/cli/commands.py:854 msgid "configure-pending options" msgstr "" -#: pisi/cli/commands.py:804 +#: pisi/cli/commands.py:866 #, docstring msgid "" "Display package information\n" @@ -1427,73 +1455,73 @@ msgid "" " is either a package name or a .pisi file,\n" msgstr "" -#: pisi/cli/commands.py:819 +#: pisi/cli/commands.py:881 msgid "info options" msgstr "" -#: pisi/cli/commands.py:826 +#: pisi/cli/commands.py:888 msgid "Show a list of package files." msgstr "" -#: pisi/cli/commands.py:828 +#: pisi/cli/commands.py:890 msgid "Info about the given component" msgstr "" -#: pisi/cli/commands.py:831 +#: pisi/cli/commands.py:893 msgid "Show only paths." msgstr "" -#: pisi/cli/commands.py:833 +#: pisi/cli/commands.py:895 msgid "Do not show details" msgstr "" -#: pisi/cli/commands.py:835 +#: pisi/cli/commands.py:897 msgid "Output in xml format" msgstr "" -#: pisi/cli/commands.py:881 +#: pisi/cli/commands.py:943 msgid "Package file: %s" msgstr "" -#: pisi/cli/commands.py:887 +#: pisi/cli/commands.py:949 msgid "[inst] " msgstr "" -#: pisi/cli/commands.py:889 +#: pisi/cli/commands.py:951 msgid "Installed package:" msgstr "" -#: pisi/cli/commands.py:895 +#: pisi/cli/commands.py:957 msgid "[repo] " msgstr "" -#: pisi/cli/commands.py:897 -msgid "Package found in repository:" +#: pisi/cli/commands.py:959 +msgid "Package found in %s repository:" msgstr "" -#: pisi/cli/commands.py:901 +#: pisi/cli/commands.py:963 msgid "%s is not found in repositories" msgstr "" -#: pisi/cli/commands.py:904 +#: pisi/cli/commands.py:966 msgid "%s is not installed" msgstr "" -#: pisi/cli/commands.py:917 +#: pisi/cli/commands.py:979 msgid "Reverse Dependencies:" msgstr "" -#: pisi/cli/commands.py:920 +#: pisi/cli/commands.py:982 msgid "" "\n" "Files:" msgstr "" -#: pisi/cli/commands.py:928 +#: pisi/cli/commands.py:990 msgid "File information not available" msgstr "" -#: pisi/cli/commands.py:934 +#: pisi/cli/commands.py:996 #, docstring msgid "" "Verify installation\n" @@ -1509,25 +1537,33 @@ msgid "" "If no packages are given, checks all installed packages.\n" msgstr "" -#: pisi/cli/commands.py:958 +#: pisi/cli/commands.py:1016 +msgid "check options" +msgstr "" + +#: pisi/cli/commands.py:1018 +msgid "Check installed packages under given component" +msgstr "" + +#: pisi/cli/commands.py:1034 msgid "Checking all installed packages" msgstr "" -#: pisi/cli/commands.py:961 +#: pisi/cli/commands.py:1038 msgid "* Checking %s... " msgstr "" -#: pisi/cli/commands.py:965 +#: pisi/cli/commands.py:1042 msgid "" "\n" "Package %s is corrupt." msgstr "" -#: pisi/cli/commands.py:969 +#: pisi/cli/commands.py:1046 msgid "Package %s not installed" msgstr "" -#: pisi/cli/commands.py:974 +#: pisi/cli/commands.py:1051 #, docstring msgid "" "Index PiSi files in a given directory\n" @@ -1543,31 +1579,31 @@ msgid "" "everything in a single index file.\n" msgstr "" -#: pisi/cli/commands.py:995 +#: pisi/cli/commands.py:1072 msgid "index options" msgstr "" -#: pisi/cli/commands.py:999 +#: pisi/cli/commands.py:1076 msgid "Store absolute links for indexed files." msgstr "" -#: pisi/cli/commands.py:1002 +#: pisi/cli/commands.py:1079 msgid "Index output file" msgstr "" -#: pisi/cli/commands.py:1005 +#: pisi/cli/commands.py:1082 msgid "Do not index PiSi spec files." msgstr "" -#: pisi/cli/commands.py:1008 +#: pisi/cli/commands.py:1085 msgid "Do not sign index." msgstr "" -#: pisi/cli/commands.py:1021 +#: pisi/cli/commands.py:1098 msgid "Indexing current directory." msgstr "" -#: pisi/cli/commands.py:1029 +#: pisi/cli/commands.py:1106 #, docstring msgid "" "Print the list of all installed packages\n" @@ -1575,29 +1611,29 @@ msgid "" "Usage: list-installed\n" msgstr "" -#: pisi/cli/commands.py:1043 +#: pisi/cli/commands.py:1120 msgid "list-installed options" msgstr "" -#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 -#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 -#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 msgid "Show in long format" msgstr "" -#: pisi/cli/commands.py:1048 +#: pisi/cli/commands.py:1125 msgid "List installed packages under given component" msgstr "" -#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 msgid "Show detailed install info" msgstr "" -#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "" -#: pisi/cli/commands.py:1082 +#: pisi/cli/commands.py:1159 #, docstring msgid "" "Rebuild Databases\n" @@ -1610,19 +1646,19 @@ msgid "" "dirs under /var/lib/pisi\n" msgstr "" -#: pisi/cli/commands.py:1100 +#: pisi/cli/commands.py:1177 msgid "rebuild-db options" msgstr "" -#: pisi/cli/commands.py:1103 +#: pisi/cli/commands.py:1180 msgid "Rebuild files database" msgstr "" -#: pisi/cli/commands.py:1114 +#: pisi/cli/commands.py:1191 msgid "Rebuild PiSi databases?" msgstr "" -#: pisi/cli/commands.py:1121 +#: pisi/cli/commands.py:1198 #, docstring msgid "" "Update repository databases\n" @@ -1635,15 +1671,15 @@ msgid "" "If no repository is given, all repositories are updated.\n" msgstr "" -#: pisi/cli/commands.py:1139 +#: pisi/cli/commands.py:1216 msgid "update-repo options" msgstr "" -#: pisi/cli/commands.py:1143 +#: pisi/cli/commands.py:1220 msgid "Update database in any case" msgstr "" -#: pisi/cli/commands.py:1161 +#: pisi/cli/commands.py:1238 #, docstring msgid "" "Add a repository\n" @@ -1658,23 +1694,23 @@ msgid "" "NB: We support only local files (e.g., /a/b/c) and http:// URIs at the moment\n" msgstr "" -#: pisi/cli/commands.py:1181 +#: pisi/cli/commands.py:1258 msgid "add-repo options" msgstr "" -#: pisi/cli/commands.py:1184 +#: pisi/cli/commands.py:1261 msgid "Add repository at given position (0 is first)" msgstr "" -#: pisi/cli/commands.py:1198 +#: pisi/cli/commands.py:1275 msgid "Update PiSi database for repository %s?" msgstr "" -#: pisi/cli/commands.py:1202 +#: pisi/cli/commands.py:1279 msgid "%s repository could not be reached. Removing %s from system." msgstr "" -#: pisi/cli/commands.py:1211 +#: pisi/cli/commands.py:1288 #, docstring msgid "" "Remove repositories\n" @@ -1684,7 +1720,7 @@ msgid "" "Remove all repository information from the system.\n" msgstr "" -#: pisi/cli/commands.py:1237 +#: pisi/cli/commands.py:1314 #, docstring msgid "" "List repositories\n" @@ -1694,7 +1730,7 @@ msgid "" "Lists currently tracked repositories.\n" msgstr "" -#: pisi/cli/commands.py:1260 +#: pisi/cli/commands.py:1337 #, docstring msgid "" "List available packages in the repositories\n" @@ -1706,28 +1742,28 @@ msgid "" "all repositories.\n" msgstr "" -#: pisi/cli/commands.py:1277 +#: pisi/cli/commands.py:1354 msgid "list-available options" msgstr "" -#: pisi/cli/commands.py:1281 +#: pisi/cli/commands.py:1358 msgid "List available packages under given component" msgstr "" -#: pisi/cli/commands.py:1283 +#: pisi/cli/commands.py:1360 msgid "Show uninstalled packages only" msgstr "" -#: pisi/cli/commands.py:1291 +#: pisi/cli/commands.py:1368 msgid "Installed packages are shown in this color" msgstr "" -#: pisi/cli/commands.py:1299 +#: pisi/cli/commands.py:1376 msgid "" "Repository : %s\n" msgstr "" -#: pisi/cli/commands.py:1326 +#: pisi/cli/commands.py:1403 #, docstring msgid "" "List available components\n" @@ -1738,11 +1774,11 @@ msgid "" "repositories.\n" msgstr "" -#: pisi/cli/commands.py:1341 +#: pisi/cli/commands.py:1418 msgid "list-components options" msgstr "" -#: pisi/cli/commands.py:1366 +#: pisi/cli/commands.py:1443 #, docstring msgid "" "List available sources\n" @@ -1752,11 +1788,11 @@ msgid "" "Gives a brief list of sources published in the repositories.\n" msgstr "" -#: pisi/cli/commands.py:1380 +#: pisi/cli/commands.py:1457 msgid "list-sources options" msgstr "" -#: pisi/cli/commands.py:1405 +#: pisi/cli/commands.py:1482 #, docstring msgid "" "List packages to be upgraded\n" @@ -1766,19 +1802,19 @@ msgid "" "Lists the packages that will be upgraded.\n" msgstr "" -#: pisi/cli/commands.py:1419 +#: pisi/cli/commands.py:1496 msgid "list-upgrades options" msgstr "" -#: pisi/cli/commands.py:1424 +#: pisi/cli/commands.py:1501 msgid "List upgradable packages under given component" msgstr "" -#: pisi/cli/commands.py:1441 pisi/operations.py:466 +#: pisi/cli/commands.py:1518 pisi/operations.py:460 msgid "No packages to upgrade." msgstr "" -#: pisi/cli/commands.py:1461 +#: pisi/cli/commands.py:1538 #, docstring msgid "" "List pending packages\n" @@ -1786,11 +1822,11 @@ msgid "" "Lists packages waiting to be configured.\n" msgstr "" -#: pisi/cli/commands.py:1483 +#: pisi/cli/commands.py:1560 msgid "There are no packages waiting to be configured" msgstr "" -#: pisi/cli/commands.py:1488 +#: pisi/cli/commands.py:1565 #, docstring msgid "" "Search packages\n" @@ -1801,23 +1837,19 @@ msgid "" "in summary, description, and package name fields.\n" msgstr "" -#: pisi/cli/commands.py:1503 +#: pisi/cli/commands.py:1580 msgid "search options" msgstr "" -#: pisi/cli/commands.py:1506 -msgid "Set search language" -msgstr "" - -#: pisi/cli/commands.py:1511 +#: pisi/cli/commands.py:1586 msgid "Show details" msgstr "" -#: pisi/cli/commands.py:1523 +#: pisi/cli/commands.py:1598 msgid "%s packages found" msgstr "" -#: pisi/cli/commands.py:1532 +#: pisi/cli/commands.py:1607 #, docstring msgid "" "Search for a file\n" @@ -1827,35 +1859,35 @@ msgid "" "Finds the installed package which contains the specified file.\n" msgstr "" -#: pisi/cli/commands.py:1546 +#: pisi/cli/commands.py:1621 msgid "search-file options" msgstr "" -#: pisi/cli/commands.py:1550 +#: pisi/cli/commands.py:1625 msgid "Fuzzy search" msgstr "" -#: pisi/cli/commands.py:1552 +#: pisi/cli/commands.py:1627 msgid "Show only package name" msgstr "" -#: pisi/cli/commands.py:1573 +#: pisi/cli/commands.py:1648 msgid "Package %s has file %s" msgstr "" -#: pisi/cli/commands.py:1575 +#: pisi/cli/commands.py:1650 msgid "Type: %s, Hash: %s" msgstr "" -#: pisi/cli/commands.py:1578 +#: pisi/cli/commands.py:1653 msgid "Path '%s' does not belong to an installed package" msgstr "" -#: pisi/cli/commands.py:1591 +#: pisi/cli/commands.py:1666 msgid "Searching for %s" msgstr "" -#: pisi/cli/commands.py:1601 +#: pisi/cli/commands.py:1676 msgid "" "%prog [options] [arguments]\n" "\n" @@ -1863,7 +1895,7 @@ msgid "" "\n" msgstr "" -#: pisi/cli/commands.py:1607 +#: pisi/cli/commands.py:1682 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -1937,19 +1969,19 @@ msgstr "" msgid "Unregistering comar scripts" msgstr "" -#: pisi/component.py:106 pisi/component.py:112 +#: pisi/component.py:105 pisi/component.py:111 msgid "Component %s not found" msgstr "" -#: pisi/component.py:208 pisi/component.py:234 +#: pisi/component.py:207 pisi/component.py:233 msgid "Information for component %s not available" msgstr "" -#: pisi/config.py:61 +#: pisi/config.py:60 msgid "Destination directory %s does not exist. Creating it." msgstr "" -#: pisi/configfile.py:105 +#: pisi/configfile.py:107 msgid "No section by name '%s'" msgstr "" @@ -1985,6 +2017,14 @@ msgstr "" msgid "Can't unbind constant: %s" msgstr "" +#: pisi/delta.py:27 +msgid "Cannot create delta for same package!" +msgstr "" + +#: pisi/delta.py:41 +msgid "Creating delta PiSi package between %s %s" +msgstr "" + #: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "" @@ -2013,31 +2053,31 @@ msgstr "" msgid "No such file or no permission to read" msgstr "" -#: pisi/fetcher.py:183 +#: pisi/fetcher.py:182 msgid "Requested range not satisfiable, starting again." msgstr "" -#: pisi/fetcher.py:190 +#: pisi/fetcher.py:189 msgid "Cannot fetch %s; value error: %s" msgstr "" -#: pisi/fetcher.py:192 pisi/fetcher.py:196 +#: pisi/fetcher.py:191 pisi/fetcher.py:195 msgid "Cannot fetch %s; %s" msgstr "" -#: pisi/fetcher.py:194 +#: pisi/fetcher.py:193 msgid "Please check your network connections and try again. (%s)" msgstr "" -#: pisi/fetcher.py:198 +#: pisi/fetcher.py:197 msgid "Cannot fetch %s; (%s): %s" msgstr "" -#: pisi/fetcher.py:244 +#: pisi/fetcher.py:243 msgid "Proxy configuration has been found for '%s' protocol" msgstr "" -#: pisi/fetcher.py:328 pisi/fetcher.py:349 pisi/fetcher.py:362 +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 msgid "ftp error" msgstr "" @@ -2085,54 +2125,54 @@ msgstr "" msgid "Encountered cycle %s" msgstr "" -#: pisi/index.py:96 +#: pisi/index.py:100 msgid "Adding %s to component index" msgstr "" -#: pisi/index.py:108 +#: pisi/index.py:112 msgid "Adding %s to package index" msgstr "" -#: pisi/index.py:122 +#: pisi/index.py:126 msgid "Updating package database of %s" msgstr "" -#: pisi/index.py:150 +#: pisi/index.py:154 msgid "Package %s: metadata corrupt, skipping..." msgstr "" -#: pisi/index.py:178 +#: pisi/index.py:193 msgid "Adding %s to source index" msgstr "" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed" msgstr "" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed-pending" msgstr "" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "purged" msgstr "" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "removed" msgstr "" -#: pisi/installdb.py:62 +#: pisi/installdb.py:59 msgid "" "State: %s\n" "Version: %s, Release: %s, Build: %s\n" msgstr "" -#: pisi/installdb.py:67 +#: pisi/installdb.py:64 msgid "" "Distribution: %s, Install Time: %s\n" msgstr "" -#: pisi/installdb.py:154 +#: pisi/installdb.py:151 msgid "Already installed" msgstr "" @@ -2148,48 +2188,48 @@ msgstr "" msgid "Key %s in repo %s not found" msgstr "" -#: pisi/lockeddbshelve.py:47 +#: pisi/lockeddbshelve.py:46 msgid "Database version for %s insufficient. Please run rebuild-db command." msgstr "" -#: pisi/lockeddbshelve.py:51 +#: pisi/lockeddbshelve.py:50 msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" -#: pisi/lockeddbshelve.py:62 +#: pisi/lockeddbshelve.py:61 msgid "Cannot attain write access to database environment" msgstr "" -#: pisi/lockeddbshelve.py:64 +#: pisi/lockeddbshelve.py:63 msgid "Database version %s not present." msgstr "" -#: pisi/lockeddbshelve.py:71 pisi/lockeddbshelve.py:153 +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 msgid "Another instance of PiSi is running. Only one instance is allowed to modify the PiSi database at a time." msgstr "" -#: pisi/lockeddbshelve.py:81 +#: pisi/lockeddbshelve.py:80 msgid "Cannot attain read access to database environment" msgstr "" -#: pisi/lockeddbshelve.py:95 +#: pisi/lockeddbshelve.py:94 msgid "Cannot attain write access to PiSi database. You have to be root for this operation." msgstr "" -#: pisi/lockeddbshelve.py:113 +#: pisi/lockeddbshelve.py:112 msgid "Cannot attain read or write access to database %s" msgstr "" -#: pisi/lockeddbshelve.py:139 +#: pisi/lockeddbshelve.py:138 msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" -#: pisi/metadata.py:58 +#: pisi/metadata.py:74 msgid "" "Distribution: %s, Dist. Release: %s\n" msgstr "" -#: pisi/metadata.py:60 +#: pisi/metadata.py:76 msgid "Architecture: %s, Installed Size: %s" msgstr "" @@ -2197,164 +2237,164 @@ msgstr "" msgid "Mirrors file %s does not exist. Could not resolve mirrors://" msgstr "" -#: pisi/operations.py:114 +#: pisi/operations.py:107 msgid "Mixing file names and package names not supported yet." msgstr "" -#: pisi/operations.py:156 +#: pisi/operations.py:149 msgid "" "The following packages will be installed\n" "in the respective order to satisfy extra dependencies:\n" msgstr "" -#: pisi/operations.py:159 pisi/operations.py:621 +#: pisi/operations.py:152 pisi/operations.py:615 msgid "Do you want to continue?" msgstr "" -#: pisi/operations.py:160 +#: pisi/operations.py:153 msgid "External dependencies not satisfied" msgstr "" -#: pisi/operations.py:172 pisi/operations.py:339 +#: pisi/operations.py:165 pisi/operations.py:332 msgid "No packages to install." msgstr "" -#: pisi/operations.py:203 +#: pisi/operations.py:196 msgid "Installation order: " msgstr "" -#: pisi/operations.py:257 pisi/operations.py:279 +#: pisi/operations.py:250 pisi/operations.py:272 msgid "Conflicts remain" msgstr "" -#: pisi/operations.py:267 +#: pisi/operations.py:260 msgid "Selected packages [%s] are in conflict with each other." msgstr "" -#: pisi/operations.py:273 +#: pisi/operations.py:266 msgid "" "[%s conflicts with: %s]\n" msgstr "" -#: pisi/operations.py:275 +#: pisi/operations.py:268 msgid "" "The following packages have conflicts:\n" "%s" msgstr "" -#: pisi/operations.py:278 +#: pisi/operations.py:271 msgid "Remove the following conflicting packages?" msgstr "" -#: pisi/operations.py:305 +#: pisi/operations.py:298 msgid "Safety switch: Following packages in system.base will be installed: " msgstr "" -#: pisi/operations.py:311 +#: pisi/operations.py:304 msgid "Safety switch: Following packages in system.base will be upgraded: " msgstr "" -#: pisi/operations.py:317 pisi/operations.py:597 +#: pisi/operations.py:310 pisi/operations.py:591 msgid "Safety switch: the component system.base cannot be found" msgstr "" -#: pisi/operations.py:334 +#: pisi/operations.py:327 msgid "" "The following package(s) are already installed and are not going to be installed again:\n" msgstr "" -#: pisi/operations.py:355 +#: pisi/operations.py:348 msgid "" "Following packages will be installed in the respective order to satisfy dependencies:\n" msgstr "" -#: pisi/operations.py:360 pisi/operations.py:491 +#: pisi/operations.py:353 pisi/operations.py:485 msgid "Total size of package(s): %.2f %s" msgstr "" -#: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 msgid "There are extra packages due to dependencies. Do you want to continue?" msgstr "" -#: pisi/operations.py:432 +#: pisi/operations.py:425 msgid "Warning: package *name* ends with '.pisi'" msgstr "" -#: pisi/operations.py:435 +#: pisi/operations.py:428 msgid "Package %s is not installed." msgstr "" -#: pisi/operations.py:441 +#: pisi/operations.py:434 msgid "Package %s is not available in repositories." msgstr "" -#: pisi/operations.py:453 +#: pisi/operations.py:447 msgid "Package %s is already at the latest release %s." msgstr "" -#: pisi/operations.py:459 +#: pisi/operations.py:453 msgid "Package %s is already at the latest build %s." msgstr "" -#: pisi/operations.py:486 +#: pisi/operations.py:480 msgid "The following packages will be upgraded: " msgstr "" -#: pisi/operations.py:552 +#: pisi/operations.py:546 msgid "Dependency %s of %s cannot be satisfied" msgstr "" -#: pisi/operations.py:553 +#: pisi/operations.py:547 msgid "Upgrade is not possible." msgstr "" -#: pisi/operations.py:568 +#: pisi/operations.py:562 msgid "Reverse dependency %s of %s cannot be satisfied" msgstr "" -#: pisi/operations.py:593 +#: pisi/operations.py:587 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "" -#: pisi/operations.py:604 +#: pisi/operations.py:598 msgid "Package %s does not exist. Cannot remove." msgstr "" -#: pisi/operations.py:608 +#: pisi/operations.py:602 msgid "No packages to remove." msgstr "" -#: pisi/operations.py:617 +#: pisi/operations.py:611 msgid "" "The following minimal list of packages will be removed\n" "in the respective order to satisfy dependencies:\n" msgstr "" -#: pisi/operations.py:622 +#: pisi/operations.py:616 msgid "Package removal declined" msgstr "" -#: pisi/operations.py:634 +#: pisi/operations.py:628 msgid "Package %s is not installed. Cannot remove." msgstr "" -#: pisi/operations.py:683 +#: pisi/operations.py:677 msgid "No packages to emerge." msgstr "" -#: pisi/operations.py:698 +#: pisi/operations.py:692 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" msgstr "" -#: pisi/operations.py:701 +#: pisi/operations.py:695 msgid "" "The following minimal list of packages will be built and\n" "installed in the respective order to satisfy dependencies:\n" msgstr "" -#: pisi/operations.py:743 +#: pisi/operations.py:737 msgid "Cannot find source package: %s" msgstr "" @@ -2364,92 +2404,92 @@ msgid "" "The package may have been upgraded. Please try to upgrade the package." msgstr "" -#: pisi/package.py:60 pisi/sourcearchive.py:94 +#: pisi/package.py:60 pisi/sourcearchive.py:92 msgid "%s [cached]" msgstr "" -#: pisi/package.py:131 +#: pisi/package.py:136 msgid "MetaData format wrong" msgstr "" -#: pisi/packagedb.py:66 +#: pisi/packagedb.py:65 msgid "Package %s not found" msgstr "" -#: pisi/pxml/autoxml.py:77 +#: pisi/pxml/autoxml.py:79 msgid "At least one '%s' tag should have local text" msgstr "" -#: pisi/pxml/autoxml.py:84 +#: pisi/pxml/autoxml.py:86 msgid "'%s' language of tag '%s' is empty" msgstr "" -#: pisi/pxml/autoxml.py:112 +#: pisi/pxml/autoxml.py:114 msgid "LocalText: unable to get either current or default locale" msgstr "" -#: pisi/pxml/autoxml.py:118 pisi/pxml/autoxml.py:133 +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 msgid "Tag should have at least the current locale, or failing that an English or Turkish version" msgstr "" -#: pisi/pxml/autoxml.py:374 +#: pisi/pxml/autoxml.py:372 msgid "autoxml.check: '%s' errors" msgstr "" -#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 msgid "autoxml.parse: String '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 msgid "autoxml.read: File '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:467 +#: pisi/pxml/autoxml.py:465 msgid "autoxml.write: object validation has failed" msgstr "" -#: pisi/pxml/autoxml.py:475 +#: pisi/pxml/autoxml.py:473 msgid "autoxml.write: File encoding '%s' has errors" msgstr "" -#: pisi/pxml/autoxml.py:525 +#: pisi/pxml/autoxml.py:523 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "" -#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 msgid "Mandatory variable %s not available" msgstr "" -#: pisi/pxml/autoxml.py:654 +#: pisi/pxml/autoxml.py:652 msgid "Type mismatch: read text cannot be decoded" msgstr "" -#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 msgid "Mandatory token %s not available" msgstr "" -#: pisi/pxml/autoxml.py:672 +#: pisi/pxml/autoxml.py:670 msgid "Type mismatch. Expected %s, got %s" msgstr "" -#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 msgid "Type mismatch: DOM cannot be decoded" msgstr "" -#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 -#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 msgid "Mandatory argument not available" msgstr "" -#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 msgid "Object cannot be encoded" msgstr "" -#: pisi/pxml/autoxml.py:743 +#: pisi/pxml/autoxml.py:741 msgid "List type must contain only one element" msgstr "" -#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "" @@ -2457,23 +2497,23 @@ msgstr "" msgid "getNodeText: Expected text node, got something else!" msgstr "" -#: pisi/pxml/xmlfile.py:64 +#: pisi/pxml/xmlfile.py:63 msgid "String '%s' has invalid XML" msgstr "" -#: pisi/pxml/xmlfile.py:72 pisi/pxml/xmlfile.py:87 +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 msgid "File '%s' has invalid XML" msgstr "" -#: pisi/repodb.py:74 +#: pisi/repodb.py:73 msgid "No repository named %s exists" msgstr "" -#: pisi/repodb.py:83 +#: pisi/repodb.py:82 msgid "Repository %s already exists" msgstr "" -#: pisi/repodb.py:90 +#: pisi/repodb.py:89 msgid "Cannot add repository at position %s" msgstr "" @@ -2489,23 +2529,23 @@ msgstr "" msgid "Repo does not have package named %s." msgstr "" -#: pisi/sourcearchive.py:63 +#: pisi/sourcearchive.py:61 msgid "Trying fallback address: %s" msgstr "" -#: pisi/sourcearchive.py:74 +#: pisi/sourcearchive.py:72 msgid "%s mirrors are not defined." msgstr "" -#: pisi/sourcearchive.py:79 +#: pisi/sourcearchive.py:77 msgid "Fetching source from mirror: %s" msgstr "" -#: pisi/sourcearchive.py:85 +#: pisi/sourcearchive.py:83 msgid "Could not fetch source from %s mirrors." msgstr "" -#: pisi/sourcearchive.py:103 +#: pisi/sourcearchive.py:101 msgid "unpack: check_file_hash failed" msgstr "" @@ -2513,35 +2553,35 @@ msgstr "" msgid "Source package %s not found" msgstr "" -#: pisi/specfile.py:141 +#: pisi/specfile.py:140 msgid "URI: %s, type: %s, sha1sum: %s" msgstr "" -#: pisi/specfile.py:208 +#: pisi/specfile.py:207 msgid "" "Name: %s, version: %s, release: %s, build %s\n" msgstr "" -#: pisi/specfile.py:210 +#: pisi/specfile.py:209 msgid "" "Summary: %s\n" msgstr "" -#: pisi/specfile.py:211 +#: pisi/specfile.py:210 msgid "" "Description: %s\n" msgstr "" -#: pisi/specfile.py:212 +#: pisi/specfile.py:211 msgid "" "Component: %s\n" msgstr "" -#: pisi/specfile.py:213 +#: pisi/specfile.py:212 msgid "Provides: " msgstr "" -#: pisi/specfile.py:217 +#: pisi/specfile.py:216 msgid "Dependencies: " msgstr "" @@ -2557,43 +2597,43 @@ msgstr "" msgid "return value for \"%s\" is %s" msgstr "" -#: pisi/util.py:364 +#: pisi/util.py:361 msgid "Including external link '%s'" msgstr "" -#: pisi/util.py:366 +#: pisi/util.py:363 msgid "Including directory '%s'" msgstr "" -#: pisi/util.py:440 +#: pisi/util.py:448 msgid "I/O Error: Cannot calculate SHA1 hash of %s" msgstr "" -#: pisi/util.py:451 +#: pisi/util.py:459 msgid "Cannot calculate SHA1 hash of given data" msgstr "" -#: pisi/util.py:488 +#: pisi/util.py:498 msgid "ERROR: patch (%s) failed" msgstr "" -#: pisi/util.py:490 +#: pisi/util.py:500 msgid "ERROR: patch (%s) failed: %s" msgstr "" -#: pisi/util.py:536 +#: pisi/util.py:546 msgid "strip command failed for file '%s'!" msgstr "" -#: pisi/util.py:543 +#: pisi/util.py:553 msgid "objcopy (keep-debug) command failed for file '%s'!" msgstr "" -#: pisi/util.py:549 +#: pisi/util.py:559 msgid "objcopy (add-debuglink) command failed for file '%s'!" msgstr "" -#: pisi/util.py:610 +#: pisi/util.py:620 msgid "Updating environment..." msgstr "" diff --git a/po/tr.po b/po/tr.po index ef205acb..5b40742d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: tr\n" -"POT-Creation-Date: 2007-03-02 16:01+EET\n" -"PO-Revision-Date: 2007-03-02 16:04+0200\n" +"POT-Creation-Date: 2007-05-13 23:01+EEST\n" +"PO-Revision-Date: 2007-05-13 23:10+0300\n" "Last-Translator: Faik Uygur \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgid "" " " msgstr "" -#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:50 +#: /usr/lib/python2.4/optparse.py:298 pisi/cli/commands.py:48 msgid "Return a comma-separated list of option strings & metavariables." msgstr "" @@ -75,7 +75,7 @@ msgid "" " " msgstr "" -#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:44 +#: /usr/lib/python2.4/optparse.py:329 pisi/cli/commands.py:42 msgid "usage: %s\n" msgstr "kullanımı: %s\n" @@ -419,13 +419,13 @@ msgstr "autoheader çalıştırılamadı." # pisi/actionsapi/autotools.py:77 :87 #: pisi/actionsapi/cmaketools.py:64 msgid "No configure script found for cmake." -msgstr "cmake yapılandırma betiği bulunamadı." +msgstr "cmake için yapılandırma betiği bulunamadı." -#: pisi/actionsapi/get.py:163 +#: pisi/actionsapi/get.py:160 msgid "Util %s cannot be found" msgstr "Araç %s bulunamıyor" -#: pisi/actionsapi/get.py:165 +#: pisi/actionsapi/get.py:162 msgid "Warning: %s does not exist, using plain name %s" msgstr "Uyarı: %s yok, düz ad %s kullanılıyor" @@ -560,11 +560,11 @@ msgstr "ActionsAPI [copytree]: %s dizini bulunamadı." msgid "ActionsAPI [touch]: Permission denied: %s" msgstr "ActionsAPI [touch]: Erişim engellendi: %s" -#: pisi/api.py:299 pisi/comariface.py:30 +#: pisi/api.py:297 pisi/comariface.py:30 msgid "comar package is not fully installed" msgstr "comar paketi tam olarak kurulmamış" -#: pisi/api.py:311 +#: pisi/api.py:309 msgid "File %s not found" msgstr "Dosya %s bulunamadı." @@ -580,7 +580,7 @@ msgstr "" "\n" "Bozuk dosya: %s" -#: pisi/api.py:370 pisi/cli/commands.py:967 +#: pisi/api.py:370 pisi/cli/commands.py:1044 msgid "OK" msgstr "Tamam" @@ -652,31 +652,31 @@ msgstr "" msgid "Archive type not recognized" msgstr "Arşiv tipi tanınmadı" -#: pisi/atomicoperations.py:66 +#: pisi/atomicoperations.py:67 msgid "Package %s found in repository %s" msgstr "Paket %s, %s deposunda bulundu" -#: pisi/atomicoperations.py:78 +#: pisi/atomicoperations.py:90 msgid "Package URI: %s" msgstr "Paket adresi: %s" -#: pisi/atomicoperations.py:82 +#: pisi/atomicoperations.py:94 msgid "Package %s not found in any active repository." msgstr "%s isimli paket hiç bir etkin depoda bulunamadı." -#: pisi/atomicoperations.py:101 +#: pisi/atomicoperations.py:113 msgid "Installing %s, version %s, release %s, build %s" msgstr "%s paketi, versiyon %s, sürüm %s, inşa %s kuruluyor" -#: pisi/atomicoperations.py:146 +#: pisi/atomicoperations.py:158 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "%s paketi bağımlılıkları sağlanmadan kurulamaz" -#: pisi/atomicoperations.py:165 +#: pisi/atomicoperations.py:177 msgid "/%s from %s package\n" msgstr "/%s %s paketinden\n" -#: pisi/atomicoperations.py:166 +#: pisi/atomicoperations.py:178 msgid "" "File conflicts:\n" "%s" @@ -684,112 +684,112 @@ msgstr "" "Dosya çakışmaları:\n" "%s" -#: pisi/atomicoperations.py:201 +#: pisi/atomicoperations.py:213 msgid "Re-install same version package?" msgstr "Aynı versiyona sahip paketi yeniden yerleştireyim mi?" -#: pisi/atomicoperations.py:202 +#: pisi/atomicoperations.py:214 msgid "Package re-install declined" msgstr "Paketi yeniden yerleştirmeye izin verilmedi" -#: pisi/atomicoperations.py:208 +#: pisi/atomicoperations.py:220 msgid "Upgrading to new upstream version" msgstr "Yeni orijinal versiyona yükseltiliyor" -#: pisi/atomicoperations.py:211 +#: pisi/atomicoperations.py:223 msgid "Upgrading to new distribution release" msgstr "Yeni dağıtım sürümüne yükseltiliyor" -#: pisi/atomicoperations.py:215 +#: pisi/atomicoperations.py:227 msgid "Upgrading to new distribution build" msgstr "Yeni dağıtım inşasına yükseltiliyor" -#: pisi/atomicoperations.py:225 +#: pisi/atomicoperations.py:237 msgid "Downgrade to old distribution release?" msgstr "Eski dağıtım sürümüne dönülsün mü?" -#: pisi/atomicoperations.py:227 +#: pisi/atomicoperations.py:239 msgid "Downgrade to old distribution build?" msgstr "Eski dağıtım inşasına dönülsün mü?" -#: pisi/atomicoperations.py:229 +#: pisi/atomicoperations.py:241 msgid "Package downgrade declined" msgstr "Paket eskileştirilmesine izin verilmedi" # pisi/actionsapi/autotools.py:75 :85 -#: pisi/atomicoperations.py:253 +#: pisi/atomicoperations.py:265 msgid "%s configuration failed." msgstr "%s yapılandırması başarısızlığa uğradı." -#: pisi/atomicoperations.py:340 +#: pisi/atomicoperations.py:388 msgid "Storing %s, " msgstr "%s saklanıyor, " -#: pisi/atomicoperations.py:343 +#: pisi/atomicoperations.py:391 msgid "Storing %s." msgstr "%s saklanıyor." -#: pisi/atomicoperations.py:350 +#: pisi/atomicoperations.py:398 msgid "Storing %s" msgstr "%s saklanıyor" -#: pisi/atomicoperations.py:406 +#: pisi/atomicoperations.py:454 msgid "File list could not be read for package %s, continuing removal." msgstr "%s paketi için dosya listesi okunamadı, kaldırma işlemine devam ediliyor. " -#: pisi/atomicoperations.py:412 +#: pisi/atomicoperations.py:460 msgid "Removing package %s" msgstr "%s paketi kaldırılıyor" -#: pisi/atomicoperations.py:415 +#: pisi/atomicoperations.py:463 msgid "Trying to remove nonexistent package " msgstr "Varolmayan paket kaldırılmaya çalışıldı" -#: pisi/atomicoperations.py:454 +#: pisi/atomicoperations.py:502 msgid "Not removing conflicted file : %s" msgstr "Çakışan dosya silinmiyor : %s" -#: pisi/atomicoperations.py:474 +#: pisi/atomicoperations.py:522 msgid "Installed file %s is not exists on system [Probably you manually deleted]" msgstr "Kurulmuş dosya %s sistemde bulunmuyor [Muhtemelen el ile silindi]" -#: pisi/atomicoperations.py:535 +#: pisi/atomicoperations.py:581 msgid "Metadata XML '%s' cannot be found" msgstr "'%s' isimli metadata XML bulunamıyor" -#: pisi/atomicoperations.py:543 +#: pisi/atomicoperations.py:589 msgid "MetaData format wrong (%s)" msgstr "MetaData biçimi yanlış (%s)" -#: pisi/atomicoperations.py:545 +#: pisi/atomicoperations.py:591 msgid "* Adding '%s' to db... " msgstr "* '%s' veritabanına ekleniyor... " -#: pisi/atomicoperations.py:551 +#: pisi/atomicoperations.py:597 msgid "Files XML '%s' cannot be found" msgstr "Files XML '%s' bulunamıyor" -#: pisi/atomicoperations.py:556 pisi/package.py:136 +#: pisi/atomicoperations.py:602 pisi/package.py:141 msgid "Invalid %s" msgstr "Geçersiz %s" -#: pisi/atomicoperations.py:565 +#: pisi/atomicoperations.py:611 msgid "OK." msgstr "Tamam." -#: pisi/build.py:88 +#: pisi/build.py:86 msgid "Path %s belongs in multiple packages" msgstr "Yol %s birden çok pakete ait" -#: pisi/build.py:114 +#: pisi/build.py:112 msgid "Source URI: %s" msgstr "Kaynak adresi: %s" -#: pisi/build.py:118 +#: pisi/build.py:116 msgid "Source %s not found in any active repository." msgstr "%s isimli kaynak paket hiç bir etkin depoda bulunamadı." -#: pisi/build.py:183 +#: pisi/build.py:181 msgid "Building PiSi source package: %s" msgstr "PiSi kaynak paketi %s inşa ediliyor" @@ -838,121 +838,125 @@ msgid "Building source..." msgstr "Kaynak inşa ediliyor..." #: pisi/build.py:328 +msgid "Testing package..." +msgstr "Paket test ediliyor..." + +#: pisi/build.py:332 msgid "Installing..." msgstr "Kuruluyor..." -#: pisi/build.py:370 +#: pisi/build.py:374 msgid "Unable to read Actions Script (%s): %s" msgstr "Action betiği okunamıyor (%s): %s" -#: pisi/build.py:372 +#: pisi/build.py:376 msgid "SyntaxError in Actions Script (%s): %s" msgstr "Action betiğinde sözdizimi hatası (%s): %s" -#: pisi/build.py:389 +#: pisi/build.py:393 msgid "Unable to read COMAR script (%s): %s" msgstr "Action betiği okunamıyor (%s): %s" -#: pisi/build.py:391 +#: pisi/build.py:395 msgid "SyntaxError in COMAR file (%s): %s" msgstr "Action betiğinde sözdizimi hatası (%s): %s" -#: pisi/build.py:417 +#: pisi/build.py:421 msgid "unable to call function from actions: %s" msgstr "fonksiyon eylemlerden çağırılamıyor: %s" -#: pisi/build.py:433 +#: pisi/build.py:437 msgid "Safety switch: following extra packages in system.devel will be installed: " msgstr "" "Emniyet mandalı: taban geliştirme sistemi system.devel içindeki bu paketler " "ek olarak kurulacak:" -#: pisi/build.py:438 +#: pisi/build.py:442 msgid "Safety switch: system.devel is already installed" msgstr "Emniyet mandalı: taban geliştirme sistemi system.devel halihazırda kurulu" -#: pisi/build.py:440 +#: pisi/build.py:444 msgid "Safety switch: the component system.devel cannot be found" msgstr "Emniyet mandalı: geliştirme sistemi bileşeni system.devel bulunamadı" -#: pisi/build.py:449 +#: pisi/build.py:453 msgid "Unsatisfied Build Dependencies:" msgstr "Sağlanmamış inşa bağımlılıkları" -#: pisi/build.py:453 +#: pisi/build.py:457 msgid "Cannot build package due to unsatisfied build dependencies" msgstr "Sağlanmamış inşa bağımlılıkları yüzünden paket inşa edilemiyor" -#: pisi/build.py:461 +#: pisi/build.py:465 msgid "Build dependency %s cannot be satisfied" msgstr "İnşa bağımlılığı %s sağlanamadı" -#: pisi/build.py:463 +#: pisi/build.py:467 msgid "Do you want to install the unsatisfied build dependencies" msgstr "Sağlanmamış inşa bağımlılıklarını kurmak istiyor musunuz? " -#: pisi/build.py:464 +#: pisi/build.py:468 msgid "Installing build dependencies." msgstr "İnşa bağımlılıkları kuruluyor. " -#: pisi/build.py:469 +#: pisi/build.py:473 msgid "Ignoring build dependencies." msgstr "İnşa bağımlılıkları yoksayılıyor." -#: pisi/build.py:479 +#: pisi/build.py:483 msgid "Patch file is missing: %s\n" msgstr "Yama dosyası eksik: %s\n" -#: pisi/build.py:492 +#: pisi/build.py:496 msgid "* Applying patch: %s" msgstr "* Yama uygulanıyor: %s" -#: pisi/build.py:550 +#: pisi/build.py:554 msgid "Stripping files.." msgstr "Semboller çıkarılıyor.." -#: pisi/build.py:656 +#: pisi/build.py:654 msgid "(found old version %s)" msgstr "(%s numaralı eski versiyon bulundu)" -#: pisi/build.py:658 +#: pisi/build.py:656 msgid "Skipping %s with wrong pkg name " msgstr "Yanlış paket adına sahip %s atlanıyor" -#: pisi/build.py:679 +#: pisi/build.py:677 msgid "(no previous build found, setting build no to 1.)" msgstr "(önceki bir inşa bulunamadı, inşa numarası 1 yapılıyor)" -#: pisi/build.py:724 +#: pisi/build.py:722 msgid "(old package lacks a build no, setting build no to 1.)" msgstr "(önceki paketin bir inşa numarası yok, inşa numarası 1 yapılıyor)" -#: pisi/build.py:727 +#: pisi/build.py:725 msgid "There are changes, incrementing build no to %d" msgstr "Değişiklikler var, inşa numarası bir arttırılarak %d yapıldı." -#: pisi/build.py:730 +#: pisi/build.py:728 msgid "There is no change from previous build %d" msgstr "Bir önceki %d numaralı inşadan beri bir değişiklik yok." -#: pisi/build.py:795 +#: pisi/build.py:793 msgid "No user named '%s' found on the system" msgstr "Sistemde '%s' isminde bir kullanıcı bulunamadı" -#: pisi/build.py:800 +#: pisi/build.py:798 msgid "No group named '%s' found on the system" msgstr "Sistemde '%s' isminde bir grup bulunamadı" -#: pisi/build.py:803 +#: pisi/build.py:801 msgid "** Building package %s" msgstr "** Paket %s inşa ediliyor" # pisi/build.py:503 :506 -#: pisi/build.py:805 pisi/build.py:808 +#: pisi/build.py:803 pisi/build.py:806 msgid "Generating %s," msgstr "%s yaratılıyor," -#: pisi/build.py:814 +#: pisi/build.py:812 msgid "" "Build number is not available. For repo builds you must enable buildno in " "pisi.conf." @@ -960,149 +964,149 @@ msgstr "" "İnşa (build) sayısı koyulmayacak. Depo inşaları için buildno seçeneğini pisi." "conf dosyasında etkinleştirmelisiniz." -#: pisi/build.py:832 +#: pisi/build.py:830 msgid "Creating PiSi package %s." msgstr "%s adlı PiSi paketi yaratılıyor." -#: pisi/build.py:877 +#: pisi/build.py:875 pisi/delta.py:93 msgid "Done." msgstr "Bitti." -#: pisi/build.py:883 +#: pisi/build.py:881 msgid "Abandoned files under the install dir (%s):" msgstr "kurulum dizini (%s) altındaki terkedilmiş dosyalar:" -#: pisi/build.py:887 +#: pisi/build.py:885 msgid "All of the files under the install dir (%s) has been collected by package(s)" msgstr "" "Kurulum dizini (%s) altındaki bütün dosyalar paket(ler) tarafından " "toplanmıştır" -#: pisi/build.py:891 +#: pisi/build.py:889 msgid "Cleaning Build Directory..." msgstr "İnşa dizini siliniyor..." -#: pisi/build.py:894 +#: pisi/build.py:892 msgid "Keeping Build Directory" msgstr "İnşa dizini bırakılıyor" -#: pisi/cli/__init__.py:79 +#: pisi/cli/__init__.py:76 msgid "Warning: " msgstr "Uyarı: " -#: pisi/cli/__init__.py:88 +#: pisi/cli/__init__.py:85 msgid "Error: " msgstr "Hata: " -#: pisi/cli/__init__.py:120 +#: pisi/cli/__init__.py:117 msgid " (yes/no)" msgstr " (evet/hayır)" -#: pisi/cli/__init__.py:141 +#: pisi/cli/__init__.py:138 msgid " [complete]\n" msgstr " [bitti]\n" -#: pisi/cli/__init__.py:151 +#: pisi/cli/__init__.py:148 msgid "Installed %s" msgstr "%s paketi kuruldu" -#: pisi/cli/__init__.py:153 +#: pisi/cli/__init__.py:150 msgid "Removed %s" msgstr "%s paketi kaldırıldı" -#: pisi/cli/__init__.py:155 +#: pisi/cli/__init__.py:152 msgid "Upgraded %s" msgstr "%s paketi yükseltildi" # pisi/actionsapi/autotools.py:75 :85 -#: pisi/cli/__init__.py:157 +#: pisi/cli/__init__.py:154 msgid "Configured %s" msgstr "%s paketi yapılandırıldı" -#: pisi/cli/__init__.py:159 +#: pisi/cli/__init__.py:156 msgid "Extracting the files of %s" msgstr "%s paketinin dosyaları arşivden çıkartılıyor" -#: pisi/cli/commands.py:94 +#: pisi/cli/commands.py:92 msgid "generic help string for any command" msgstr "herhangi bir komut yardımı için yer tutucu" -#: pisi/cli/commands.py:123 pisi/cli/pisicli.py:104 +#: pisi/cli/commands.py:121 pisi/cli/pisicli.py:104 msgid "Unrecognized command: %s" msgstr "Tanınmayan komut: %s" -#: pisi/cli/commands.py:145 +#: pisi/cli/commands.py:143 msgid "common options" msgstr "ortak seçenekler" # pisi/build.py:503 :506 -#: pisi/cli/commands.py:148 +#: pisi/cli/commands.py:146 msgid "general options" msgstr "genel seçenekler" -#: pisi/cli/commands.py:151 +#: pisi/cli/commands.py:149 msgid "Change the system root for PiSi commands" msgstr "Pisi komutları için sistem kök dizinini değiştir" -#: pisi/cli/commands.py:153 +#: pisi/cli/commands.py:151 msgid "Assume yes in all yes/no queries" msgstr "Bütün evet/hayır sorularında evet varsay" -#: pisi/cli/commands.py:158 +#: pisi/cli/commands.py:156 msgid "Detailed output" msgstr "Detaylı çıktı" -#: pisi/cli/commands.py:160 +#: pisi/cli/commands.py:158 msgid "Show debugging information" msgstr "Hata ayıklama bilgisini göster" -#: pisi/cli/commands.py:162 +#: pisi/cli/commands.py:160 msgid "Suppresses all coloring of PiSi's output" msgstr "PiSi'nin tüm çıktı renklendirmelerini önler" -#: pisi/cli/commands.py:169 +#: pisi/cli/commands.py:167 msgid "" "This is a fall back function. If the implementer module provides an\n" " options function it will be called" msgstr "" -#: pisi/cli/commands.py:181 +#: pisi/cli/commands.py:179 msgid "Destination directory %s does not exist. Creating directory.\n" msgstr "%s isimli hedef dizini bulunamadı. Dizin yaratılıyor.\n" -#: pisi/cli/commands.py:203 +#: pisi/cli/commands.py:201 msgid "Password: " msgstr "Parola: " -#: pisi/cli/commands.py:209 +#: pisi/cli/commands.py:207 msgid "initialize PiSi components" msgstr "PiSi bileşenlerini hazırla" -#: pisi/cli/commands.py:217 +#: pisi/cli/commands.py:215 msgid "do cleanup work for PiSi components" msgstr "" -#: pisi/cli/commands.py:231 +#: pisi/cli/commands.py:229 msgid "print help for the command" msgstr "komut için yardım yaz" -#: pisi/cli/commands.py:237 +#: pisi/cli/commands.py:235 msgid "exit program" msgstr "programdan çık" -#: pisi/cli/commands.py:239 +#: pisi/cli/commands.py:237 msgid "Command terminated abnormally." msgstr "Komut anormal biçimde sonlandı." -#: pisi/cli/commands.py:249 +#: pisi/cli/commands.py:247 msgid "Command lacks name" msgstr "Komut adı eksik" -#: pisi/cli/commands.py:253 +#: pisi/cli/commands.py:251 msgid "Duplicate command %s" msgstr "Aynı adlı komut: %s" -#: pisi/cli/commands.py:262 +#: pisi/cli/commands.py:260 msgid "" "Prints help for given commands\n" "\n" @@ -1116,7 +1120,7 @@ msgstr "" "\n" "Eğer parametre verilmezse genel yardımı yazar." -#: pisi/cli/commands.py:296 +#: pisi/cli/commands.py:294 msgid "" "Clean stale locks\n" "\n" @@ -1132,7 +1136,7 @@ msgstr "" "PiSi veritabanı erişimini yönetmek için dosyasistemi kilitlerini kullanır.\n" "Bu komut veritabanı dizinindeki kullanılmayan kilitleri siler." -#: pisi/cli/commands.py:315 +#: pisi/cli/commands.py:313 msgid "" "Delete cache files\n" "\n" @@ -1149,7 +1153,7 @@ msgstr "" "Kaynaklar, paketler ve geçici dosyalar /var dizini altında \n" "saklanır. Bunlar biriktiğinden çok disk alanı kaplayabilirler." -#: pisi/cli/commands.py:336 +#: pisi/cli/commands.py:334 msgid "" "Graph package relations\n" "\n" @@ -1168,47 +1172,47 @@ msgstr "" "Öntanımlı olarak depo paketlerdeki paket ilişkilerini gösterir\n" "ve paketi graphviz biçiminde 'pgraph.dot' dosyasına yazar.\n" -#: pisi/cli/commands.py:353 +#: pisi/cli/commands.py:351 msgid "graph options" msgstr "graph seçenekleri" -#: pisi/cli/commands.py:357 +#: pisi/cli/commands.py:355 msgid "Specify a particular repository" msgstr "Belli bir depoyu belirt" -#: pisi/cli/commands.py:360 +#: pisi/cli/commands.py:358 msgid "Graph of installed packages" msgstr "Kurulu paketlerin çizgesi" -#: pisi/cli/commands.py:363 +#: pisi/cli/commands.py:361 msgid "Do not show installed packages" msgstr "Kurulu paketleri gösterme" -#: pisi/cli/commands.py:366 +#: pisi/cli/commands.py:364 msgid "Dot output file" msgstr "Dot çıktı dosyası" -#: pisi/cli/commands.py:377 +#: pisi/cli/commands.py:375 msgid "Plotting packages in repository %s" msgstr "%s deposundaki paketler çiziliyor" -#: pisi/cli/commands.py:383 +#: pisi/cli/commands.py:381 msgid "Plotting a graph of relations among all repository packages" msgstr "Depolardaki bütün paketlerin arasındaki ilişkiler çiziliyor" -#: pisi/cli/commands.py:390 +#: pisi/cli/commands.py:388 msgid "Plotting a graph of relations among all installed packages" msgstr "Bütün kurulu paketler arasındaki ilişkiler çiziliyor" -#: pisi/cli/commands.py:402 +#: pisi/cli/commands.py:400 msgid "Do not take build no into account." msgstr "İnşa numarasını dikkate alma" -#: pisi/cli/commands.py:407 +#: pisi/cli/commands.py:405 msgid "Do not take dependency information into account" msgstr "Bağımlılık bilgilerini dikkate alma" -#: pisi/cli/commands.py:411 +#: pisi/cli/commands.py:409 msgid "" "Build PiSi packages\n" "\n" @@ -1230,22 +1234,26 @@ msgstr "" "Yahut, kaynaklar içeren bir depodan indirilmesi için \n" "kaynak paketinin adını verebilirsiniz. \n" -#: pisi/cli/commands.py:434 +#: pisi/cli/commands.py:432 msgid "build options" msgstr "inşa seçenekleri" -#: pisi/cli/commands.py:442 +#: pisi/cli/commands.py:440 pisi/cli/commands.py:523 msgid "Output directory for produced packages" msgstr "Üretilecek paketler için çıktı dizini" -#: pisi/cli/commands.py:445 +#: pisi/cli/commands.py:443 msgid "Bypass errors from ActionsAPI" msgstr "ActionsAPI kaynaklı hataları esgeç" -#: pisi/cli/commands.py:447 pisi/cli/commands.py:555 +#: pisi/cli/commands.py:445 pisi/cli/commands.py:606 msgid "Bypass safety switch" msgstr "Emniyet mandalını esgeç" +#: pisi/cli/commands.py:447 +msgid "Bypass testing step" +msgstr "Test adımını atla" + #: pisi/cli/commands.py:449 msgid "Create a static package with ar files" msgstr "Ar dosyaları içeren bir statik paket yarat" @@ -1283,26 +1291,55 @@ msgid "Break build after running compile step" msgstr "Derleme adımından sonra inşa'yı sonlandır" #: pisi/cli/commands.py:466 +msgid "Break build after running check step" +msgstr "Kontrol adımından sonra inşa'yı sonlandır" + +#: pisi/cli/commands.py:468 msgid "Break build after running install step" msgstr "Kurulum adımından sonra inşa'yı sonlandır" -#: pisi/cli/commands.py:468 +#: pisi/cli/commands.py:470 msgid "create PiSi package" msgstr "PiSi paketini oluştur" -#: pisi/cli/commands.py:482 +#: pisi/cli/commands.py:484 msgid "package_format must be one of %s " msgstr "package_format, bunlardan birisi olmalı: %s" -#: pisi/cli/commands.py:485 pisi/cli/commands.py:534 +#: pisi/cli/commands.py:487 pisi/cli/commands.py:536 pisi/cli/commands.py:585 msgid "Output directory: %s" msgstr "Çıktı dizini: %s" -#: pisi/cli/commands.py:487 +#: pisi/cli/commands.py:489 pisi/cli/commands.py:538 msgid "Outputting packages in the working directory." msgstr "Paketler çalışma dizinine yazılıyor." -#: pisi/cli/commands.py:498 +#: pisi/cli/commands.py:500 +msgid "" +"Creates delta PiSi packages\n" +"\n" +"Usage: delta oldpackage newpackage\n" +"\n" +"Delta command finds the changed files between the given packages by " +"comparing the sha1sum of the files\n" +"and creates a delta pisi package with the changed files between two " +"releases.\n" +"\n" +msgstr "" +"Delta PiSi paketleri oluşturur\n" +"\n" +"Usage: delta eskipaket yenipaket\n" +"\n" +"Delta komutu verilen paketler arasındaki değişen dosyaları" +"dosyaların sha1sum'larını kontrol ederek bulur\n" +"ve iki sürüm arasındaki değişen dosyaları içeren bir delta paketi oluşturur.\n" +"\n" + +#: pisi/cli/commands.py:517 +msgid "delta options" +msgstr "delta seçenekleri" + +#: pisi/cli/commands.py:549 msgid "" "Build and install PiSi source packages from repository\n" "\n" @@ -1322,35 +1359,35 @@ msgstr "" "\n" "Bir bileşen adı da verebilirsiniz.\n" -#: pisi/cli/commands.py:517 +#: pisi/cli/commands.py:568 msgid "emerge options" msgstr "emerge seçenekleri" -#: pisi/cli/commands.py:520 pisi/cli/commands.py:593 pisi/cli/commands.py:657 +#: pisi/cli/commands.py:571 pisi/cli/commands.py:644 pisi/cli/commands.py:712 msgid "Ignore file conflicts" msgstr "Dosya çakışmalarına aldırma" -#: pisi/cli/commands.py:522 pisi/cli/commands.py:595 pisi/cli/commands.py:659 +#: pisi/cli/commands.py:573 pisi/cli/commands.py:646 pisi/cli/commands.py:714 msgid "Ignore package conflicts" msgstr "Paket çakışmalarına aldırma" -#: pisi/cli/commands.py:524 pisi/cli/commands.py:553 +#: pisi/cli/commands.py:575 pisi/cli/commands.py:604 msgid "Bypass comar configuration agent" msgstr "Çomar yapılandırma aygıtını kullanma" -#: pisi/cli/commands.py:536 +#: pisi/cli/commands.py:587 msgid "Outputting binary packages in the package cache." msgstr "İkili paketler paket önbelleğine yazılıyor." -#: pisi/cli/commands.py:544 +#: pisi/cli/commands.py:595 msgid "Abstract package operation command" msgstr "" -#: pisi/cli/commands.py:557 +#: pisi/cli/commands.py:608 msgid "Do not perform any action, just show what would be done" msgstr "Hiç bir eylem gerçekleştirme, sadece ne yapılacağını göster" -#: pisi/cli/commands.py:568 +#: pisi/cli/commands.py:619 msgid "" "Install PiSi packages\n" "\n" @@ -1371,23 +1408,23 @@ msgstr "" "\n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:586 +#: pisi/cli/commands.py:637 msgid "install options" msgstr "install seçenekleri" -#: pisi/cli/commands.py:591 +#: pisi/cli/commands.py:642 msgid "Reinstall already installed packages" msgstr "Halihazırda kurulu paketi yeniden kur" -#: pisi/cli/commands.py:597 +#: pisi/cli/commands.py:648 msgid "Install component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini kur" -#: pisi/cli/commands.py:599 pisi/cli/commands.py:663 +#: pisi/cli/commands.py:650 pisi/cli/commands.py:718 msgid "Fetch upgrades but do not install." msgstr "Yükseltilecekleri indir ama kurma" -#: pisi/cli/commands.py:622 +#: pisi/cli/commands.py:677 msgid "" "Upgrade PiSi packages\n" "\n" @@ -1415,23 +1452,23 @@ msgstr "" "bir dosyayı yeniden kurmak istiyorsanız install komutunu kullanın. \n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:648 +#: pisi/cli/commands.py:703 msgid "upgrade options" msgstr "upgrade seçenekleri" -#: pisi/cli/commands.py:653 +#: pisi/cli/commands.py:708 msgid "Security related package upgrades only" msgstr "Sadece güvenlik ile alakalı güncellemeler" -#: pisi/cli/commands.py:655 +#: pisi/cli/commands.py:710 msgid "Do not update repositories" msgstr "Depoları güncelleme" -#: pisi/cli/commands.py:661 +#: pisi/cli/commands.py:716 msgid "Upgrade component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini güncelle" -#: pisi/cli/commands.py:665 +#: pisi/cli/commands.py:720 msgid "" "When upgrading system, ignore packages and components whose basenames match " "pattern." @@ -1439,7 +1476,7 @@ msgstr "" "Sistemi yükseltirken paket ya da bileşen isimlerinden verilen kalıp ile " "eşleşenleri yok say" -#: pisi/cli/commands.py:667 +#: pisi/cli/commands.py:722 msgid "" "When upgrading system, ignore packages and components whose " "basenames match any pattern contained in file." @@ -1447,15 +1484,15 @@ msgstr "" "Sistemi yükseltirken paket ya da bileşen isimlerinden dosya içerisinde " "verilen kalıplardan herhangi birisi ile eşleşenleri yok say" -#: pisi/cli/commands.py:707 +#: pisi/cli/commands.py:766 msgid "Updating repositories" msgstr "Depolar güncelleniyor" -#: pisi/cli/commands.py:712 +#: pisi/cli/commands.py:771 msgid "Will not update repositories" msgstr "Depolar güncellenmeyecek" -#: pisi/cli/commands.py:734 +#: pisi/cli/commands.py:796 msgid "" "Remove PiSi packages\n" "\n" @@ -1474,15 +1511,15 @@ msgstr "" "verin.\n" "Paket adları yerine bileşenler de verebilirsiniz.\n" -#: pisi/cli/commands.py:751 +#: pisi/cli/commands.py:813 msgid "remove options" msgstr "remove seçenekler" -#: pisi/cli/commands.py:754 +#: pisi/cli/commands.py:816 msgid "Remove component's and recursive components' packages" msgstr "Bileşenin ve alt bileşenlerinin paketlerini kaldır" -#: pisi/cli/commands.py:776 +#: pisi/cli/commands.py:838 msgid "" "Configure pending packages\n" "\n" @@ -1497,11 +1534,11 @@ msgstr "" "yapılmadıysa, yapılandırmayı bekleyen paketler listesine eklenirler.\n" "Bu komut bekleyen paketleri yapılandırır.\n" -#: pisi/cli/commands.py:792 +#: pisi/cli/commands.py:854 msgid "configure-pending options" msgstr "configure-pending seçenekleri" -#: pisi/cli/commands.py:804 +#: pisi/cli/commands.py:866 msgid "" "Display package information\n" "\n" @@ -1515,63 +1552,63 @@ msgstr "" "\n" " ya bir paket adıdır ya da bir .pisi dosyasıdır.\n" -#: pisi/cli/commands.py:819 +#: pisi/cli/commands.py:881 msgid "info options" msgstr "info seçenekler" -#: pisi/cli/commands.py:826 +#: pisi/cli/commands.py:888 msgid "Show a list of package files." msgstr "Paketteki dosyaların bir listesini göster." -#: pisi/cli/commands.py:828 +#: pisi/cli/commands.py:890 msgid "Info about the given component" msgstr "Verilen bileşen hakkında bilgi" -#: pisi/cli/commands.py:831 +#: pisi/cli/commands.py:893 msgid "Show only paths." msgstr "Sadece yolları göster" -#: pisi/cli/commands.py:833 +#: pisi/cli/commands.py:895 msgid "Do not show details" msgstr "Detayları gösterme" -#: pisi/cli/commands.py:835 +#: pisi/cli/commands.py:897 msgid "Output in xml format" msgstr "Xml biçiminde çıktı" -#: pisi/cli/commands.py:881 +#: pisi/cli/commands.py:943 msgid "Package file: %s" msgstr "Paket dosyası: %s" -#: pisi/cli/commands.py:887 +#: pisi/cli/commands.py:949 msgid "[inst] " msgstr "[yüklü]" -#: pisi/cli/commands.py:889 +#: pisi/cli/commands.py:951 msgid "Installed package:" msgstr "Yüklü paket:" -#: pisi/cli/commands.py:895 +#: pisi/cli/commands.py:957 msgid "[repo] " msgstr "[depo] " -#: pisi/cli/commands.py:897 -msgid "Package found in repository:" -msgstr "Paket depoda bulundu:" +#: pisi/cli/commands.py:959 +msgid "Package found in %s repository:" +msgstr "Paket %s deposunda bulundu:" -#: pisi/cli/commands.py:901 +#: pisi/cli/commands.py:963 msgid "%s is not found in repositories" msgstr "%s depolarda bulunamadı" -#: pisi/cli/commands.py:904 +#: pisi/cli/commands.py:966 msgid "%s is not installed" msgstr "%s kurulu değil" -#: pisi/cli/commands.py:917 +#: pisi/cli/commands.py:979 msgid "Reverse Dependencies:" msgstr "Ters bağımlılıklar:" -#: pisi/cli/commands.py:920 +#: pisi/cli/commands.py:982 msgid "" "\n" "Files:" @@ -1579,11 +1616,11 @@ msgstr "" "\n" "Dosyalar:" -#: pisi/cli/commands.py:928 +#: pisi/cli/commands.py:990 msgid "File information not available" msgstr "Dosya bilgisi bulunamadı" -#: pisi/cli/commands.py:934 +#: pisi/cli/commands.py:996 msgid "" "Verify installation\n" "\n" @@ -1608,15 +1645,23 @@ msgstr "" "bu kontrol toplamlarını kullanır. \n" "Eğer paket belirtilmemiş ise tüm paketler üzerinde doğrulama yapar.\n" -#: pisi/cli/commands.py:958 +#: pisi/cli/commands.py:1016 +msgid "check options" +msgstr "kontrol seçenekleri" + +#: pisi/cli/commands.py:1018 +msgid "Check installed packages under given component" +msgstr "Bileşen altındaki kurulu paketleri kontrol et" + +#: pisi/cli/commands.py:1034 msgid "Checking all installed packages" msgstr "Tüm kurulu paketler denetleniyor" -#: pisi/cli/commands.py:961 +#: pisi/cli/commands.py:1038 msgid "* Checking %s... " msgstr "* %s kontrol ediliyor... " -#: pisi/cli/commands.py:965 +#: pisi/cli/commands.py:1042 msgid "" "\n" "Package %s is corrupt." @@ -1624,11 +1669,11 @@ msgstr "" "\n" "Paket %s bozuk." -#: pisi/cli/commands.py:969 +#: pisi/cli/commands.py:1046 msgid "Package %s not installed" msgstr "Paket %s kurulmamış" -#: pisi/cli/commands.py:974 +#: pisi/cli/commands.py:1051 msgid "" "Index PiSi files in a given directory\n" "\n" @@ -1654,31 +1699,31 @@ msgstr "" "Eğer birden çok dizin verirseniz, komut hala çalışır, ama herşeyi\n" "tek bir indeks dosyasına koyar.\n" -#: pisi/cli/commands.py:995 +#: pisi/cli/commands.py:1072 msgid "index options" msgstr "index seçenekleri" -#: pisi/cli/commands.py:999 +#: pisi/cli/commands.py:1076 msgid "Store absolute links for indexed files." msgstr "İndekslenmiş dosyalar için mutlak bağlar sakla." -#: pisi/cli/commands.py:1002 +#: pisi/cli/commands.py:1079 msgid "Index output file" msgstr "İndeks çıktı dosyası" -#: pisi/cli/commands.py:1005 +#: pisi/cli/commands.py:1082 msgid "Do not index PiSi spec files." msgstr "PiSi spec dosyalarını indeksleme." -#: pisi/cli/commands.py:1008 +#: pisi/cli/commands.py:1085 msgid "Do not sign index." msgstr "İndeksi imzalama." -#: pisi/cli/commands.py:1021 +#: pisi/cli/commands.py:1098 msgid "Indexing current directory." msgstr "Şu andaki dizini indeksliyor." -#: pisi/cli/commands.py:1029 +#: pisi/cli/commands.py:1106 msgid "" "Print the list of all installed packages\n" "\n" @@ -1688,30 +1733,30 @@ msgstr "" "\n" "Kullanım: list-installed\n" -#: pisi/cli/commands.py:1043 +#: pisi/cli/commands.py:1120 msgid "list-installed options" msgstr "list-installed seçenekleri" -#: pisi/cli/commands.py:1046 pisi/cli/commands.py:1279 -#: pisi/cli/commands.py:1343 pisi/cli/commands.py:1382 -#: pisi/cli/commands.py:1422 pisi/cli/commands.py:1548 +#: pisi/cli/commands.py:1123 pisi/cli/commands.py:1356 +#: pisi/cli/commands.py:1420 pisi/cli/commands.py:1459 +#: pisi/cli/commands.py:1499 pisi/cli/commands.py:1623 msgid "Show in long format" msgstr "Uzun biçimde göster" -#: pisi/cli/commands.py:1048 +#: pisi/cli/commands.py:1125 msgid "List installed packages under given component" msgstr "Bileşen altındaki kurulu paketleri listele" -#: pisi/cli/commands.py:1050 pisi/cli/commands.py:1426 +#: pisi/cli/commands.py:1127 pisi/cli/commands.py:1503 msgid "Show detailed install info" msgstr "Detaylı kurulum bilgisi göster" # pisi/cli/commands.py:542 :729 -#: pisi/cli/commands.py:1067 pisi/cli/commands.py:1445 +#: pisi/cli/commands.py:1144 pisi/cli/commands.py:1522 msgid "Package Name |St| Version| Rel.| Build| Distro| Date" msgstr "Paket Adı |Dm| Versiyon| Sürüm| İnşa| Dağıt.| Tarih" -#: pisi/cli/commands.py:1082 +#: pisi/cli/commands.py:1159 msgid "" "Rebuild Databases\n" "\n" @@ -1731,19 +1776,19 @@ msgstr "" "Eğer paket tanımları verildiyse /var/lib/pisi altındaki paket dizinlerinin " "adları olmalılar\n" -#: pisi/cli/commands.py:1100 +#: pisi/cli/commands.py:1177 msgid "rebuild-db options" msgstr "rebuild-db seçenekleri" -#: pisi/cli/commands.py:1103 +#: pisi/cli/commands.py:1180 msgid "Rebuild files database" msgstr "Dosya veritabanını yeniden inşa et" -#: pisi/cli/commands.py:1114 +#: pisi/cli/commands.py:1191 msgid "Rebuild PiSi databases?" msgstr "PiSi veritabanı yeniden inşa edilsin mi?" -#: pisi/cli/commands.py:1121 +#: pisi/cli/commands.py:1198 msgid "" "Update repository databases\n" "\n" @@ -1763,15 +1808,15 @@ msgstr "" "PiSi veritabanlarını depo ile eşzamanlı hale getirir.\n" " Eğer bir depo verilmediyse, bütün depolar güncellenir.\n" -#: pisi/cli/commands.py:1139 +#: pisi/cli/commands.py:1216 msgid "update-repo options" msgstr "update-repo seçenekleri" -#: pisi/cli/commands.py:1143 +#: pisi/cli/commands.py:1220 msgid "Update database in any case" msgstr "Veritabanını her halde güncelle" -#: pisi/cli/commands.py:1161 +#: pisi/cli/commands.py:1238 msgid "" "Add a repository\n" "\n" @@ -1796,23 +1841,23 @@ msgstr "" "Şimdilik sadece yerel dosyalar (örn. /a/b/c) ve http:// veya ftp:// türü \n" "adresler desteklenir\n" -#: pisi/cli/commands.py:1181 +#: pisi/cli/commands.py:1258 msgid "add-repo options" msgstr "add-repo seçenekler" -#: pisi/cli/commands.py:1184 +#: pisi/cli/commands.py:1261 msgid "Add repository at given position (0 is first)" msgstr "Belirtilen pozisyona depo ekler (0 birinci)" -#: pisi/cli/commands.py:1198 +#: pisi/cli/commands.py:1275 msgid "Update PiSi database for repository %s?" msgstr "%s isimli depo için PiSi veritabanı güncellensin mi?" -#: pisi/cli/commands.py:1202 +#: pisi/cli/commands.py:1279 msgid "%s repository could not be reached. Removing %s from system." msgstr "%s deposuna erişilemedi. %s sistemden kaldırılıyor." -#: pisi/cli/commands.py:1211 +#: pisi/cli/commands.py:1288 msgid "" "Remove repositories\n" "\n" @@ -1826,7 +1871,7 @@ msgstr "" "\n" "Sistemden ilgili bütün depo bilgisini kaldır.\n" -#: pisi/cli/commands.py:1237 +#: pisi/cli/commands.py:1314 msgid "" "List repositories\n" "\n" @@ -1840,7 +1885,7 @@ msgstr "" "\n" "Şu anda izlenen bütün depoları gösterir.\n" -#: pisi/cli/commands.py:1260 +#: pisi/cli/commands.py:1337 msgid "" "List available packages in the repositories\n" "\n" @@ -1857,27 +1902,27 @@ msgstr "" "Depoda yayımlanmış olan PiSi bileşenlerinin kısa bir listesini verir.\n" "Eğer bir depo verilmediyse, bütün depolardaki paketleri listeler.\n" -#: pisi/cli/commands.py:1277 +#: pisi/cli/commands.py:1354 msgid "list-available options" msgstr "list-available seçenekleri" -#: pisi/cli/commands.py:1281 +#: pisi/cli/commands.py:1358 msgid "List available packages under given component" msgstr "Bileşen altındaki paketleri listele" -#: pisi/cli/commands.py:1283 +#: pisi/cli/commands.py:1360 msgid "Show uninstalled packages only" msgstr "Sadece kurulu olmayan paketleri göster" -#: pisi/cli/commands.py:1291 +#: pisi/cli/commands.py:1368 msgid "Installed packages are shown in this color" msgstr "Kurulu paketler bu renkle gösterilir" -#: pisi/cli/commands.py:1299 +#: pisi/cli/commands.py:1376 msgid "Repository : %s\n" msgstr "Depo: %s\n" -#: pisi/cli/commands.py:1326 +#: pisi/cli/commands.py:1403 msgid "" "List available components\n" "\n" @@ -1892,11 +1937,11 @@ msgstr "" "\n" "Depoda yayımlanmış olan PiSi bileşenlerinin kısa bir listesini verir.\n" -#: pisi/cli/commands.py:1341 +#: pisi/cli/commands.py:1418 msgid "list-components options" msgstr "list-components seçenekleri" -#: pisi/cli/commands.py:1366 +#: pisi/cli/commands.py:1443 msgid "" "List available sources\n" "\n" @@ -1910,11 +1955,11 @@ msgstr "" "\n" "Depolarda bulunan kaynakların kısa bir listesini verir.\n" -#: pisi/cli/commands.py:1380 +#: pisi/cli/commands.py:1457 msgid "list-sources options" msgstr "list-sources seçenekleri" -#: pisi/cli/commands.py:1405 +#: pisi/cli/commands.py:1482 msgid "" "List packages to be upgraded\n" "\n" @@ -1926,19 +1971,19 @@ msgstr "" "\n" "Kullanım: list-upgrades [ ... depon ]\n" -#: pisi/cli/commands.py:1419 +#: pisi/cli/commands.py:1496 msgid "list-upgrades options" msgstr "list-upgrades seçenekleri" -#: pisi/cli/commands.py:1424 +#: pisi/cli/commands.py:1501 msgid "List upgradable packages under given component" msgstr "Bileşen altındaki güncellenebilir paketleri listele" -#: pisi/cli/commands.py:1441 pisi/operations.py:466 +#: pisi/cli/commands.py:1518 pisi/operations.py:460 msgid "No packages to upgrade." msgstr "Yükseltilecek paket yok." -#: pisi/cli/commands.py:1461 +#: pisi/cli/commands.py:1538 msgid "" "List pending packages\n" "\n" @@ -1948,11 +1993,11 @@ msgstr "" "\n" "Yapılandırmayı bekleyen paketlerin bir listesini verir.\n" -#: pisi/cli/commands.py:1483 +#: pisi/cli/commands.py:1560 msgid "There are no packages waiting to be configured" msgstr "Yapılandırılmayı bekleyen paket yok" -#: pisi/cli/commands.py:1488 +#: pisi/cli/commands.py:1565 msgid "" "Search packages\n" "\n" @@ -1968,23 +2013,19 @@ msgstr "" "Belirtilen arama terimlerini özet, tanım ve paket adı \n" "alanlarında içeren paketleri bulur.\n" -#: pisi/cli/commands.py:1503 +#: pisi/cli/commands.py:1580 msgid "search options" msgstr "search seçenekleri" -#: pisi/cli/commands.py:1506 -msgid "Set search language" -msgstr "Arama dilini seç" - -#: pisi/cli/commands.py:1511 +#: pisi/cli/commands.py:1586 msgid "Show details" msgstr "Detayları göster" -#: pisi/cli/commands.py:1523 +#: pisi/cli/commands.py:1598 msgid "%s packages found" msgstr "%s paket bulundu" -#: pisi/cli/commands.py:1532 +#: pisi/cli/commands.py:1607 msgid "" "Search for a file\n" "\n" @@ -1998,35 +2039,35 @@ msgstr "" "\n" "Belirtilen dosyayı içeren paketi bulur.\n" -#: pisi/cli/commands.py:1546 +#: pisi/cli/commands.py:1621 msgid "search-file options" msgstr "search-file seçenekleri" -#: pisi/cli/commands.py:1550 +#: pisi/cli/commands.py:1625 msgid "Fuzzy search" msgstr "Yaklaşık arama" -#: pisi/cli/commands.py:1552 +#: pisi/cli/commands.py:1627 msgid "Show only package name" msgstr "Sadece paket ismi göster" -#: pisi/cli/commands.py:1573 +#: pisi/cli/commands.py:1648 msgid "Package %s has file %s" msgstr "%s paketi içinde %s dosyası var" -#: pisi/cli/commands.py:1575 +#: pisi/cli/commands.py:1650 msgid "Type: %s, Hash: %s" msgstr "Tip: %s, Hash: %s" -#: pisi/cli/commands.py:1578 +#: pisi/cli/commands.py:1653 msgid "Path '%s' does not belong to an installed package" msgstr "Yol '%s' yerleştirilmiş bir pakete ait değil" -#: pisi/cli/commands.py:1591 +#: pisi/cli/commands.py:1666 msgid "Searching for %s" msgstr "%s'i arıyor" -#: pisi/cli/commands.py:1601 +#: pisi/cli/commands.py:1676 msgid "" "%prog [options] [arguments]\n" "\n" @@ -2038,7 +2079,7 @@ msgstr "" " aşağıdakilerden birisi olabilir:\n" "\n" -#: pisi/cli/commands.py:1607 +#: pisi/cli/commands.py:1682 msgid "" "\n" "Use \"%prog help \" for help on a specific command.\n" @@ -2115,19 +2156,19 @@ msgstr "Kaldırma öncesi betikleri çağrılıyor" msgid "Unregistering comar scripts" msgstr "comar betikleri siliniyor" -#: pisi/component.py:106 pisi/component.py:112 +#: pisi/component.py:105 pisi/component.py:111 msgid "Component %s not found" msgstr "%s bileşeni bulunamadı" -#: pisi/component.py:208 pisi/component.py:234 +#: pisi/component.py:207 pisi/component.py:233 msgid "Information for component %s not available" msgstr "Bileşen %s için bilgi bulunamadı" -#: pisi/config.py:61 +#: pisi/config.py:60 msgid "Destination directory %s does not exist. Creating it." msgstr "Hedef dizini %s bulunamadı. Yaratılıyor." -#: pisi/configfile.py:105 +#: pisi/configfile.py:107 msgid "No section by name '%s'" msgstr "'%s' diye bir bölüm yok." @@ -2163,6 +2204,14 @@ msgstr "Sabit %s değiştirilemez" msgid "Can't unbind constant: %s" msgstr "Sabit %s kaldırılamaz" +#: pisi/delta.py:27 +msgid "Cannot create delta for same package!" +msgstr "Aynı paketler için delta oluşturulamaz!" + +#: pisi/delta.py:41 +msgid "Creating delta PiSi package between %s %s" +msgstr "%s ile %s paketi arasından delta PiSi paketi oluşturuluyor." + #: pisi/dependency.py:107 msgid "%s dependency of package %s is not satisfied" msgstr "%s bağımlılığı %s paketi için sağlanamadı" @@ -2193,31 +2242,31 @@ msgstr "" msgid "No such file or no permission to read" msgstr "Öyle bir dosya yok ya da okuma izni yok." -#: pisi/fetcher.py:183 +#: pisi/fetcher.py:182 msgid "Requested range not satisfiable, starting again." msgstr "İstenen aralık sağlanamıyor, yeniden başlatılıyor" -#: pisi/fetcher.py:190 +#: pisi/fetcher.py:189 msgid "Cannot fetch %s; value error: %s" msgstr "%s indirilemiyor, hata: %s" -#: pisi/fetcher.py:192 pisi/fetcher.py:196 +#: pisi/fetcher.py:191 pisi/fetcher.py:195 msgid "Cannot fetch %s; %s" msgstr "%s indirilemiyor; %s" -#: pisi/fetcher.py:194 +#: pisi/fetcher.py:193 msgid "Please check your network connections and try again. (%s)" msgstr "Lütfen ağ bağlantılarınızı kontrol edin ve yeniden deneyin. (%s)" -#: pisi/fetcher.py:198 +#: pisi/fetcher.py:197 msgid "Cannot fetch %s; (%s): %s" msgstr "%s indirilemiyor; (%s): %s" -#: pisi/fetcher.py:244 +#: pisi/fetcher.py:243 msgid "Proxy configuration has been found for '%s' protocol" msgstr "'%s' protokolü için vekil (proxy) yapılandırması bulundu" -#: pisi/fetcher.py:328 pisi/fetcher.py:349 pisi/fetcher.py:362 +#: pisi/fetcher.py:327 pisi/fetcher.py:348 pisi/fetcher.py:361 msgid "ftp error" msgstr "ftp hatası" @@ -2265,43 +2314,43 @@ msgstr "HATA: gpg --detach-sig %s çalışmadı" msgid "Encountered cycle %s" msgstr "Çember ile karşılaşıldı: %s" -#: pisi/index.py:96 +#: pisi/index.py:100 msgid "Adding %s to component index" msgstr "%s bileşen indeksine ekleniyor" -#: pisi/index.py:108 +#: pisi/index.py:112 msgid "Adding %s to package index" msgstr "%s paket indeksine ekleniyor" -#: pisi/index.py:122 +#: pisi/index.py:126 msgid "Updating package database of %s" msgstr "%s paket veritabanı güncelleniyor" -#: pisi/index.py:150 +#: pisi/index.py:154 msgid "Package %s: metadata corrupt, skipping..." msgstr "Paket %s: metadata bozuk, atlanıyor..." -#: pisi/index.py:178 +#: pisi/index.py:193 msgid "Adding %s to source index" msgstr "%s kaynak indeksine ekleniyor" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed" msgstr "kurulu" -#: pisi/installdb.py:58 +#: pisi/installdb.py:55 msgid "installed-pending" msgstr "kurulu-beklemede" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "purged" msgstr "temizlenmiş" -#: pisi/installdb.py:59 +#: pisi/installdb.py:56 msgid "removed" msgstr "kaldırılmış" -#: pisi/installdb.py:62 +#: pisi/installdb.py:59 msgid "" "State: %s\n" "Version: %s, Release: %s, Build: %s\n" @@ -2309,11 +2358,11 @@ msgstr "" "Durum: %s\n" "Versiyon: %s, Sürüm: %s, İnşa: %s\n" -#: pisi/installdb.py:67 +#: pisi/installdb.py:64 msgid "Distribution: %s, Install Time: %s\n" msgstr "Dağıtım: %s, Yerleştime Zamanı: %s\n" -#: pisi/installdb.py:154 +#: pisi/installdb.py:151 msgid "Already installed" msgstr "Halihazırda yerleştirilmiş." @@ -2329,25 +2378,25 @@ msgstr "%s anahtarı bulunamadı" msgid "Key %s in repo %s not found" msgstr "%s anahtarı %s deposunda bulunamadı" -#: pisi/lockeddbshelve.py:47 +#: pisi/lockeddbshelve.py:46 msgid "Database version for %s insufficient. Please run rebuild-db command." msgstr "Veritabanı versiyonu %s yetersiz. Lütfen rebuild-db komutunu çalıştırınız." -#: pisi/lockeddbshelve.py:51 +#: pisi/lockeddbshelve.py:50 msgid "Database version for %s greater than PiSi version. You need a newer PiSi." msgstr "" "Veritabanı versiyonu %s PiSi versiyonundan büyük. Yeni bir PiSi'ye " "gereksiniminiz var." -#: pisi/lockeddbshelve.py:62 +#: pisi/lockeddbshelve.py:61 msgid "Cannot attain write access to database environment" msgstr "Veritabanı ortamına yazma erişimi sağlanamadı" -#: pisi/lockeddbshelve.py:64 +#: pisi/lockeddbshelve.py:63 msgid "Database version %s not present." msgstr "Veritabanı versiyonu %s bulunamadı." -#: pisi/lockeddbshelve.py:71 pisi/lockeddbshelve.py:153 +#: pisi/lockeddbshelve.py:70 pisi/lockeddbshelve.py:152 msgid "" "Another instance of PiSi is running. Only one instance is allowed to modify " "the PiSi database at a time." @@ -2355,31 +2404,31 @@ msgstr "" "Sistemde başka bir yerde daha PiSi çalışıyor. Sadece tek bir PiSi'nin " "veritabanını değiştirmesine izin verilir." -#: pisi/lockeddbshelve.py:81 +#: pisi/lockeddbshelve.py:80 msgid "Cannot attain read access to database environment" msgstr "Veritabanı ortamına okuma erişimi sağlanamadı" -#: pisi/lockeddbshelve.py:95 +#: pisi/lockeddbshelve.py:94 msgid "" "Cannot attain write access to PiSi database. You have to be root for this " "operation." msgstr "PiSi veritabanına yazma erişimi sağlanamadı. Bu işlem için root olmalısınız." -#: pisi/lockeddbshelve.py:113 +#: pisi/lockeddbshelve.py:112 msgid "Cannot attain read or write access to database %s" msgstr "Veritabanı %s için okuma ya da yazma erişimi sağlanamadı" -#: pisi/lockeddbshelve.py:139 +#: pisi/lockeddbshelve.py:138 msgid "Flags should be one of 'r', 'w', 'c' or 'n' or use the bsddb.db.DB_* flags" msgstr "" "Bayraklar 'r', 'w', 'c' or 'n'den birisi olmalı ya da bsddb.db.DB_* " "bayraklarını kullanmalı" -#: pisi/metadata.py:58 +#: pisi/metadata.py:74 msgid "Distribution: %s, Dist. Release: %s\n" msgstr "Dağıtım: %s, Dağıtım Sürümü: %s\n" -#: pisi/metadata.py:60 +#: pisi/metadata.py:76 msgid "Architecture: %s, Installed Size: %s" msgstr "Mimari: %s, Yerleşik Boyut: %s" @@ -2387,46 +2436,46 @@ msgstr "Mimari: %s, Yerleşik Boyut: %s" msgid "Mirrors file %s does not exist. Could not resolve mirrors://" msgstr "Yansı dosyası %s bulunamadı. mirrors:// çözümlenemedi." -#: pisi/operations.py:114 +#: pisi/operations.py:107 msgid "Mixing file names and package names not supported yet." msgstr "Dosya ve paket adlarını karıştırmak henüz desteklenmiyor." -#: pisi/operations.py:156 +#: pisi/operations.py:149 msgid "" "The following packages will be installed\n" "in the respective order to satisfy extra dependencies:\n" msgstr "Ek bağımlılıkları sağlamak için bu paketler verilen sırada kurulacaktır:\n" -#: pisi/operations.py:159 pisi/operations.py:621 +#: pisi/operations.py:152 pisi/operations.py:615 msgid "Do you want to continue?" msgstr "Devam etmek istiyor musunuz?" -#: pisi/operations.py:160 +#: pisi/operations.py:153 msgid "External dependencies not satisfied" msgstr "Dış bağımlılıklar sağlanamadı" # pisi/api.py:168 :215 -#: pisi/operations.py:172 pisi/operations.py:339 +#: pisi/operations.py:165 pisi/operations.py:332 msgid "No packages to install." msgstr "Kurulacak paket yok." -#: pisi/operations.py:203 +#: pisi/operations.py:196 msgid "Installation order: " msgstr "Kurulum sırası: " -#: pisi/operations.py:257 pisi/operations.py:279 +#: pisi/operations.py:250 pisi/operations.py:272 msgid "Conflicts remain" msgstr "Çakışmalar var" -#: pisi/operations.py:267 +#: pisi/operations.py:260 msgid "Selected packages [%s] are in conflict with each other." msgstr "Seçili paketler [%s] birbirleriyle çakışıyorlar." -#: pisi/operations.py:273 +#: pisi/operations.py:266 msgid "[%s conflicts with: %s]\n" msgstr "[%s: %s ile çakışıyor]\n" -#: pisi/operations.py:275 +#: pisi/operations.py:268 msgid "" "The following packages have conflicts:\n" "%s" @@ -2434,115 +2483,115 @@ msgstr "" "Aşağıdaki paketlerde çakışmalar bulunuyor:\n" "%s" -#: pisi/operations.py:278 +#: pisi/operations.py:271 msgid "Remove the following conflicting packages?" msgstr "Bu çakışan paketler kaldırılsın mı?" -#: pisi/operations.py:305 +#: pisi/operations.py:298 msgid "Safety switch: Following packages in system.base will be installed: " msgstr "Emniyet mandalı: taban sistem system.base'den bu paketler kurulacak:" -#: pisi/operations.py:311 +#: pisi/operations.py:304 msgid "Safety switch: Following packages in system.base will be upgraded: " msgstr "Emniyet mandalı: taban sistem system.base'den bu paketler yükseltilecek:" -#: pisi/operations.py:317 pisi/operations.py:597 +#: pisi/operations.py:310 pisi/operations.py:591 msgid "Safety switch: the component system.base cannot be found" msgstr "Emniyet mandalı: taban sistem bileşeni system.base bulunamadı" -#: pisi/operations.py:334 +#: pisi/operations.py:327 msgid "" "The following package(s) are already installed and are not going to be " "installed again:\n" msgstr "Aşağıdaki paket(ler) zaten sistemde kurulu ve yeniden kurulmayacak(lar):\n" -#: pisi/operations.py:355 +#: pisi/operations.py:348 msgid "" "Following packages will be installed in the respective order to satisfy " "dependencies:\n" msgstr "Bağımlılıkları sağlamak için bu paketler verilen sırada kurulacaktır:\n" -#: pisi/operations.py:360 pisi/operations.py:491 +#: pisi/operations.py:353 pisi/operations.py:485 msgid "Total size of package(s): %.2f %s" msgstr "Paket(ler)in toplam boyu: %.2f %s" -#: pisi/operations.py:366 pisi/operations.py:497 pisi/operations.py:709 +#: pisi/operations.py:359 pisi/operations.py:491 pisi/operations.py:703 msgid "There are extra packages due to dependencies. Do you want to continue?" msgstr "Bağımlılıklar yüzünden ek paketler var. Devam etmek istiyor musunuz?" -#: pisi/operations.py:432 +#: pisi/operations.py:425 msgid "Warning: package *name* ends with '.pisi'" msgstr "Uyarı: paket *adı* '.pisi' ile bitiyor." -#: pisi/operations.py:435 +#: pisi/operations.py:428 msgid "Package %s is not installed." msgstr "Paket %s kurulmamış." -#: pisi/operations.py:441 +#: pisi/operations.py:434 msgid "Package %s is not available in repositories." msgstr "Paket %s depolarda mevcut değil." -#: pisi/operations.py:453 +#: pisi/operations.py:447 msgid "Package %s is already at the latest release %s." msgstr "Paket %s zaten en son sürüm %s'de" -#: pisi/operations.py:459 +#: pisi/operations.py:453 msgid "Package %s is already at the latest build %s." msgstr "Paket %s zaten en son inşa %s'de." -#: pisi/operations.py:486 +#: pisi/operations.py:480 msgid "The following packages will be upgraded: " msgstr "Bu paketler yükseltilecektir: " -#: pisi/operations.py:552 +#: pisi/operations.py:546 msgid "Dependency %s of %s cannot be satisfied" msgstr "%s bağımlılığı, %s paketi için sağlanamadı" -#: pisi/operations.py:553 +#: pisi/operations.py:547 msgid "Upgrade is not possible." msgstr "Yükseltme mümkün değil." -#: pisi/operations.py:568 +#: pisi/operations.py:562 msgid "Reverse dependency %s of %s cannot be satisfied" msgstr "Ters bağımlılık %s, %s paketi için sağlanamadı" -#: pisi/operations.py:593 +#: pisi/operations.py:587 msgid "Safety switch: cannot remove the following packages in system.base: " msgstr "Emniyet mandalı: taban sistem system.base deki bu paketler kaldırılamıyor: " -#: pisi/operations.py:604 +#: pisi/operations.py:598 msgid "Package %s does not exist. Cannot remove." msgstr "Olmayan paket %s kaldırılamıyor." -#: pisi/operations.py:608 +#: pisi/operations.py:602 msgid "No packages to remove." msgstr "Kaldıracak paket yok." -#: pisi/operations.py:617 +#: pisi/operations.py:611 msgid "" "The following minimal list of packages will be removed\n" "in the respective order to satisfy dependencies:\n" msgstr "Bağımlılıkları sağlamak için bu paketler verilen sırada kaldırılacaktır:\n" -#: pisi/operations.py:622 +#: pisi/operations.py:616 msgid "Package removal declined" msgstr "Paket kaldırmaya izin verilmedi." -#: pisi/operations.py:634 +#: pisi/operations.py:628 msgid "Package %s is not installed. Cannot remove." msgstr "Paket %s kurulu değil. Kaldırılamıyor." -#: pisi/operations.py:683 +#: pisi/operations.py:677 msgid "No packages to emerge." msgstr "Derlenip, kurulacak paket yok." -#: pisi/operations.py:698 +#: pisi/operations.py:692 msgid "" "The following minimal list of packages will be installed\n" "from repository in the respective order to satisfy dependencies:\n" msgstr "Bağımlılıkları sağlamak için bu paketler verilen sırada kurulacak:\n" -#: pisi/operations.py:701 +#: pisi/operations.py:695 msgid "" "The following minimal list of packages will be built and\n" "installed in the respective order to satisfy dependencies:\n" @@ -2550,7 +2599,7 @@ msgstr "" "Bağımlılıkları sağlamak için aşağıdaki paketler verilen sırada derlenip, " "kurulacak:\n" -#: pisi/operations.py:743 +#: pisi/operations.py:737 msgid "Cannot find source package: %s" msgstr "Kaynak paket bulunamadı: %s" @@ -2562,33 +2611,33 @@ msgstr "" "'%s' indirilirken bir hata oluştu.\n" "Paket yükseltilmiş olabilir. Lütfen paketi yükseltmeyi deneyin." -#: pisi/package.py:60 pisi/sourcearchive.py:94 +#: pisi/package.py:60 pisi/sourcearchive.py:92 msgid "%s [cached]" msgstr "%s [önbellekte]" -#: pisi/package.py:131 +#: pisi/package.py:136 msgid "MetaData format wrong" msgstr "MetaData biçimi yanlış" -#: pisi/packagedb.py:66 +#: pisi/packagedb.py:65 msgid "Package %s not found" msgstr "Paket %s bulunamadı" -#: pisi/pxml/autoxml.py:77 +#: pisi/pxml/autoxml.py:79 msgid "At least one '%s' tag should have local text" msgstr "En azından bir tane '%s' etiketi yerel metne sahip olmalı" -#: pisi/pxml/autoxml.py:84 +#: pisi/pxml/autoxml.py:86 msgid "'%s' language of tag '%s' is empty" msgstr "'%s' dili metni, etiket %s içerisinde boş" -#: pisi/pxml/autoxml.py:112 +#: pisi/pxml/autoxml.py:114 msgid "LocalText: unable to get either current or default locale" msgstr "" "LocalText: şu andaki ya da ön tanımlı yerelleştirme seçenekleri (locale) " "bulunamıyor" -#: pisi/pxml/autoxml.py:118 pisi/pxml/autoxml.py:133 +#: pisi/pxml/autoxml.py:120 pisi/pxml/autoxml.py:135 msgid "" "Tag should have at least the current locale, or failing that an English or " "Turkish version" @@ -2596,68 +2645,68 @@ msgstr "" "Etiket en azından şu andaki yerelleştirme seçenekleri (locale) için bir " "girdiye, o olmazsa bir Türkçe ya da İngilizce versiyona sahip olmalı" -#: pisi/pxml/autoxml.py:374 +#: pisi/pxml/autoxml.py:372 msgid "autoxml.check: '%s' errors" msgstr "autoxml.check: '%s' hatalar" -#: pisi/pxml/autoxml.py:429 pisi/pxml/autoxml.py:439 +#: pisi/pxml/autoxml.py:427 pisi/pxml/autoxml.py:437 msgid "autoxml.parse: String '%s' has errors" msgstr "autoxml.read: Dosya '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:449 pisi/pxml/autoxml.py:459 +#: pisi/pxml/autoxml.py:447 pisi/pxml/autoxml.py:457 msgid "autoxml.read: File '%s' has errors" msgstr "autoxml.read: Dosya '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:467 +#: pisi/pxml/autoxml.py:465 msgid "autoxml.write: object validation has failed" msgstr "autoxml.write: nesne doğrulaması başarısızlığa uğradı" -#: pisi/pxml/autoxml.py:475 +#: pisi/pxml/autoxml.py:473 msgid "autoxml.write: File encoding '%s' has errors" msgstr "autoxml.write: Dosya biçimlendirmesi '%s' hatalara sahip" -#: pisi/pxml/autoxml.py:525 +#: pisi/pxml/autoxml.py:523 msgid "gen_tag: unrecognized tag type %s in spec" msgstr "gen_tag: tanınmayan im tipi %s" -#: pisi/pxml/autoxml.py:573 pisi/pxml/autoxml.py:584 +#: pisi/pxml/autoxml.py:571 pisi/pxml/autoxml.py:582 msgid "Mandatory variable %s not available" msgstr "Gerekli değişken %s bulunamadı" -#: pisi/pxml/autoxml.py:654 +#: pisi/pxml/autoxml.py:652 msgid "Type mismatch: read text cannot be decoded" msgstr "Tip uyumsuzluğu: okunan metin çözülemedi" -#: pisi/pxml/autoxml.py:658 pisi/pxml/autoxml.py:667 +#: pisi/pxml/autoxml.py:656 pisi/pxml/autoxml.py:665 msgid "Mandatory token %s not available" msgstr "Gerekli im %s bulunamadı" -#: pisi/pxml/autoxml.py:672 +#: pisi/pxml/autoxml.py:670 msgid "Type mismatch. Expected %s, got %s" msgstr "Tip uyumsuzluğu. %s beklerken, %s bulundu" # pisi/xmlfile.py:420 :521 -#: pisi/pxml/autoxml.py:702 pisi/pxml/autoxml.py:818 +#: pisi/pxml/autoxml.py:700 pisi/pxml/autoxml.py:816 msgid "Type mismatch: DOM cannot be decoded" msgstr "Tip uyumsuzluğu: DOM okunamıyor" # pisi/xmlfile.py:392 :423 :439 :446 :524 :538 :545 -#: pisi/pxml/autoxml.py:705 pisi/pxml/autoxml.py:721 pisi/pxml/autoxml.py:731 -#: pisi/pxml/autoxml.py:821 pisi/pxml/autoxml.py:835 pisi/pxml/autoxml.py:845 +#: pisi/pxml/autoxml.py:703 pisi/pxml/autoxml.py:719 pisi/pxml/autoxml.py:729 +#: pisi/pxml/autoxml.py:819 pisi/pxml/autoxml.py:833 pisi/pxml/autoxml.py:843 msgid "Mandatory argument not available" msgstr "Gerekli argüman bulunamadı" # pisi/xmlfile.py:436 :535 -#: pisi/pxml/autoxml.py:718 pisi/pxml/autoxml.py:832 +#: pisi/pxml/autoxml.py:716 pisi/pxml/autoxml.py:830 msgid "Object cannot be encoded" msgstr "Nesne kodlanamadı" -#: pisi/pxml/autoxml.py:743 +#: pisi/pxml/autoxml.py:741 msgid "List type must contain only one element" msgstr "List tipi sadece bir eleman içermeli" # pisi/xmlfile.py:470 :485 -#: pisi/pxml/autoxml.py:756 pisi/pxml/autoxml.py:777 +#: pisi/pxml/autoxml.py:754 pisi/pxml/autoxml.py:775 msgid "Mandatory list \"%s\" under \"%s\" node is empty." msgstr "Zorunlu \"%s\" listesi \"%s\" içinde yok." @@ -2665,23 +2714,23 @@ msgstr "Zorunlu \"%s\" listesi \"%s\" içinde yok." msgid "getNodeText: Expected text node, got something else!" msgstr "getNodeText: metin beklenirken başka birşey alındı!" -#: pisi/pxml/xmlfile.py:64 +#: pisi/pxml/xmlfile.py:63 msgid "String '%s' has invalid XML" msgstr "'%s' dosyasının XML sözdizimi geçersiz" -#: pisi/pxml/xmlfile.py:72 pisi/pxml/xmlfile.py:87 +#: pisi/pxml/xmlfile.py:71 pisi/pxml/xmlfile.py:86 msgid "File '%s' has invalid XML" msgstr "'%s' dosyasının XML sözdizimi geçersiz" -#: pisi/repodb.py:74 +#: pisi/repodb.py:73 msgid "No repository named %s exists" msgstr "%s adında bir depo bulunamadı" -#: pisi/repodb.py:83 +#: pisi/repodb.py:82 msgid "Repository %s already exists" msgstr "Depo %s halihazırda var" -#: pisi/repodb.py:90 +#: pisi/repodb.py:89 msgid "Cannot add repository at position %s" msgstr "%s konumundaki depo eklenemiyor" @@ -2697,23 +2746,23 @@ msgstr "Depo'da %s isimli paket zaten mevcut." msgid "Repo does not have package named %s." msgstr "Depo'da %s isminde bir paket yok." -#: pisi/sourcearchive.py:63 +#: pisi/sourcearchive.py:61 msgid "Trying fallback address: %s" msgstr "Geri düşüm adresi %s deneniyor." -#: pisi/sourcearchive.py:74 +#: pisi/sourcearchive.py:72 msgid "%s mirrors are not defined." msgstr "%s yansıları tanımlı değil." -#: pisi/sourcearchive.py:79 +#: pisi/sourcearchive.py:77 msgid "Fetching source from mirror: %s" msgstr "Kaynak, %s yansısından indiriliyor" -#: pisi/sourcearchive.py:85 +#: pisi/sourcearchive.py:83 msgid "Could not fetch source from %s mirrors." msgstr "Kaynak, %s yansılarından indirilemedi." -#: pisi/sourcearchive.py:103 +#: pisi/sourcearchive.py:101 msgid "unpack: check_file_hash failed" msgstr "unpack: check_file_hash başarısızlığa uğradı" @@ -2721,31 +2770,31 @@ msgstr "unpack: check_file_hash başarısızlığa uğradı" msgid "Source package %s not found" msgstr "Kaynak paketi %s bulunamadı." -#: pisi/specfile.py:141 +#: pisi/specfile.py:140 msgid "URI: %s, type: %s, sha1sum: %s" msgstr "URI: %s, tip: %s, sha1sum: %s" -#: pisi/specfile.py:208 +#: pisi/specfile.py:207 msgid "Name: %s, version: %s, release: %s, build %s\n" msgstr "Ad: %s, versiyon %s, sürüm %s, inşa %s\n" -#: pisi/specfile.py:210 +#: pisi/specfile.py:209 msgid "Summary: %s\n" msgstr "Özet: %s\n" -#: pisi/specfile.py:211 +#: pisi/specfile.py:210 msgid "Description: %s\n" msgstr "Açıklama: %s\n" -#: pisi/specfile.py:212 +#: pisi/specfile.py:211 msgid "Component: %s\n" msgstr "Bileşen: %s\n" -#: pisi/specfile.py:213 +#: pisi/specfile.py:212 msgid "Provides: " msgstr "Sağladıkları: " -#: pisi/specfile.py:217 +#: pisi/specfile.py:216 msgid "Dependencies: " msgstr "Bağımlılıklar:" @@ -2761,43 +2810,43 @@ msgstr "Çalışıyor: " msgid "return value for \"%s\" is %s" msgstr "\"%s\" için dönüş değeri %s" -#: pisi/util.py:364 +#: pisi/util.py:361 msgid "Including external link '%s'" msgstr "'%s' harici bağı ekleniyor" -#: pisi/util.py:366 +#: pisi/util.py:363 msgid "Including directory '%s'" msgstr "'%s' dizini içeriliyor" -#: pisi/util.py:440 +#: pisi/util.py:448 msgid "I/O Error: Cannot calculate SHA1 hash of %s" msgstr "Girdi/Çıktı hatası: %s dosyasının SHA1 kontrol toplamı hesaplanamıyor" -#: pisi/util.py:451 +#: pisi/util.py:459 msgid "Cannot calculate SHA1 hash of given data" msgstr "Verinin SHA1 kontrol toplamı hesaplanamıyor" -#: pisi/util.py:488 +#: pisi/util.py:498 msgid "ERROR: patch (%s) failed" msgstr "HATA: Yama (%s) başarısız" -#: pisi/util.py:490 +#: pisi/util.py:500 msgid "ERROR: patch (%s) failed: %s" msgstr "HATA: Yama (%s) başarısız: %s" -#: pisi/util.py:536 +#: pisi/util.py:546 msgid "strip command failed for file '%s'!" msgstr "strip komutu '%s' dosyası için çalışmadı!" -#: pisi/util.py:543 +#: pisi/util.py:553 msgid "objcopy (keep-debug) command failed for file '%s'!" msgstr "objcopy (keep-debug) komutu '%s' dosyası için çalışmadı!" -#: pisi/util.py:549 +#: pisi/util.py:559 msgid "objcopy (add-debuglink) command failed for file '%s'!" msgstr "objcopy (add-debuglink) komutu '%s' dosyası için çalışmadı!" -#: pisi/util.py:610 +#: pisi/util.py:620 msgid "Updating environment..." msgstr "Çevre güncelleniyor..." From 9d3cddd438963bb31c983bcabe1643ffa33c0e27 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 13 May 2007 20:13:27 +0000 Subject: [PATCH 091/212] * 1.1.3 with "from import" changes --- pisi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/__init__.py b/pisi/__init__.py index 89a95deb..5e418243 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -12,7 +12,7 @@ # PiSi version -__version__ = "1.1.2" +__version__ = "1.1.3" __dbversion__ = "1.1.2" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck From 6603d364235785887825ec5bc59d9b7a2b951d99 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 13 May 2007 20:26:12 +0000 Subject: [PATCH 092/212] [MERGE] gzip support --- pisi/archive.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pisi/archive.py b/pisi/archive.py index 4e99e6ca..15118602 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -18,6 +18,7 @@ import stat import shutil import tarfile import zipfile +import gzip import gettext __trans = gettext.translation('pisi', fallback=True) @@ -65,6 +66,27 @@ class ArchiveBinary(ArchiveBase): target_file = os.path.join(target_dir, os.path.basename(self.file_path)) shutil.copyfile(self.file_path, target_file) +class ArchiveGzip(ArchiveBase): + """ArchiveGzip handles Gzip archive files""" + def __init__(self, file_path, arch_type = "gz"): + super(ArchiveGzip, self).__init__(file_path, arch_type) + + def unpack(self, target_dir, clean_dir = False): + super(ArchiveGzip, self).unpack(target_dir, clean_dir) + self.unpack_dir(target_dir) + + def unpack_dir(self, target_dir): + """Unpack Gzip archive to a given target directory(target_dir).""" + oldwd = os.getcwd() + os.chdir(target_dir) + + self.gzip = gzip.GzipFile(self.file_path, "r") + self.output = open(os.path.basename(self.file_path.rstrip(".gz")), "w") + self.output.write(self.gzip.read()) + self.output.close() + self.gzip.close() + + os.chdir(oldwd) class ArchiveTar(ArchiveBase): """ArchiveTar handles tar archives depending on the compression @@ -411,6 +433,7 @@ class Archive: 'tarlzma': ArchiveTar, 'tar': ArchiveTar, 'zip': ArchiveZip, + 'gzip': ArchiveGzip, 'binary': ArchiveBinary } From 6fd5ef300b7bcdbf8991a6e94a3f192270d0ab41 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 13 May 2007 20:32:43 +0000 Subject: [PATCH 093/212] =?UTF-8?q?[MERGE]=C2=A0Fix=20for=20#5578?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/build.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index f0091820..661a3220 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -191,9 +191,6 @@ class Builder: self.fetch_source_archive() self.unpack_source_archive() - # apply the patches and prepare a source directory for build. - self.apply_patches() - self.run_setup_action() self.run_build_action() if ctx.get_option('debug') and not ctx.get_option('ignore_check'): @@ -310,19 +307,21 @@ class Builder: def unpack_source_archive(self): ctx.ui.info(_("Unpacking archive..."), noln = True) self.sourceArchive.unpack() - ctx.ui.info(_(" unpacked (%s)") % self.pkg_work_dir()) - self.set_state("unpack") + # apply the patches and prepare a source directory for build. + if self.apply_patches(): + ctx.ui.info(_(" unpacked (%s)") % self.pkg_work_dir()) + self.set_state("unpack") def run_setup_action(self): # Run configure, build and install phase ctx.ui.action(_("Setting up source...")) - self.run_action_function(ctx.const.setup_func) - self.set_state("setupaction") + if self.run_action_function(ctx.const.setup_func): + self.set_state("setupaction") def run_build_action(self): ctx.ui.action(_("Building source...")) - self.run_action_function(ctx.const.build_func) - self.set_state("buildaction") + if self.run_action_function(ctx.const.build_func): + self.set_state("buildaction") def run_check_action(self): ctx.ui.action(_("Testing package...")) @@ -336,8 +335,8 @@ class Builder: pisi.util.clean_dir(self.pkg_install_dir()) # install function is mandatory! - self.run_action_function(ctx.const.install_func, True) - self.set_state("installaction") + if self.run_action_function(ctx.const.install_func, True): + self.set_state("installaction") def get_abandoned_files(self): # return the files those are not collected from the install dir @@ -421,6 +420,7 @@ class Builder: Error, _("unable to call function from actions: %s") %func os.chdir(curDir) + return True def check_build_dependencies(self): """check and try to install build dependencies, otherwise fail.""" @@ -495,6 +495,7 @@ class Builder: ctx.ui.action(_("* Applying patch: %s") % patch.filename) pisi.util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) + return True def generate_static_package_object(self): ar_files = [] @@ -928,7 +929,6 @@ def __buildState_unpack(pb, last): if order[last] < order["fetch"]: __buildState_fetch(pb) pb.unpack_source_archive() - pb.apply_patches() def __buildState_setupaction(pb, last): if order[last] < order["unpack"]: From 2273b22b8adfa1c21d1715290bc3973523a6f406 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 13 May 2007 20:36:19 +0000 Subject: [PATCH 094/212] [MERGE] missed "from import" change --- pisi/cli/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 68a0babd..2048a6f3 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -1551,7 +1551,7 @@ Lists packages waiting to be configured. self.init(database = True, write = False) A = ctx.installdb.list_pending() - order = api.generate_pending_order(A) + order = pisi.api.generate_pending_order(A) if len(order): for p in order: From 8d0167f5e38a56af5827d428def1ecabfdcb48a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:22:09 +0000 Subject: [PATCH 095/212] /usr/lib/pardus/pisi/api.py:166: Local variable (ignore_build) not used /usr/lib/pardus/pisi/api.py:361: (file) shadows builtin /usr/lib/pardus/pisi/api.py:465: Comparisons with False are not necessary and may not work as expected /usr/lib/pardus/pisi/api.py:516: Parameter (txn) not used /usr/lib/pardus/pisi/api.py:530: Local variable (e) not used --- pisi/api.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 2a1b2972..65b5f1a6 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -90,7 +90,6 @@ def init(database = True, write = True, ctx.stderr = stderr # FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py - import pisi.config ctx.config = pisi.config.Config(options) if signal_handling: @@ -163,8 +162,6 @@ def list_available(repo = None): return set(ctx.packagedb.list_packages(repo = repo)) def list_upgradable(): - ignore_build = ctx.get_option('ignore_build_no') - return filter(pisi.operations.is_upgradable, ctx.installdb.list_installed()) def package_graph(A, repo = pisi.itembyrepodb.installed, ignore_installed = False): @@ -358,14 +355,14 @@ def search_in_packages(terms, packages, repo = pisi.itembyrepodb.all): def check(package): md, files = info(package, True) corrupt = [] - for file in files.list: - if file.hash and file.type != "config" \ - and not os.path.islink('/' + file.path): - ctx.ui.info(_("Checking /%s ") % file.path, noln=True, verbose=True) + for f in files.list: + if f.hash and f.type != "config" \ + and not os.path.islink('/' + f.path): + ctx.ui.info(_("Checking /%s ") % f.path, noln=True, verbose=True) try: - if file.hash != pisi.util.sha1_file('/' + file.path): - corrupt.append(file) - ctx.ui.error(_("\nCorrupt file: %s") % file) + if f.hash != pisi.util.sha1_file('/' + f.path): + corrupt.append(f) + ctx.ui.error(_("\nCorrupt file: %s") % f) else: ctx.ui.info(_("OK"), verbose=True) except pisi.util.FileError,e: @@ -462,7 +459,7 @@ def rebuild_repo(repo): def rebuild_db(files=False): - assert ctx.database == False + assert not ctx.database # Bug 2596 # finds and cleans duplicate package directories under '/var/lib/pisi/package' @@ -513,7 +510,7 @@ def rebuild_db(files=False): percent = progress.update(processed), info = _("Rebuilding package database")) - def reload_indices(txn): + 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): @@ -527,7 +524,7 @@ def rebuild_db(files=False): shelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) except KeyboardInterrupt: raise - except Exception, e: #FIXME: what exception could we catch here, replace with that. + 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 @@ -543,7 +540,7 @@ def rebuild_db(files=False): clean_duplicates() txn = ctx.dbenv.txn_begin() reload_packages(files, txn) - reload_indices(txn) + reload_indices() txn.commit() ############# FIXME: this was a quick fix. ############################## From 47759e03a49dfb8aa77278b674efc6cf35ba2217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:30:17 +0000 Subject: [PATCH 096/212] atomicoperations.py:24: Imported module (pisi.packagedb) not used atomicoperations.py:25: Imported module (pisi.dependency) not used atomicoperations.py:151: Local variable (com) not used atomicoperations.py:167: (file) shadows builtin atomicoperations.py:280: (file) shadows builtin atomicoperations.py:360: (file) shadows builtin atomicoperations.py:363: (file) shadows builtin atomicoperations.py:513: Local variable (e) not used --- pisi/atomicoperations.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index e8b16f85..6a41e7c7 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -15,15 +15,12 @@ import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext -import sys import os import bsddb3.db as db import shutil import pisi import pisi.context as ctx -import pisi.packagedb as packagedb -import pisi.dependency as dependency import pisi.conflict import pisi.util as util import pisi.metadata @@ -149,7 +146,7 @@ class Install(AtomicOperation): # check comar if self.metadata.package.providesComar and ctx.comar: import pisi.comariface as comariface - com = comariface.get_comar() + comariface.get_comar() def check_relations(self): # check dependencies @@ -165,10 +162,10 @@ class Install(AtomicOperation): # check file conflicts file_conflicts = [] - for file in self.files.list: - if ctx.filesdb.has_file(file.path): - pkg, existing_file = ctx.filesdb.get_file(file.path) - dst = pisi.util.join_path(ctx.config.dest_dir(), file.path) + for f in self.files.list: + if ctx.filesdb.has_file(f.path): + pkg, existing_file = ctx.filesdb.get_file(f.path) + dst = pisi.util.join_path(ctx.config.dest_dir(), f.path) if pkg != self.pkginfo.name and not os.path.isdir(dst): file_conflicts.append( (pkg, existing_file) ) if file_conflicts: @@ -278,8 +275,8 @@ class Install(AtomicOperation): fpath = pisi.util.join_path(ctx.config.dest_dir(), config.path) if os.path.exists(fpath) and not os.path.isdir(fpath): if os.path.islink(fpath): - file = os.readlink(fpath) - if os.path.exists(file) and pisi.util.sha1_data(file) != config.hash: + f = os.readlink(fpath) + if os.path.exists(f) and pisi.util.sha1_data(f) != config.hash: changed = True else: if pisi.util.sha1_file(fpath) != config.hash: @@ -358,13 +355,13 @@ class Install(AtomicOperation): config_overlaps = newconfig & oldconfig if config_overlaps: files = filter(lambda x: x.path in config_overlaps, old) - for file in files: - check_config_changed(file) + for f in files: + check_config_changed(f) else: - for file in self.files.list: - if file.type == 'config': + for f in self.files.list: + if f.type == 'config': # there may be left over config files - check_config_changed(file) + check_config_changed(f) if self.package_fname.endswith(ctx.const.delta_package_suffix): relocate_files() @@ -511,7 +508,7 @@ class Remove(AtomicOperation): try: if pisi.util.sha1_file(fpath) == fileinfo.hash: os.unlink(fpath) - except pisi.util.FileError, e: + except pisi.util.FileError: pass else: if os.path.isfile(fpath) or os.path.islink(fpath): @@ -543,7 +540,7 @@ class Remove(AtomicOperation): def remove_db(self, txn): ctx.installdb.remove(self.package_name, txn) ctx.filesdb.remove_files(self.files, txn) - pisi.packagedb.remove_tracking_package(self.package_name, txn) + ctx.packagedb.remove_tracking_package(self.package_name, txn) def remove_single(package_name): From ec7ebd78026a755764c09f18d4ed697e477768b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:35:24 +0000 Subject: [PATCH 097/212] /usr/lib/pardus/pisi/build.py:420: Statement appears to have no effect /usr/lib/pardus/pisi/build.py:563: Parameter (build_no) not used /usr/lib/pardus/pisi/build.py:666: (file) shadows builtin /usr/lib/pardus/pisi/build.py:672: (file) shadows builtin --- pisi/build.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 661a3220..df9cb03b 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -13,7 +13,6 @@ # python standard library import os -import sys import glob import copy import stat @@ -417,7 +416,7 @@ class Builder: self.actionLocals[func]() else: if mandatory: - Error, _("unable to call function from actions: %s") %func + raise Error(_("unable to call function from actions: %s") % func) os.chdir(curDir) return True @@ -560,7 +559,7 @@ class Builder: except KeyError: pisi.util.strip_directory(install_dir) - def gen_metadata_xml(self, package, build_no=None): + def gen_metadata_xml(self, package): """Generate the metadata.xml file for build source. metadata.xml is composed of the information from specfile plus @@ -663,15 +662,15 @@ class Builder: ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn) for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()): - for file in files: - locate_old_package(pisi.util.join_path(root,file)) + for f in files: + locate_old_package(pisi.util.join_path(root,f)) outdir=ctx.get_option('output_dir') if not outdir: outdir = '.' - for file in [pisi.util.join_path(outdir,entry) for entry in os.listdir(outdir)]: - if os.path.isfile(file): - locate_old_package(file) + for f in [pisi.util.join_path(outdir,entry) for entry in os.listdir(outdir)]: + if os.path.isfile(f): + locate_old_package(f) if not found: return (1, None) From 5177de3befc473d8110975a6b67cc29bf6365e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:37:25 +0000 Subject: [PATCH 098/212] /usr/lib/pardus/pisi/config.py:85: (dir) shadows builtin --- pisi/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/config.py b/pisi/config.py index 373b2dce..93f9f061 100644 --- a/pisi/config.py +++ b/pisi/config.py @@ -82,9 +82,9 @@ class Config(object): return self.destdir def subdir(self, path): - dir = pisi.util.join_path(self.dest_dir(), path) - pisi.util.check_dir(dir) - return dir + subdir = pisi.util.join_path(self.dest_dir(), path) + pisi.util.check_dir(subdir) + return subdir def lib_dir(self): return self.subdir(self.values.dirs.lib_dir) From d6fc195d8c9bc3ef04be551589946e2f0e634c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:38:47 +0000 Subject: [PATCH 099/212] constants.py:21: Imported module (pisi) not used --- pisi/constants.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pisi/constants.py b/pisi/constants.py index 99a2aa25..a6281a9f 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -18,8 +18,6 @@ import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext -import pisi - class _constant: "Constant members implementation" class ConstError(TypeError): From c19d13aa8a04340879e916c51d68a79cea39704f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:39:35 +0000 Subject: [PATCH 100/212] dbshelve.py:41: Imported module (sys) not used dbshelve.py:42: Imported module (traceback) not used --- pisi/dbshelve.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pisi/dbshelve.py b/pisi/dbshelve.py index 78668ef0..13ffbde7 100644 --- a/pisi/dbshelve.py +++ b/pisi/dbshelve.py @@ -38,8 +38,6 @@ import cPickle import bsddb3.db as db import bsddb3.dbobj as dbobj import string -import sys -import traceback import pisi class CodingError(pisi.Error): From 77c6572c7d450768443fe7f81a7c4e087047f19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:41:31 +0000 Subject: [PATCH 101/212] /usr/lib/pardus/pisi/delta.py:77: (file) shadows builtin /usr/lib/pardus/pisi/delta.py:102: (file) shadows builtin /usr/lib/pardus/pisi/delta.py:110: (hash) shadows builtin /usr/lib/pardus/pisi/delta.py:118: (file) shadows builtin /usr/lib/pardus/pisi/delta.py:122: (file) shadows builtin /usr/lib/pardus/pisi/delta.py:126: (hash) shadows builtin --- pisi/delta.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pisi/delta.py b/pisi/delta.py index d0e81ba9..d5c1d236 100644 --- a/pisi/delta.py +++ b/pisi/delta.py @@ -74,8 +74,8 @@ def create_delta_package(old_package, new_package): ctx.build_leftover = util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma) tar = archive.ArchiveTar(util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), "tarlzma") - for file in files_delta: - tar.add_to_archive(file.path) + for f in files_delta: + tar.add_to_archive(f.path) tar.close() os.chdir(ctx.config.tmp_dir()) @@ -99,34 +99,34 @@ def create_delta_package(old_package, new_package): def find_delta(oldfiles, newfiles): hashto_files = {} - for file in newfiles.list: - hashto_files.setdefault(file.hash, []).append(file) + for f in newfiles.list: + hashto_files.setdefault(f.hash, []).append(f) files_new = sets.Set(map(lambda x:x.hash, newfiles.list)) files_old = sets.Set(map(lambda x:x.hash, oldfiles.list)) files_delta = files_new - files_old deltas = [] - for hash in files_delta: - deltas.extend(hashto_files[hash]) + for h in files_delta: + deltas.extend(hashto_files[h]) return deltas def find_relocations(oldfiles, newfiles): files_new = {} - for file in newfiles.list: - files_new.setdefault(file.hash, []).append(file) + for f in newfiles.list: + files_new.setdefault(f.hash, []).append(f) files_old = {} - for file in oldfiles.list: - files_old.setdefault(file.hash, []).append(file) + for f in oldfiles.list: + files_old.setdefault(f.hash, []).append(f) relocations = [] - for hash in files_new.keys(): - if hash and hash in files_old: - for i in range(len(files_new[hash])): - if files_old[hash][0].path != files_new[hash][i].path: - relocations.append((files_old[hash][0], files_new[hash][i])) + for h in files_new.keys(): + if h and h in files_old: + for i in range(len(files_new[h])): + if files_old[h][0].path != files_new[h][i].path: + relocations.append((files_old[h][0], files_new[h][i])) return relocations From 0d8e523a7376595277fd9a087295aa1f463d2889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:46:48 +0000 Subject: [PATCH 102/212] /usr/lib/pardus/pisi/fetcher.py:285: (file) shadows builtin /usr/lib/pardus/pisi/fetcher.py:290: (type) shadows builtin /usr/lib/pardus/pisi/fetcher.py:295: (type) shadows builtin /usr/lib/pardus/pisi/fetcher.py:329: Parameter (passwd) not used /usr/lib/pardus/pisi/fetcher.py:329: Parameter (user) not used /usr/lib/pardus/pisi/fetcher.py:358: No global (RangeableFileObject) found --- pisi/fetcher.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pisi/fetcher.py b/pisi/fetcher.py index a52fa61f..1b3422e6 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -282,17 +282,17 @@ class FTPRangeHandler(urllib2.FTPHandler): path, attrs = urllib.splitattr(req.get_selector()) dirs = path.split('/') dirs = map(urllib.unquote, dirs) - dirs, file = dirs[:-1], dirs[-1] + dirs, f = dirs[:-1], dirs[-1] if dirs and not dirs[0]: dirs = dirs[1:] try: fw = self.connect_ftp('', '', host, port, dirs) - type = file and 'I' or 'D' + t = f and 'I' or 'D' for attr in attrs: attr, value = urllib.splitattr(attr) if attr.lower() == 'type' and \ value in ('a', 'A', 'i', 'I', 'd', 'D'): - type = value.upper() + t = value.upper() rawr = req.headers.get('Range', None) if rawr: @@ -300,7 +300,7 @@ class FTPRangeHandler(urllib2.FTPHandler): else: rest = 0 - fp, retrlen = fw.retrfile(file, type, rest) + fp, retrlen = fw.retrfile(f, t, rest) fb, lb = rest, retrlen if retrlen is None or retrlen == 0: @@ -327,7 +327,7 @@ class FTPRangeHandler(urllib2.FTPHandler): raise IOError, (_('ftp error'), msg), sys.exc_info()[2] def connect_ftp(self, user, passwd, host, port, dirs): - fw = ftpwrapper('', '', host, port, dirs) + fw = ftpwrapper(user, passwd, host, port, dirs) return fw class ftpwrapper(urllib.ftpwrapper): @@ -355,6 +355,7 @@ class ftpwrapper(urllib.ftpwrapper): if str(reason)[:3] == '501': # workaround for REST not suported error fp, retrlen = self.retrfile(file, type) + # WTF? No global (RangeableFileObject) found. RangeableFileObject only defined in urlgrabber / caglar fp = RangeableFileObject(fp, (rest,'')) return (fp, retrlen) elif str(reason)[:3] != '550': From 70c07c1ce267fd207ad5585c50ac630d9457f671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:47:29 +0000 Subject: [PATCH 103/212] /usr/lib/pardus/pisi/graph.py:47: (list) shadows builtin --- pisi/graph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/graph.py b/pisi/graph.py index 1bffe0f1..e55dd671 100644 --- a/pisi/graph.py +++ b/pisi/graph.py @@ -44,11 +44,11 @@ class Digraph(object): def edges(self): "return a list of edge descriptors" - list = [] + l = [] for u in self.__v: for v in self.__adj[u]: - list.append( (u,v) ) - return list + l.append( (u,v) ) + return l def from_list(self, el): "convert a list of edges (u,v) to graph" From 06129edbc193b0d769fe35edcf5f98500fe478a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:49:19 +0000 Subject: [PATCH 104/212] index.py:26: Imported module (pisi.packagedb) not used index.py:27: Imported module (pisi.sourcedb) not used index.py:34: Module (pisi.specfile) re-imported --- pisi/index.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pisi/index.py b/pisi/index.py index 279a9394..534089a2 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -23,15 +23,12 @@ import pisi import pisi.context as ctx import pisi.specfile as specfile import pisi.metadata as metadata -import pisi.packagedb as packagedb -import pisi.sourcedb as sourcedb import pisi.util as util import pisi.package import pisi.pxml.xmlfile as xmlfile import pisi.file import pisi.pxml.autoxml as autoxml import pisi.component as component -import pisi.specfile as specfile class Error(pisi.Error): pass From 7483fec2060cb2c152fa09074d955849408cc077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:51:59 +0000 Subject: [PATCH 105/212] /usr/lib/pardus/pisi/installdb.py:113: (list) shadows builtin /usr/lib/pardus/pisi/installdb.py:122: (dict) shadows builtin installdb.py:17: Imported module (os) not used installdb.py:18: Imported module (fcntl) not used --- pisi/installdb.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pisi/installdb.py b/pisi/installdb.py index 6c826085..6ef21efa 100644 --- a/pisi/installdb.py +++ b/pisi/installdb.py @@ -13,10 +13,6 @@ # installation database # -# System -import os -import fcntl - import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext @@ -110,20 +106,20 @@ class InstallDB: def list_installed(self, txn = None): def proc(txn): - list = [] + l = [] for (pkg, info) in self.d.items(txn): if info.state=='i' or info.state=='ip': - list.append(pkg) - return list + l.append(pkg) + return l return self.d.txn_proc(proc, txn) def list_pending(self): # warning: reads the entire db - dict = {} + d = {} for (pkg, x) in self.dp.items(): pkginfo = self.d[pkg] - dict[pkg] = pkginfo - return dict + d[pkg] = pkginfo + return d def get_info(self, pkg): pkg = str(pkg) From 289b2e2b51d889358c08760cf55ba0fe3936098b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:53:19 +0000 Subject: [PATCH 106/212] /usr/lib/pardus/pisi/itembyrepodb.py:93: Local variable (pisi) not used itembyrepodb.py:13: Imported module (os) not used itembyrepodb.py:14: Imported module (fcntl) not used itembyrepodb.py:15: Imported module (types) not used itembyrepodb.py:22: Imported module (pisi.util) not used --- pisi/itembyrepodb.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pisi/itembyrepodb.py b/pisi/itembyrepodb.py index f010a15b..ed59b29b 100644 --- a/pisi/itembyrepodb.py +++ b/pisi/itembyrepodb.py @@ -10,16 +10,11 @@ # Please read the COPYING file. # -import os -import fcntl -import types - import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi -import pisi.util as util import pisi.context as ctx import pisi.lockeddbshelve as shelve @@ -90,7 +85,6 @@ class ItemByRepoDB(object): if repo == None: repo = repos assert repo in [all, repos] - import pisi.repodb order = [ 'repo-' + x for x in ctx.repodb.list() ] if repo == all: order += ['trdparty', 'inst'] From d0e9a88aeb05576df1f27a19ddca7aa95efa17c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sun, 13 May 2007 23:59:41 +0000 Subject: [PATCH 107/212] /usr/lib/pardus/pisi/operations.py:249: Comparisons with False are not necessary and may not work as expected /usr/lib/pardus/pisi/operations.py:284: Local variable (e) not used /usr/lib/pardus/pisi/operations.py:516: Parameter (ignore_build) not used /usr/lib/pardus/pisi/operations.py:644: Local variable (pkg) not used /usr/lib/pardus/pisi/operations.py:743: Parameter (rebuild_all) not used operations.py:27: Imported module (pisi.packagedb) not used --- pisi/operations.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index 6829a945..2f1d87bf 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -24,7 +24,6 @@ import pisi.util as util import pisi.dependency as dependency import pisi.conflict import pisi.pgraph as pgraph -import pisi.packagedb as packagedb import pisi.repodb import pisi.installdb import pisi.cli @@ -246,7 +245,7 @@ def calculate_conflicts(order, packagedb): return (C, D, pkg_conflicts) def remove_conflicting_packages(conflicts): - if remove(conflicts, ignore_dep=True, ignore_safety=True) == False: + if not remove(conflicts, ignore_dep=True, ignore_safety=True): raise Error(_("Conflicts remain")) def check_conflicts(order, packagedb): @@ -281,7 +280,7 @@ def is_upgradable(name, ignore_build = False): pkg = ctx.packagedb.get_package(name) except KeyboardInterrupt: raise - except Exception, e: #FIXME: what exception could we catch here, replace with that. + 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) @@ -303,7 +302,7 @@ def upgrade_base(A = set(), ignore_package_conflicts = False): if extra_upgrades: ctx.ui.warning(_('Safety switch: Following packages in system.base will be upgraded: ') + util.strlist(extra_upgrades)) - G_f, upgrade_order = plan_upgrade(extra_upgrades, ignore_build) + G_f, upgrade_order = plan_upgrade(extra_upgrades) # return packages that must be added to any installation return set(install_order + upgrade_order) else: @@ -465,7 +464,7 @@ def upgrade_pkg_names(A = []): ctx.ui.debug('A = %s' % str(A)) if not ctx.config.get_option('ignore_dependency'): - G_f, order = plan_upgrade(A, ignore_build) + G_f, order = plan_upgrade(A) else: G_f = None order = list(A) @@ -513,7 +512,7 @@ def upgrade_pkg_names(A = []): if 'pisi' in order: upgrade_pisi() -def plan_upgrade(A, ignore_build = False): +def plan_upgrade(A): # try to construct a pisi graph of packages to # install / reinstall @@ -641,7 +640,6 @@ def plan_remove(A): while len(B) > 0: Bp = set() for x in B: - pkg = ctx.packagedb.get_package(x, pisi.itembyrepodb.installed) rev_deps = ctx.packagedb.get_rev_deps(x, pisi.itembyrepodb.installed) for (rev_dep, depinfo) in rev_deps: # we don't deal with uninstalled rev deps @@ -666,7 +664,7 @@ def expand_src_components(A): Ap.add(x) return Ap -def emerge(A, rebuild_all = False): +def emerge(A): # A was a list, remove duplicates and expand components A = [str(x) for x in A] @@ -682,7 +680,7 @@ def emerge(A, rebuild_all = False): # FIXME: Errr... order_build changes type conditionally and this # is not good. - baris if not ctx.config.get_option('ignore_dependency'): - G_f, order_inst, order_build = plan_emerge(A, rebuild_all) + G_f, order_inst, order_build = plan_emerge(A) else: G_f = None order_inst = [] @@ -723,7 +721,7 @@ installed in the respective order to satisfy dependencies: if 'pisi' in order_build or (('pisi' in U) and pisi_installed): upgrade_pisi() -def plan_emerge(A, rebuild_all): +def plan_emerge(A): # try to construct a pisi graph of packages to # install / reinstall From ce0dd923dcc949561a04cc2ba33fb5304e5c2fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:01:36 +0000 Subject: [PATCH 108/212] /usr/lib/pardus/pisi/packagedb.py:64: Local variable (e) not used packagedb.py:20: Imported module (os) not used packagedb.py:21: Imported module (fcntl) not used packagedb.py:22: Imported module (types) not used packagedb.py:29: Imported module (pisi.util) not used packagedb.py:31: Imported module (pisi.lockeddbshelve) not used --- pisi/packagedb.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pisi/packagedb.py b/pisi/packagedb.py index 8f557bd4..5e9d7686 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -17,18 +17,12 @@ we basically store everything in PackageInfo class yes, we are cheap """ -import os -import fcntl -import types - import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi -import pisi.util as util import pisi.context as ctx -import pisi.lockeddbshelve as shelve import pisi.itembyrepodb class Error(pisi.Error): @@ -61,7 +55,7 @@ class PackageDB(object): def get_package(self, name, repo=None, txn = None): try: return self.d.get_item(name, repo, txn=txn) - except pisi.itembyrepodb.NotfoundError, e: + except pisi.itembyrepodb.NotfoundError: raise Error(_('Package %s not found') % name) def get_package_repo(self, name, repo=None, txn = None): From 27c20335ac77e7acfc6a2d2676f9bb1264a8737d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:02:19 +0000 Subject: [PATCH 109/212] komik --- pisi/pgraph.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pisi/pgraph.py b/pisi/pgraph.py index 52894096..05181e46 100644 --- a/pisi/pgraph.py +++ b/pisi/pgraph.py @@ -76,6 +76,7 @@ class PGraph(graph.Digraph): pkg2 = self.packagedb.get_package(conflinfo.package, self.repo) pkg2data = (pkg2.version, pkg2.release) + # FIXME: WTF? /usr/lib/pardus/pisi/pgraph.py:80: Invalid arguments to (add_biedge), got 5, expected between 2 and 3 / caglar self.add_biedge(str(pkg), str(conflinfo.package), ('c', conflinfo) , pkg1data, pkg2data ) From 251d148bb80de750a46b937d0ad653b46f2914f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:02:59 +0000 Subject: [PATCH 110/212] repodb.py:13: Imported module (fcntl) not used repodb.py:13: Imported module (os) not used repodb.py:22: Imported module (pisi.packagedb) not used repodb.py:23: Imported module (pisi.util) not used --- pisi/repodb.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pisi/repodb.py b/pisi/repodb.py index c5276aa7..752e9604 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -10,8 +10,6 @@ # Please read the COPYING file. # -import os, fcntl - import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext @@ -19,8 +17,6 @@ _ = __trans.ugettext import pisi import pisi.lockeddbshelve as shelve import pisi.context as ctx -import pisi.packagedb as packagedb -import pisi.util as util class Error(pisi.Error): pass From 19155e266883df6ac1d4b8e3a9fddeb0df5fd8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:03:33 +0000 Subject: [PATCH 111/212] repodb.py:100: (list) shadows builtin --- pisi/repodb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/repodb.py b/pisi/repodb.py index 752e9604..f6676115 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -97,9 +97,9 @@ class RepoDB(object): name = str(name) def proc(txn): self.d.delete("repo-" + name, txn) - list = self.d.get("order", txn) - list.remove(name) - self.d.put("order", list, txn) + l = self.d.get("order", txn) + l.remove(name) + self.d.put("order", l, txn) ctx.packagedb.remove_repo(name, txn=txn) ctx.sourcedb.remove_repo(name, txn=txn) ctx.componentdb.remove_repo(name, txn=txn) From efcbaeac3b60cb34080013d517ba52006d8a7865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:04:32 +0000 Subject: [PATCH 112/212] /usr/lib/pardus/pisi/sourcedb.py:58: Local variable (e) not used /usr/lib/pardus/pisi/sourcedb.py:64: Local variable (e) not used sourcedb.py:23: Imported module (os) not used sourcedb.py:24: Imported module (fcntl) not used sourcedb.py:30: Imported module (pisi.util) not used sourcedb.py:32: Imported module (pisi.lockeddbshelve) not used --- pisi/sourcedb.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py index 593fb5ae..3c6e1fcf 100644 --- a/pisi/sourcedb.py +++ b/pisi/sourcedb.py @@ -20,16 +20,11 @@ store a set of repositories in which the source appears. the actual guy to take is determined from the repo order. """ -import os -import fcntl - import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext -import pisi.util as util import pisi.context as ctx -import pisi.lockeddbshelve as shelve import pisi.repodb import pisi.itembyrepodb @@ -55,13 +50,13 @@ class SourceDB(object): def get_spec(self, name, repo=None, txn = None): try: return self.d.get_item(name, repo, txn) - except pisi.itembyrepodb.NotfoundError, e: + except pisi.itembyrepodb.NotfoundError: raise NotfoundError(_("Source package %s not found") % name) def get_spec_repo(self, name, repo=None, txn = None): try: return self.d.get_item_repo(name, repo, txn) - except pisi.itembyrepodb.NotfoundError, e: + except pisi.itembyrepodb.NotfoundError: raise NotfoundError(_("Source package %s not found") % name) def pkgtosrc(self, name, txn = None): From 18f873c621b5657753366d6c56596ca4323e08e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:05:19 +0000 Subject: [PATCH 113/212] ui.py:15: Imported module (sys) not used ui.py:17: Imported module (pisi) not used ui.py:18: Imported module (pisi.context) not used --- pisi/ui.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pisi/ui.py b/pisi/ui.py index 9973a3df..93750bf2 100644 --- a/pisi/ui.py +++ b/pisi/ui.py @@ -12,11 +12,6 @@ # generic user interface # -import sys - -import pisi -import pisi.context as ctx - (installed, upgraded, removed, installing, removing, configuring, configured, extracting, downloading, packagestogo, updatingrepo, cached) = range(12) From 834e8d74629642bf80ddc5deadef42e7e67353b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:07:12 +0000 Subject: [PATCH 114/212] /usr/lib/pardus/pisi/util.py:75: Invalid arguments to (map), got 1, expected at least 2 /usr/lib/pardus/pisi/util.py:271: (dir) shadows builtin /usr/lib/pardus/pisi/util.py:396: (dir) shadows builtin /usr/lib/pardus/pisi/util.py:458: Local variable (e) not used /usr/lib/pardus/pisi/util.py:613: Using is , may not always work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pıhh --- pisi/util.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pisi/util.py b/pisi/util.py index 1b1e17b0..b1cc27d3 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -72,7 +72,7 @@ def multisplit(str, chars): """Split str with any of the chars.""" l = [str] for c in chars: - l = concat(map(lambda x:x.split(c), l)) + l = concat(map(lambda x:x.split(c)), l) return l def same(l): @@ -265,12 +265,12 @@ def check_file(file, mode = os.F_OK): return True # FIXME: check_dir is not a good name considering it can also create the dir -def check_dir(dir): +def check_dir(d): """Make sure given directory path exists.""" # FIXME: What is first strip doing there? - dir = dir.strip().rstrip("/") - if not os.access(dir, os.F_OK): - os.makedirs(dir) + d = d.strip().rstrip("/") + if not os.access(d, os.F_OK): + os.makedirs(d) def clean_dir(path): """Remove all content of a directory.""" @@ -393,8 +393,8 @@ def get_file_hashes(top, excludePrefix=None, removePrefix=None): continue #bug 397 - for dir in dirs: - d = join_path(root, dir) + for directory in dirs: + d = join_path(root, directory) if os.path.islink(d) and not has_excluded_prefix(d): yield (d, sha1_sum(os.readlink(d), True)) excludePrefix.append(remove_prefix(removePrefix, d) + "/") @@ -455,7 +455,7 @@ def sha1_data(data): return m.hexdigest() except KeyboardInterrupt: raise - except Exception, e: #FIXME: what exception could we catch here, replace with that. + except Exception: #FIXME: what exception could we catch here, replace with that. raise Error(_("Cannot calculate SHA1 hash of given data")) def uncompress(patchFile, compressType="gz", targetDir=None): @@ -607,10 +607,9 @@ def is_package_name(fn, package_name = None): # get version string, skip separator '-' verstr = fn[len(package_name) + 1: len(fn)-len(ctx.const.package_suffix)] - import string for x in verstr.split('-'): # weak rule: version components after '-' start with a digit - if x is '' or (not x[0] in string.digits): + if x == '' or (not x[0] in string.digits): return False return True return False From 23665371b0f82037051ade1c8fec21b6651289c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:14:28 +0000 Subject: [PATCH 115/212] list/shadow/cmp/dir shadows builtin --- pisi/cli/commands.py | 50 +++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 2048a6f3..ace7d6ad 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -99,9 +99,9 @@ class Command(object): @staticmethod def commands_string(): s = '' - list = [x.name[0] for x in Command.cmd] - list.sort() - for name in list: + l = [x.name[0] for x in Command.cmd] + l.sort() + for name in l: commandcls = Command.cmd_dict[name] trans = gettext.translation('pisi', fallback=True) summary = trans.ugettext(commandcls.__doc__).split('\n')[0] @@ -173,12 +173,12 @@ class Command(object): # make destdir absolute if self.options.destdir: - dir = str(self.options.destdir) + d = str(self.options.destdir) import os.path - if not os.path.exists(dir): - pisi.cli.printu(_('Destination directory %s does not exist. Creating directory.\n') % dir) - os.makedirs(dir) - self.options.destdir = os.path.realpath(dir) + if not os.path.exists(d): + pisi.cli.printu(_('Destination directory %s does not exist. Creating directory.\n') % d) + os.makedirs(d) + self.options.destdir = os.path.realpath(d) def check_auth_info(self): username = self.options.username @@ -528,7 +528,7 @@ and creates a delta pisi package with the changed files between two releases. self.init(database=False, write=False) - if len(self.args) is not 2: + if len(self.args) != 2: self.help() return @@ -728,9 +728,9 @@ expanded to package names. import os patterns = [] - file = ctx.get_option('exclude_from') - if os.path.exists(file): - for line in open(file, "r").readlines(): + f = ctx.get_option('exclude_from') + if os.path.exists(f): + for line in open(f, "r").readlines(): if not line.startswith('#') and not line == '\n': patterns.append(line.strip()) if patterns: @@ -750,8 +750,8 @@ expanded to package names. if not match: # match pattern in component names - for cmp in fnmatch.filter(ctx.componentdb.list_components(), pattern): - packages = packages - set(ctx.componentdb.get_union_packages(cmp, walk=True)) + for compare in fnmatch.filter(ctx.componentdb.list_components(), pattern): + packages = packages - set(ctx.componentdb.get_union_packages(compare, walk=True)) return list(packages) @@ -966,8 +966,6 @@ Usage: info ... ctx.ui.info(_("%s is not installed") % arg) def print_pkginfo(self, metadata, files, repo = None): - import os.path - if ctx.get_option('short'): pkg = metadata.package ctx.ui.info('%15s - %s' % (pkg.name, unicode(pkg.summary))) @@ -1381,12 +1379,12 @@ all repositories. component = ctx.get_option('component') if component: - list = ctx.componentdb.get_packages(component, walk=True, repo=repo) + l = ctx.componentdb.get_packages(component, walk=True, repo=repo) else: - list = ctx.packagedb.list_packages(repo) + l = ctx.packagedb.list_packages(repo) installed_list = ctx.installdb.list_installed() - list.sort() - for p in list: + l.sort() + for p in l: package = ctx.packagedb.get_package(p) if self.options.long: ctx.ui.info(unicode(package)) @@ -1424,9 +1422,9 @@ repositories. self.init(database = True, write = False) - list = ctx.componentdb.list_components() - list.sort() - for p in list: + l = ctx.componentdb.list_components() + l.sort() + for p in l: component = ctx.componentdb.get_component(p) if self.options.long: ctx.ui.info(unicode(component)) @@ -1463,9 +1461,9 @@ Gives a brief list of sources published in the repositories. self.init(database = True, write = False) - list = ctx.sourcedb.list() - list.sort() - for p in list: + l = ctx.sourcedb.list() + l.sort() + for p in l: sf, repo = ctx.sourcedb.get_spec_repo(p) if self.options.long: ctx.ui.info('[Repository: ' + repo + ']') From c448264e12840998c0f8c74b8e93b4edf7217a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 00:19:20 +0000 Subject: [PATCH 116/212] =?UTF-8?q?yanl=C4=B1=C5=9F=20yere=20commit=20etmi?= =?UTF-8?q?=C5=9Fim=20catbox=20alt=C4=B1nda=20deneyip=20daha=20sonra=20mer?= =?UTF-8?q?ge=20etmek=20istiyordum,=20komple=20geri=20al=C4=B1yorum=20:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/api.py | 25 +++++++++++--------- pisi/atomicoperations.py | 31 ++++++++++++++----------- pisi/build.py | 15 ++++++------ pisi/cli/commands.py | 50 +++++++++++++++++++++------------------- pisi/config.py | 6 ++--- pisi/constants.py | 2 ++ pisi/dbshelve.py | 2 ++ pisi/delta.py | 30 ++++++++++++------------ pisi/fetcher.py | 11 ++++----- pisi/graph.py | 6 ++--- pisi/index.py | 3 +++ pisi/installdb.py | 16 ++++++++----- pisi/itembyrepodb.py | 6 +++++ pisi/operations.py | 18 ++++++++------- pisi/packagedb.py | 8 ++++++- pisi/pgraph.py | 1 - pisi/repodb.py | 10 +++++--- pisi/sourcedb.py | 9 ++++++-- pisi/ui.py | 5 ++++ pisi/util.py | 19 +++++++-------- 20 files changed, 160 insertions(+), 113 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 65b5f1a6..2a1b2972 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -90,6 +90,7 @@ def init(database = True, write = True, ctx.stderr = stderr # FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py + import pisi.config ctx.config = pisi.config.Config(options) if signal_handling: @@ -162,6 +163,8 @@ def list_available(repo = None): return set(ctx.packagedb.list_packages(repo = repo)) def list_upgradable(): + ignore_build = ctx.get_option('ignore_build_no') + return filter(pisi.operations.is_upgradable, ctx.installdb.list_installed()) def package_graph(A, repo = pisi.itembyrepodb.installed, ignore_installed = False): @@ -355,14 +358,14 @@ def search_in_packages(terms, packages, repo = pisi.itembyrepodb.all): def check(package): md, files = info(package, True) corrupt = [] - for f in files.list: - if f.hash and f.type != "config" \ - and not os.path.islink('/' + f.path): - ctx.ui.info(_("Checking /%s ") % f.path, noln=True, verbose=True) + for file in files.list: + if file.hash and file.type != "config" \ + and not os.path.islink('/' + file.path): + ctx.ui.info(_("Checking /%s ") % file.path, noln=True, verbose=True) try: - if f.hash != pisi.util.sha1_file('/' + f.path): - corrupt.append(f) - ctx.ui.error(_("\nCorrupt file: %s") % f) + if file.hash != pisi.util.sha1_file('/' + file.path): + corrupt.append(file) + ctx.ui.error(_("\nCorrupt file: %s") % file) else: ctx.ui.info(_("OK"), verbose=True) except pisi.util.FileError,e: @@ -459,7 +462,7 @@ def rebuild_repo(repo): def rebuild_db(files=False): - assert not ctx.database + assert ctx.database == False # Bug 2596 # finds and cleans duplicate package directories under '/var/lib/pisi/package' @@ -510,7 +513,7 @@ def rebuild_db(files=False): percent = progress.update(processed), info = _("Rebuilding package database")) - def reload_indices(): + def reload_indices(txn): 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): @@ -524,7 +527,7 @@ def rebuild_db(files=False): shelve.check_dbversion('filesdbversion', pisi.__filesdbversion__, write=False) except KeyboardInterrupt: raise - except Exception: #FIXME: what exception could we catch here, replace with that. + except Exception, e: #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 @@ -540,7 +543,7 @@ def rebuild_db(files=False): clean_duplicates() txn = ctx.dbenv.txn_begin() reload_packages(files, txn) - reload_indices() + reload_indices(txn) txn.commit() ############# FIXME: this was a quick fix. ############################## diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 6a41e7c7..e8b16f85 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -15,12 +15,15 @@ import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import sys import os import bsddb3.db as db import shutil import pisi import pisi.context as ctx +import pisi.packagedb as packagedb +import pisi.dependency as dependency import pisi.conflict import pisi.util as util import pisi.metadata @@ -146,7 +149,7 @@ class Install(AtomicOperation): # check comar if self.metadata.package.providesComar and ctx.comar: import pisi.comariface as comariface - comariface.get_comar() + com = comariface.get_comar() def check_relations(self): # check dependencies @@ -162,10 +165,10 @@ class Install(AtomicOperation): # check file conflicts file_conflicts = [] - for f in self.files.list: - if ctx.filesdb.has_file(f.path): - pkg, existing_file = ctx.filesdb.get_file(f.path) - dst = pisi.util.join_path(ctx.config.dest_dir(), f.path) + for file in self.files.list: + if ctx.filesdb.has_file(file.path): + pkg, existing_file = ctx.filesdb.get_file(file.path) + dst = pisi.util.join_path(ctx.config.dest_dir(), file.path) if pkg != self.pkginfo.name and not os.path.isdir(dst): file_conflicts.append( (pkg, existing_file) ) if file_conflicts: @@ -275,8 +278,8 @@ class Install(AtomicOperation): fpath = pisi.util.join_path(ctx.config.dest_dir(), config.path) if os.path.exists(fpath) and not os.path.isdir(fpath): if os.path.islink(fpath): - f = os.readlink(fpath) - if os.path.exists(f) and pisi.util.sha1_data(f) != config.hash: + file = os.readlink(fpath) + if os.path.exists(file) and pisi.util.sha1_data(file) != config.hash: changed = True else: if pisi.util.sha1_file(fpath) != config.hash: @@ -355,13 +358,13 @@ class Install(AtomicOperation): config_overlaps = newconfig & oldconfig if config_overlaps: files = filter(lambda x: x.path in config_overlaps, old) - for f in files: - check_config_changed(f) + for file in files: + check_config_changed(file) else: - for f in self.files.list: - if f.type == 'config': + for file in self.files.list: + if file.type == 'config': # there may be left over config files - check_config_changed(f) + check_config_changed(file) if self.package_fname.endswith(ctx.const.delta_package_suffix): relocate_files() @@ -508,7 +511,7 @@ class Remove(AtomicOperation): try: if pisi.util.sha1_file(fpath) == fileinfo.hash: os.unlink(fpath) - except pisi.util.FileError: + except pisi.util.FileError, e: pass else: if os.path.isfile(fpath) or os.path.islink(fpath): @@ -540,7 +543,7 @@ class Remove(AtomicOperation): def remove_db(self, txn): ctx.installdb.remove(self.package_name, txn) ctx.filesdb.remove_files(self.files, txn) - ctx.packagedb.remove_tracking_package(self.package_name, txn) + pisi.packagedb.remove_tracking_package(self.package_name, txn) def remove_single(package_name): diff --git a/pisi/build.py b/pisi/build.py index df9cb03b..661a3220 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -13,6 +13,7 @@ # python standard library import os +import sys import glob import copy import stat @@ -416,7 +417,7 @@ class Builder: self.actionLocals[func]() else: if mandatory: - raise Error(_("unable to call function from actions: %s") % func) + Error, _("unable to call function from actions: %s") %func os.chdir(curDir) return True @@ -559,7 +560,7 @@ class Builder: except KeyError: pisi.util.strip_directory(install_dir) - def gen_metadata_xml(self, package): + def gen_metadata_xml(self, package, build_no=None): """Generate the metadata.xml file for build source. metadata.xml is composed of the information from specfile plus @@ -662,15 +663,15 @@ class Builder: ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn) for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()): - for f in files: - locate_old_package(pisi.util.join_path(root,f)) + for file in files: + locate_old_package(pisi.util.join_path(root,file)) outdir=ctx.get_option('output_dir') if not outdir: outdir = '.' - for f in [pisi.util.join_path(outdir,entry) for entry in os.listdir(outdir)]: - if os.path.isfile(f): - locate_old_package(f) + for file in [pisi.util.join_path(outdir,entry) for entry in os.listdir(outdir)]: + if os.path.isfile(file): + locate_old_package(file) if not found: return (1, None) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index ace7d6ad..2048a6f3 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -99,9 +99,9 @@ class Command(object): @staticmethod def commands_string(): s = '' - l = [x.name[0] for x in Command.cmd] - l.sort() - for name in l: + list = [x.name[0] for x in Command.cmd] + list.sort() + for name in list: commandcls = Command.cmd_dict[name] trans = gettext.translation('pisi', fallback=True) summary = trans.ugettext(commandcls.__doc__).split('\n')[0] @@ -173,12 +173,12 @@ class Command(object): # make destdir absolute if self.options.destdir: - d = str(self.options.destdir) + dir = str(self.options.destdir) import os.path - if not os.path.exists(d): - pisi.cli.printu(_('Destination directory %s does not exist. Creating directory.\n') % d) - os.makedirs(d) - self.options.destdir = os.path.realpath(d) + if not os.path.exists(dir): + pisi.cli.printu(_('Destination directory %s does not exist. Creating directory.\n') % dir) + os.makedirs(dir) + self.options.destdir = os.path.realpath(dir) def check_auth_info(self): username = self.options.username @@ -528,7 +528,7 @@ and creates a delta pisi package with the changed files between two releases. self.init(database=False, write=False) - if len(self.args) != 2: + if len(self.args) is not 2: self.help() return @@ -728,9 +728,9 @@ expanded to package names. import os patterns = [] - f = ctx.get_option('exclude_from') - if os.path.exists(f): - for line in open(f, "r").readlines(): + file = ctx.get_option('exclude_from') + if os.path.exists(file): + for line in open(file, "r").readlines(): if not line.startswith('#') and not line == '\n': patterns.append(line.strip()) if patterns: @@ -750,8 +750,8 @@ expanded to package names. if not match: # match pattern in component names - for compare in fnmatch.filter(ctx.componentdb.list_components(), pattern): - packages = packages - set(ctx.componentdb.get_union_packages(compare, walk=True)) + for cmp in fnmatch.filter(ctx.componentdb.list_components(), pattern): + packages = packages - set(ctx.componentdb.get_union_packages(cmp, walk=True)) return list(packages) @@ -966,6 +966,8 @@ Usage: info ... ctx.ui.info(_("%s is not installed") % arg) def print_pkginfo(self, metadata, files, repo = None): + import os.path + if ctx.get_option('short'): pkg = metadata.package ctx.ui.info('%15s - %s' % (pkg.name, unicode(pkg.summary))) @@ -1379,12 +1381,12 @@ all repositories. component = ctx.get_option('component') if component: - l = ctx.componentdb.get_packages(component, walk=True, repo=repo) + list = ctx.componentdb.get_packages(component, walk=True, repo=repo) else: - l = ctx.packagedb.list_packages(repo) + list = ctx.packagedb.list_packages(repo) installed_list = ctx.installdb.list_installed() - l.sort() - for p in l: + list.sort() + for p in list: package = ctx.packagedb.get_package(p) if self.options.long: ctx.ui.info(unicode(package)) @@ -1422,9 +1424,9 @@ repositories. self.init(database = True, write = False) - l = ctx.componentdb.list_components() - l.sort() - for p in l: + list = ctx.componentdb.list_components() + list.sort() + for p in list: component = ctx.componentdb.get_component(p) if self.options.long: ctx.ui.info(unicode(component)) @@ -1461,9 +1463,9 @@ Gives a brief list of sources published in the repositories. self.init(database = True, write = False) - l = ctx.sourcedb.list() - l.sort() - for p in l: + list = ctx.sourcedb.list() + list.sort() + for p in list: sf, repo = ctx.sourcedb.get_spec_repo(p) if self.options.long: ctx.ui.info('[Repository: ' + repo + ']') diff --git a/pisi/config.py b/pisi/config.py index 93f9f061..373b2dce 100644 --- a/pisi/config.py +++ b/pisi/config.py @@ -82,9 +82,9 @@ class Config(object): return self.destdir def subdir(self, path): - subdir = pisi.util.join_path(self.dest_dir(), path) - pisi.util.check_dir(subdir) - return subdir + dir = pisi.util.join_path(self.dest_dir(), path) + pisi.util.check_dir(dir) + return dir def lib_dir(self): return self.subdir(self.values.dirs.lib_dir) diff --git a/pisi/constants.py b/pisi/constants.py index a6281a9f..99a2aa25 100644 --- a/pisi/constants.py +++ b/pisi/constants.py @@ -18,6 +18,8 @@ import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi + class _constant: "Constant members implementation" class ConstError(TypeError): diff --git a/pisi/dbshelve.py b/pisi/dbshelve.py index 13ffbde7..78668ef0 100644 --- a/pisi/dbshelve.py +++ b/pisi/dbshelve.py @@ -38,6 +38,8 @@ import cPickle import bsddb3.db as db import bsddb3.dbobj as dbobj import string +import sys +import traceback import pisi class CodingError(pisi.Error): diff --git a/pisi/delta.py b/pisi/delta.py index d5c1d236..d0e81ba9 100644 --- a/pisi/delta.py +++ b/pisi/delta.py @@ -74,8 +74,8 @@ def create_delta_package(old_package, new_package): ctx.build_leftover = util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma) tar = archive.ArchiveTar(util.join_path(ctx.config.tmp_dir(), ctx.const.install_tar_lzma), "tarlzma") - for f in files_delta: - tar.add_to_archive(f.path) + for file in files_delta: + tar.add_to_archive(file.path) tar.close() os.chdir(ctx.config.tmp_dir()) @@ -99,34 +99,34 @@ def create_delta_package(old_package, new_package): def find_delta(oldfiles, newfiles): hashto_files = {} - for f in newfiles.list: - hashto_files.setdefault(f.hash, []).append(f) + for file in newfiles.list: + hashto_files.setdefault(file.hash, []).append(file) files_new = sets.Set(map(lambda x:x.hash, newfiles.list)) files_old = sets.Set(map(lambda x:x.hash, oldfiles.list)) files_delta = files_new - files_old deltas = [] - for h in files_delta: - deltas.extend(hashto_files[h]) + for hash in files_delta: + deltas.extend(hashto_files[hash]) return deltas def find_relocations(oldfiles, newfiles): files_new = {} - for f in newfiles.list: - files_new.setdefault(f.hash, []).append(f) + for file in newfiles.list: + files_new.setdefault(file.hash, []).append(file) files_old = {} - for f in oldfiles.list: - files_old.setdefault(f.hash, []).append(f) + for file in oldfiles.list: + files_old.setdefault(file.hash, []).append(file) relocations = [] - for h in files_new.keys(): - if h and h in files_old: - for i in range(len(files_new[h])): - if files_old[h][0].path != files_new[h][i].path: - relocations.append((files_old[h][0], files_new[h][i])) + for hash in files_new.keys(): + if hash and hash in files_old: + for i in range(len(files_new[hash])): + if files_old[hash][0].path != files_new[hash][i].path: + relocations.append((files_old[hash][0], files_new[hash][i])) return relocations diff --git a/pisi/fetcher.py b/pisi/fetcher.py index 1b3422e6..a52fa61f 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -282,17 +282,17 @@ class FTPRangeHandler(urllib2.FTPHandler): path, attrs = urllib.splitattr(req.get_selector()) dirs = path.split('/') dirs = map(urllib.unquote, dirs) - dirs, f = dirs[:-1], dirs[-1] + dirs, file = dirs[:-1], dirs[-1] if dirs and not dirs[0]: dirs = dirs[1:] try: fw = self.connect_ftp('', '', host, port, dirs) - t = f and 'I' or 'D' + type = file and 'I' or 'D' for attr in attrs: attr, value = urllib.splitattr(attr) if attr.lower() == 'type' and \ value in ('a', 'A', 'i', 'I', 'd', 'D'): - t = value.upper() + type = value.upper() rawr = req.headers.get('Range', None) if rawr: @@ -300,7 +300,7 @@ class FTPRangeHandler(urllib2.FTPHandler): else: rest = 0 - fp, retrlen = fw.retrfile(f, t, rest) + fp, retrlen = fw.retrfile(file, type, rest) fb, lb = rest, retrlen if retrlen is None or retrlen == 0: @@ -327,7 +327,7 @@ class FTPRangeHandler(urllib2.FTPHandler): raise IOError, (_('ftp error'), msg), sys.exc_info()[2] def connect_ftp(self, user, passwd, host, port, dirs): - fw = ftpwrapper(user, passwd, host, port, dirs) + fw = ftpwrapper('', '', host, port, dirs) return fw class ftpwrapper(urllib.ftpwrapper): @@ -355,7 +355,6 @@ class ftpwrapper(urllib.ftpwrapper): if str(reason)[:3] == '501': # workaround for REST not suported error fp, retrlen = self.retrfile(file, type) - # WTF? No global (RangeableFileObject) found. RangeableFileObject only defined in urlgrabber / caglar fp = RangeableFileObject(fp, (rest,'')) return (fp, retrlen) elif str(reason)[:3] != '550': diff --git a/pisi/graph.py b/pisi/graph.py index e55dd671..1bffe0f1 100644 --- a/pisi/graph.py +++ b/pisi/graph.py @@ -44,11 +44,11 @@ class Digraph(object): def edges(self): "return a list of edge descriptors" - l = [] + list = [] for u in self.__v: for v in self.__adj[u]: - l.append( (u,v) ) - return l + list.append( (u,v) ) + return list def from_list(self, el): "convert a list of edges (u,v) to graph" diff --git a/pisi/index.py b/pisi/index.py index 534089a2..279a9394 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -23,12 +23,15 @@ import pisi import pisi.context as ctx import pisi.specfile as specfile import pisi.metadata as metadata +import pisi.packagedb as packagedb +import pisi.sourcedb as sourcedb import pisi.util as util import pisi.package import pisi.pxml.xmlfile as xmlfile import pisi.file import pisi.pxml.autoxml as autoxml import pisi.component as component +import pisi.specfile as specfile class Error(pisi.Error): pass diff --git a/pisi/installdb.py b/pisi/installdb.py index 6ef21efa..6c826085 100644 --- a/pisi/installdb.py +++ b/pisi/installdb.py @@ -13,6 +13,10 @@ # installation database # +# System +import os +import fcntl + import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext @@ -106,20 +110,20 @@ class InstallDB: def list_installed(self, txn = None): def proc(txn): - l = [] + list = [] for (pkg, info) in self.d.items(txn): if info.state=='i' or info.state=='ip': - l.append(pkg) - return l + list.append(pkg) + return list return self.d.txn_proc(proc, txn) def list_pending(self): # warning: reads the entire db - d = {} + dict = {} for (pkg, x) in self.dp.items(): pkginfo = self.d[pkg] - d[pkg] = pkginfo - return d + dict[pkg] = pkginfo + return dict def get_info(self, pkg): pkg = str(pkg) diff --git a/pisi/itembyrepodb.py b/pisi/itembyrepodb.py index ed59b29b..f010a15b 100644 --- a/pisi/itembyrepodb.py +++ b/pisi/itembyrepodb.py @@ -10,11 +10,16 @@ # Please read the COPYING file. # +import os +import fcntl +import types + import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi +import pisi.util as util import pisi.context as ctx import pisi.lockeddbshelve as shelve @@ -85,6 +90,7 @@ class ItemByRepoDB(object): if repo == None: repo = repos assert repo in [all, repos] + import pisi.repodb order = [ 'repo-' + x for x in ctx.repodb.list() ] if repo == all: order += ['trdparty', 'inst'] diff --git a/pisi/operations.py b/pisi/operations.py index 2f1d87bf..6829a945 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -24,6 +24,7 @@ import pisi.util as util import pisi.dependency as dependency import pisi.conflict import pisi.pgraph as pgraph +import pisi.packagedb as packagedb import pisi.repodb import pisi.installdb import pisi.cli @@ -245,7 +246,7 @@ def calculate_conflicts(order, packagedb): return (C, D, pkg_conflicts) def remove_conflicting_packages(conflicts): - if not remove(conflicts, ignore_dep=True, ignore_safety=True): + if remove(conflicts, ignore_dep=True, ignore_safety=True) == False: raise Error(_("Conflicts remain")) def check_conflicts(order, packagedb): @@ -280,7 +281,7 @@ def is_upgradable(name, ignore_build = False): pkg = ctx.packagedb.get_package(name) except KeyboardInterrupt: raise - except Exception: #FIXME: what exception could we catch here, replace with that. + except Exception, e: #FIXME: what exception could we catch here, replace with that. return False if ignore_build or (not build) or (not pkg.build): return pisi.version.Version(release) < pisi.version.Version(pkg.release) @@ -302,7 +303,7 @@ def upgrade_base(A = set(), ignore_package_conflicts = False): if extra_upgrades: ctx.ui.warning(_('Safety switch: Following packages in system.base will be upgraded: ') + util.strlist(extra_upgrades)) - G_f, upgrade_order = plan_upgrade(extra_upgrades) + G_f, upgrade_order = plan_upgrade(extra_upgrades, ignore_build) # return packages that must be added to any installation return set(install_order + upgrade_order) else: @@ -464,7 +465,7 @@ def upgrade_pkg_names(A = []): ctx.ui.debug('A = %s' % str(A)) if not ctx.config.get_option('ignore_dependency'): - G_f, order = plan_upgrade(A) + G_f, order = plan_upgrade(A, ignore_build) else: G_f = None order = list(A) @@ -512,7 +513,7 @@ def upgrade_pkg_names(A = []): if 'pisi' in order: upgrade_pisi() -def plan_upgrade(A): +def plan_upgrade(A, ignore_build = False): # try to construct a pisi graph of packages to # install / reinstall @@ -640,6 +641,7 @@ def plan_remove(A): while len(B) > 0: Bp = set() for x in B: + pkg = ctx.packagedb.get_package(x, pisi.itembyrepodb.installed) rev_deps = ctx.packagedb.get_rev_deps(x, pisi.itembyrepodb.installed) for (rev_dep, depinfo) in rev_deps: # we don't deal with uninstalled rev deps @@ -664,7 +666,7 @@ def expand_src_components(A): Ap.add(x) return Ap -def emerge(A): +def emerge(A, rebuild_all = False): # A was a list, remove duplicates and expand components A = [str(x) for x in A] @@ -680,7 +682,7 @@ def emerge(A): # FIXME: Errr... order_build changes type conditionally and this # is not good. - baris if not ctx.config.get_option('ignore_dependency'): - G_f, order_inst, order_build = plan_emerge(A) + G_f, order_inst, order_build = plan_emerge(A, rebuild_all) else: G_f = None order_inst = [] @@ -721,7 +723,7 @@ installed in the respective order to satisfy dependencies: if 'pisi' in order_build or (('pisi' in U) and pisi_installed): upgrade_pisi() -def plan_emerge(A): +def plan_emerge(A, rebuild_all): # try to construct a pisi graph of packages to # install / reinstall diff --git a/pisi/packagedb.py b/pisi/packagedb.py index 5e9d7686..8f557bd4 100644 --- a/pisi/packagedb.py +++ b/pisi/packagedb.py @@ -17,12 +17,18 @@ we basically store everything in PackageInfo class yes, we are cheap """ +import os +import fcntl +import types + import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext import pisi +import pisi.util as util import pisi.context as ctx +import pisi.lockeddbshelve as shelve import pisi.itembyrepodb class Error(pisi.Error): @@ -55,7 +61,7 @@ class PackageDB(object): def get_package(self, name, repo=None, txn = None): try: return self.d.get_item(name, repo, txn=txn) - except pisi.itembyrepodb.NotfoundError: + except pisi.itembyrepodb.NotfoundError, e: raise Error(_('Package %s not found') % name) def get_package_repo(self, name, repo=None, txn = None): diff --git a/pisi/pgraph.py b/pisi/pgraph.py index 05181e46..52894096 100644 --- a/pisi/pgraph.py +++ b/pisi/pgraph.py @@ -76,7 +76,6 @@ class PGraph(graph.Digraph): pkg2 = self.packagedb.get_package(conflinfo.package, self.repo) pkg2data = (pkg2.version, pkg2.release) - # FIXME: WTF? /usr/lib/pardus/pisi/pgraph.py:80: Invalid arguments to (add_biedge), got 5, expected between 2 and 3 / caglar self.add_biedge(str(pkg), str(conflinfo.package), ('c', conflinfo) , pkg1data, pkg2data ) diff --git a/pisi/repodb.py b/pisi/repodb.py index f6676115..c5276aa7 100644 --- a/pisi/repodb.py +++ b/pisi/repodb.py @@ -10,6 +10,8 @@ # Please read the COPYING file. # +import os, fcntl + import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext @@ -17,6 +19,8 @@ _ = __trans.ugettext import pisi import pisi.lockeddbshelve as shelve import pisi.context as ctx +import pisi.packagedb as packagedb +import pisi.util as util class Error(pisi.Error): pass @@ -97,9 +101,9 @@ class RepoDB(object): name = str(name) def proc(txn): self.d.delete("repo-" + name, txn) - l = self.d.get("order", txn) - l.remove(name) - self.d.put("order", l, txn) + list = self.d.get("order", txn) + list.remove(name) + self.d.put("order", list, txn) ctx.packagedb.remove_repo(name, txn=txn) ctx.sourcedb.remove_repo(name, txn=txn) ctx.componentdb.remove_repo(name, txn=txn) diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py index 3c6e1fcf..593fb5ae 100644 --- a/pisi/sourcedb.py +++ b/pisi/sourcedb.py @@ -20,11 +20,16 @@ store a set of repositories in which the source appears. the actual guy to take is determined from the repo order. """ +import os +import fcntl + import gettext __trans = gettext.translation('pisi', fallback=True) _ = __trans.ugettext +import pisi.util as util import pisi.context as ctx +import pisi.lockeddbshelve as shelve import pisi.repodb import pisi.itembyrepodb @@ -50,13 +55,13 @@ class SourceDB(object): def get_spec(self, name, repo=None, txn = None): try: return self.d.get_item(name, repo, txn) - except pisi.itembyrepodb.NotfoundError: + except pisi.itembyrepodb.NotfoundError, e: raise NotfoundError(_("Source package %s not found") % name) def get_spec_repo(self, name, repo=None, txn = None): try: return self.d.get_item_repo(name, repo, txn) - except pisi.itembyrepodb.NotfoundError: + except pisi.itembyrepodb.NotfoundError, e: raise NotfoundError(_("Source package %s not found") % name) def pkgtosrc(self, name, txn = None): diff --git a/pisi/ui.py b/pisi/ui.py index 93750bf2..9973a3df 100644 --- a/pisi/ui.py +++ b/pisi/ui.py @@ -12,6 +12,11 @@ # generic user interface # +import sys + +import pisi +import pisi.context as ctx + (installed, upgraded, removed, installing, removing, configuring, configured, extracting, downloading, packagestogo, updatingrepo, cached) = range(12) diff --git a/pisi/util.py b/pisi/util.py index b1cc27d3..1b1e17b0 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -72,7 +72,7 @@ def multisplit(str, chars): """Split str with any of the chars.""" l = [str] for c in chars: - l = concat(map(lambda x:x.split(c)), l) + l = concat(map(lambda x:x.split(c), l)) return l def same(l): @@ -265,12 +265,12 @@ def check_file(file, mode = os.F_OK): return True # FIXME: check_dir is not a good name considering it can also create the dir -def check_dir(d): +def check_dir(dir): """Make sure given directory path exists.""" # FIXME: What is first strip doing there? - d = d.strip().rstrip("/") - if not os.access(d, os.F_OK): - os.makedirs(d) + dir = dir.strip().rstrip("/") + if not os.access(dir, os.F_OK): + os.makedirs(dir) def clean_dir(path): """Remove all content of a directory.""" @@ -393,8 +393,8 @@ def get_file_hashes(top, excludePrefix=None, removePrefix=None): continue #bug 397 - for directory in dirs: - d = join_path(root, directory) + for dir in dirs: + d = join_path(root, dir) if os.path.islink(d) and not has_excluded_prefix(d): yield (d, sha1_sum(os.readlink(d), True)) excludePrefix.append(remove_prefix(removePrefix, d) + "/") @@ -455,7 +455,7 @@ def sha1_data(data): return m.hexdigest() except KeyboardInterrupt: raise - except Exception: #FIXME: what exception could we catch here, replace with that. + except Exception, e: #FIXME: what exception could we catch here, replace with that. raise Error(_("Cannot calculate SHA1 hash of given data")) def uncompress(patchFile, compressType="gz", targetDir=None): @@ -607,9 +607,10 @@ def is_package_name(fn, package_name = None): # get version string, skip separator '-' verstr = fn[len(package_name) + 1: len(fn)-len(ctx.const.package_suffix)] + import string for x in verstr.split('-'): # weak rule: version components after '-' start with a digit - if x == '' or (not x[0] in string.digits): + if x is '' or (not x[0] in string.digits): return False return True return False From b329590b8d60569482219c50f31047e2169d3623 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 14 May 2007 13:14:08 +0000 Subject: [PATCH 117/212] [MERGE] commit 13823 from trunk. inspect caches old read files. causes reload problem with metaclasses. --- pisi/pxml/autoxml.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py index 443697e5..27c9909c 100644 --- a/pisi/pxml/autoxml.py +++ b/pisi/pxml/autoxml.py @@ -278,6 +278,7 @@ class autoxml(oo.autosuper, oo.autoprop): try: fn = re.compile('\s*([tas]_[a-zA-Z]+).*').findall + inspect.linecache.clearcache() lines = filter(fn, inspect.getsourcelines(cls)[0]) decl_order = map(lambda x:x.split()[0], lines) except IOError: From 908890c6c305c2a8a70d4dd52e8b74471fd72ee4 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 14 May 2007 13:22:29 +0000 Subject: [PATCH 118/212] [MERGE] a_target removal (at last!) --- pisi/build.py | 2 +- pisi/specfile.py | 3 --- pisi/util.py | 8 +++----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 661a3220..036e1811 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -494,7 +494,7 @@ class Builder: targetDir=ctx.config.tmp_dir()) ctx.ui.action(_("* Applying patch: %s") % patch.filename) - pisi.util.do_patch(self.srcDir, patchFile, level=patch.level, target=patch.target) + pisi.util.do_patch(self.srcDir, patchFile, level=patch.level) return True def generate_static_package_object(self): diff --git a/pisi/specfile.py b/pisi/specfile.py index ecd63dc7..2c33af68 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -67,7 +67,6 @@ class Patch: s_Filename = [autoxml.String, autoxml.mandatory] a_compressionType = [autoxml.String, autoxml.optional] a_level = [autoxml.Integer, autoxml.optional] - a_target = [autoxml.String, autoxml.optional] #FIXME: what's the cleanest way to give a default value for reading level? #def decode_hook(self, node, errs, where): @@ -80,8 +79,6 @@ class Patch: s += ' (' + self.compressionType + ')' if self.level: s += ' level:' + self.level - if self.target: - s += ' target:' + self.target return s diff --git a/pisi/util.py b/pisi/util.py index 1b1e17b0..3620e077 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -479,19 +479,17 @@ def uncompress(patchFile, compressType="gz", targetDir=None): return filePath -def do_patch(sourceDir, patchFile, level = 0, target = ''): +def do_patch(sourceDir, patchFile, level = 0): """Apply given patch to the sourceDir.""" cwd = os.getcwd() os.chdir(sourceDir) if level == None: level = 0 - if target == None: - target = '' check_file(patchFile) - (ret, out, err) = run_batch("patch -p%d %s < %s" % - (level, target, patchFile)) + (ret, out, err) = run_batch("patch -p%d < %s" % + (level, patchFile)) if ret: if out is None and err is None: # Which means stderr and stdout directed so they are None From 6d33afc8908c01ebe55713ebb7f051a4d5f97cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 21:51:29 +0000 Subject: [PATCH 119/212] ignore *.pyc's From becb4f27832ef65100c6408e34abfbc3413a93cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 14 May 2007 21:54:01 +0000 Subject: [PATCH 120/212] ignore *.pyo's also From fda138a0e88a301083e0e892c7066c279515bfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 16 May 2007 12:10:37 +0000 Subject: [PATCH 121/212] =?UTF-8?q?newline'=C4=B1=20yeme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/build.py b/pisi/build.py index 036e1811..a519767b 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -305,7 +305,7 @@ class Builder: %(ctx.config.archives_dir(), self.spec.source.archive.name)) def unpack_source_archive(self): - ctx.ui.info(_("Unpacking archive..."), noln = True) + ctx.ui.info(_("Unpacking archive...")) self.sourceArchive.unpack() # apply the patches and prepare a source directory for build. if self.apply_patches(): From b1955ede73c9d8757b8b33fcc124469ca56a00a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 16 May 2007 22:06:38 +0000 Subject: [PATCH 122/212] check build dependencies also with staged build --- pisi/build.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pisi/build.py b/pisi/build.py index a519767b..46240416 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -981,6 +981,9 @@ def build_until(pspec, state): __buildState_unpack(pb, last) return + # from now on build dependencies are needed + pb.check_build_dependencies() + if state == "setup": __buildState_setupaction(pb, last) return From ae6598b400253fab91cd9e287ae44588a9ca52a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 17 May 2007 00:19:42 +0000 Subject: [PATCH 123/212] =?UTF-8?q?pisi=20~=20#=20pisi=20up=20--security?= =?UTF-8?q?=20--dry-run=20-d=20DEBUG:=20PiSi=20API=20initialized=20Depolar?= =?UTF-8?q?=20g=C3=BCncelleniyor=20*=20pardus=20deposu=20g=C3=BCncelleniyo?= =?UTF-8?q?r=20pisi-index.xml.bz2.sha1sum=20=20=20=20=20(40.0=20=20B)100%?= =?UTF-8?q?=20=20=20=20=20=200.00=20B/s=20[=3F=3F:=3F=3F:=3F=3F]=20[bitti]?= =?UTF-8?q?=20pardus=20deposu=20i=C3=A7in=20g=C3=BCncelleme=20yok.=20Siste?= =?UTF-8?q?m=20Hatas=C4=B1:=20Program=20Sonland=C4=B1r=C4=B1ld=C4=B1.=20ex?= =?UTF-8?q?ceptions.AttributeError:=20'module'=20object=20has=20no=20attri?= =?UTF-8?q?bute=20'packageDB'=20Genel=20yard=C4=B1m=20i=C3=A7in=20l=C3=BCt?= =?UTF-8?q?fen=20'pisi=20help'=20komutunu=20kullan=C4=B1n=C4=B1z.=20Geri-i?= =?UTF-8?q?z:=20=20=20File=20"/usr/bin/pisi",=20line=2089,=20in=20=3F=20?= =?UTF-8?q?=20=20=20=20cli.run=5Fcommand()=20=20=20File=20"/usr/lib/pardus?= =?UTF-8?q?/pisi/cli/pisicli.py",=20line=20111,=20in=20run=5Fcommand=20=20?= =?UTF-8?q?=20=20=20self.command.run()=20=20=20File=20"/usr/lib/pardus/pis?= =?UTF-8?q?i/cli/commands.py",=20line=20791,=20in=20run=20=20=20=20=20pisi?= =?UTF-8?q?.api.upgrade(packages)=20=20=20File=20"/usr/lib/pardus/pisi/api?= =?UTF-8?q?.py",=20line=20567,=20in=20upgrade=20=20=20=20=20return=20pisi.?= =?UTF-8?q?operations.upgrade(*args,=20**kw)=20=20=20File=20"/usr/lib/pard?= =?UTF-8?q?us/pisi/operations.py",=20line=20407,=20in=20upgrade=20=20=20?= =?UTF-8?q?=20=20upgrade=5Fpkg=5Fnames(A)=20=20=20File=20"/usr/lib/pardus/?= =?UTF-8?q?pisi/operations.py",=20line=20438,=20in=20upgrade=5Fpkg=5Fnames?= =?UTF-8?q?=20=20=20=20=20history=20=3D=20ctx.packageDB.get=5Fhistory(x)?= =?UTF-8?q?=20DEBUG:=20PiSi=20API=20finalized?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/context.py | 2 ++ pisi/operations.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pisi/context.py b/pisi/context.py index 4799a7ba..2e8dd602 100644 --- a/pisi/context.py +++ b/pisi/context.py @@ -41,6 +41,8 @@ dbenv = None installdb = None packagedb = None repodb = None +sourcedb = None +filesdb = None invidx = None comar = None diff --git a/pisi/operations.py b/pisi/operations.py index 6829a945..20576ceb 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -435,8 +435,7 @@ def upgrade_pkg_names(A = []): continue if security_only: - history = ctx.packageDB.get_history(x) - updates = [i for i in history if pisi.version.Version(i.release) > pisi.version.Version(release)] + updates = [i for i in pkg.history if pisi.version.Version(i.release) > pisi.version.Version(release)] if not pisi.util.any(lambda i:i.type == 'security', updates): continue From 0531c08c77d8175c67d3310f6a20f8adf97dfd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 17 May 2007 00:25:20 +0000 Subject: [PATCH 124/212] E:133:PackageDB.remove_package.proc: Module 'pisi.context' has no 'componentdb' member --- pisi/context.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pisi/context.py b/pisi/context.py index 2e8dd602..3a3688be 100644 --- a/pisi/context.py +++ b/pisi/context.py @@ -43,6 +43,7 @@ packagedb = None repodb = None sourcedb = None filesdb = None +componentdb = None invidx = None comar = None From 1b7b0f5a1af017f67bfffaaa83bd3756429075cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 17 May 2007 00:39:07 +0000 Subject: [PATCH 125/212] undefined variable pisitools (its imported as dodoc on top) --- pisi/actionsapi/pythonmodules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index bbd658f7..f50fc95a 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -58,7 +58,7 @@ def install(parameters = ''): for doc in DDOCS: if can_access_file(doc): - pisitools.dodoc(doc) + dodoc(doc) def run(parameters = ''): '''executes parameters with python''' From c2c81cf0b3ba6238ee5151ffa550010a156bda9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 17 May 2007 00:42:31 +0000 Subject: [PATCH 126/212] class already defined commands.py (from pisi.cli.commands import * --- pisi/cli/pisicli.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pisi/cli/pisicli.py b/pisi/cli/pisicli.py index 685aa781..a47fe8d8 100644 --- a/pisi/cli/pisicli.py +++ b/pisi/cli/pisicli.py @@ -26,9 +26,6 @@ from pisi.cli.commands import * class ParserError(pisi.Exception): pass -class Error(pisi.Error): - pass - class PreParser(OptionParser): """consumes any options, and finds arguments from command line""" From 5e1769b9338f7b65e0044cd037e50a8626d1df29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 17 May 2007 00:42:51 +0000 Subject: [PATCH 127/212] undefined variable e --- pisi/cli/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index 9b35e399..a0efcbc3 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -103,7 +103,7 @@ class CLI(pisi.ui.UI): opt = int(s) if 1 <= opt and opt <= len(opts): return opts(opt-1) - except (Exception,e): + except Exception: pass def confirm(self, msg): From 83b823708cf43b26fc14f1e72b564fd1d7ec7e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 18 May 2007 12:50:56 +0000 Subject: [PATCH 128/212] fix #5652 --- pisi/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pisi/util.py b/pisi/util.py index 3620e077..774933fd 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -488,7 +488,7 @@ def do_patch(sourceDir, patchFile, level = 0): level = 0 check_file(patchFile) - (ret, out, err) = run_batch("patch -p%d < %s" % + (ret, out, err) = run_batch("patch -p%d < \"%s\"" % (level, patchFile)) if ret: if out is None and err is None: From 0570b9efbc9f30262232c54160b172f33b00fa84 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 22 May 2007 08:23:34 +0000 Subject: [PATCH 129/212] =?UTF-8?q?[MERGE]=C2=A0get,=20set=20and=20write?= =?UTF-8?q?=5Fconfig=20methods=20added=20for=20manipulation=20of=20pisi.co?= =?UTF-8?q?nf=20file=20from=20Comar=20to=20solve=20bug=20#5668.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/__init__.py | 2 +- pisi/configfile.py | 142 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 138 insertions(+), 6 deletions(-) diff --git a/pisi/__init__.py b/pisi/__init__.py index 5e418243..f3daa162 100644 --- a/pisi/__init__.py +++ b/pisi/__init__.py @@ -17,7 +17,7 @@ __version__ = "1.1.3" __dbversion__ = "1.1.2" __filesdbversion__ = "1.0.5" # yes, this is the real bottleneck -__all__ = [ 'api', 'config', 'packagedb', 'installdb', 'search' ] +__all__ = [ 'api', 'config', 'configfile', 'packagedb', 'installdb', 'search' ] # FIXME: Exception shadows builtin Exception. This is no good. class Exception(Exception): diff --git a/pisi/configfile.py b/pisi/configfile.py index f3b28f3f..ff483bad 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -45,6 +45,8 @@ #qt_dir = /usr/qt/3 import os +import re +import StringIO import ConfigParser import gettext @@ -137,25 +139,155 @@ class ConfigurationSection(object): class ConfigurationFile(object): """Parse and get configuration values from the configuration file""" def __init__(self, filePath): - parser = ConfigParser.ConfigParser() + self.parser = ConfigParser.ConfigParser() self.filePath = filePath - parser.read(self.filePath) + self.parser.read(self.filePath) try: - generalitems = parser.items("general") + generalitems = self.parser.items("general") except ConfigParser.NoSectionError: generalitems = [] self.general = ConfigurationSection("general", generalitems) try: - builditems = parser.items("build") + builditems = self.parser.items("build") except ConfigParser.NoSectionError: builditems = [] self.build = ConfigurationSection("build", builditems) try: - dirsitems = parser.items("directories") + dirsitems = self.parser.items("directories") except ConfigParser.NoSectionError: dirsitems = [] self.dirs = ConfigurationSection("directories", dirsitems) + + # get, set and write_config methods added for manipulation of pisi.conf file from Comar to solve bug #5668. + # Current ConfigParser does not keep the comments and white spaces, which we do not want for pisi.conf. There + # are patches floating in the python sourceforge to add this feature. The write_config code is from python + # sourceforge tracker id: #1410680, modified a little to make it turn into a function. + + def get(self, section, option): + return self.parser.get(section, option) + + def set(self, section, option, value): + self.parser.set(section, option, value) + + def write_config(self, add_missing=True): + sections = {} + current = StringIO.StringIO() + replacement = [current] + sect = None + opt = None + written = [] + optcre = re.compile( + r'(?P