- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 3/3] Update pactest suite for change in db structure
by Allan McRae 30 Oct '10

30 Oct '10

Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/pmdb.py | 62 ++++++++++++++----------------------------------- test/pacman/pmpkg.py | 4 --- 2 files changed, 18 insertions(+), 48 deletions(-) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index af5525c..7f79819 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -163,6 +163,14 @@ def db_read(self, name): elif line == "%FORCE%": fd.readline() pkg.force = 1 + elif line == "%DEPENDS%": + pkg.depends = _getsection(fd) + elif line == "%OPTDEPENDS%": + pkg.optdepends = _getsection(fd) + elif line == "%CONFLICTS%": + pkg.conflicts = _getsection(fd) + elif line == "%PROVIDES%": + pkg.provides = _getsection(fd) fd.close() pkg.checksum["desc"] = getmd5sum(filename) pkg.mtime["desc"] = getmtime(filename) @@ -189,29 +197,6 @@ def db_read(self, name): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - filename = os.path.join(path, "depends") - if not os.path.isfile(filename): - print "invalid db entry found (depends missing) for pkg", pkgname - return None - fd = file(filename, "r") - while 1: - line = fd.readline() - if not line: - break - line = line.strip("\n") - if line == "%DEPENDS%": - pkg.depends = _getsection(fd) - elif line == "%OPTDEPENDS%": - pkg.optdepends = _getsection(fd) - elif line == "%CONFLICTS%": - pkg.conflicts = _getsection(fd) - elif line == "%PROVIDES%": - pkg.provides = _getsection(fd) - fd.close() - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install filename = os.path.join(path, "install") if os.path.isfile(filename): @@ -233,9 +218,9 @@ def db_write(self, pkg): # desc # for local db entries: name, version, desc, groups, url, license, # arch, builddate, installdate, packager, - # size, reason + # size, reason, depends, conflicts, provides # for sync entries: name, version, desc, groups, csize, md5sum, - # replaces, force + # replaces, force, depends, conflicts, provides data = [_mksection("NAME", pkg.name)] data.append(_mksection("VERSION", pkg.version)) if pkg.desc: @@ -250,6 +235,14 @@ def db_write(self, pkg): data.append(_mksection("BUILDDATE", pkg.builddate)) if pkg.packager: data.append(_mksection("PACKAGER", pkg.packager)) + if pkg.depends: + data.append(_mksection("DEPENDS", pkg.depends)) + if pkg.optdepends: + data.append(_mksection("OPTDEPENDS", pkg.optdepends)) + if pkg.conflicts: + data.append(_mksection("CONFLICTS", pkg.conflicts)) + if pkg.provides: + data.append(_mksection("PROVIDES", pkg.provides)) if self.treename == "local": if pkg.url: data.append(_mksection("URL", pkg.url)) @@ -297,25 +290,6 @@ def db_write(self, pkg): pkg.checksum["files"] = getmd5sum(filename) pkg.mtime["files"] = getmtime(filename) - # depends - # for local db entries: depends, conflicts, provides - # for sync ones: depends, conflicts, provides - data = [] - if pkg.depends: - data.append(_mksection("DEPENDS", pkg.depends)) - if pkg.optdepends: - data.append(_mksection("OPTDEPENDS", pkg.optdepends)) - if pkg.conflicts: - data.append(_mksection("CONFLICTS", pkg.conflicts)) - if pkg.provides: - data.append(_mksection("PROVIDES", pkg.provides)) - if data: - data.append("") - filename = os.path.join(path, "depends") - mkfile(filename, "\n".join(data)) - pkg.checksum["depends"] = getmd5sum(filename) - pkg.mtime["depends"] = getmtime(filename) - # install if self.treename == "local": empty = 1 diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index aaee28b..9ce0978 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -51,7 +51,6 @@ def __init__(self, name, version = "1.0-1"): self.replaces = [] self.force = 0 self.epoch = 0 - # depends self.depends = [] self.optdepends = [] self.conflicts = [] @@ -70,13 +69,11 @@ def __init__(self, name, version = "1.0-1"): } self.checksum = { "desc": "", - "depends": "", "files": "", "install": "" } self.mtime = { "desc": (0, 0, 0), - "depends": (0, 0, 0), "files": (0, 0, 0), "install": (0, 0, 0) } @@ -85,7 +82,6 @@ def __str__(self): s = ["%s" % self.fullname()] s.append("description: %s" % self.desc) s.append("url: %s" % self.url) - s.append("depends: %s" % " ".join(self.depends)) s.append("files: %s" % " ".join(self.files)) s.append("reason: %d" % self.reason) return "\n".join(s) -- 1.7.3.2

1 0

[pacman-dev] [PATCH 1/3] Combine reading from depends and desc in sync db
by Allan McRae 30 Oct '10

30 Oct '10

This will allow us to eventually combine the depends and desc entries within the sync database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index e1c7663..275a858 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -241,7 +241,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry return(-1); } - if(strcmp(filename, "desc") == 0) { + if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0) { while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { @@ -356,12 +356,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry if(!pkg->epoch) { pkg->epoch = 1; } - } - } - } else if(strcmp(filename, "depends") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { + } else if(strcmp(line, "%DEPENDS%") == 0) { while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); -- 1.7.3.2

1 0

[pacman-dev] [PATCH] Add epoch to PKGBUILD prototypes
by Allan McRae 30 Oct '10

30 Oct '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 1 + PKGBUILD.proto | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index d7f1de1..f5114ab 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -8,6 +8,7 @@ pkgname=('pkg1' 'pkg2') pkgbase=BASE pkgver=VERSION pkgrel=1 +epoch= pkgdesc="" arch=() url="" diff --git a/PKGBUILD.proto b/PKGBUILD.proto index ebbdf0a..71dbc14 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -7,6 +7,7 @@ pkgname=NAME pkgver=VERSION pkgrel=1 +epoch= pkgdesc="" arch=() url="" -- 1.7.3.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-15-ga91250b
by dan＠archlinux.org 28 Oct '10

28 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via a91250b7bb718c7e36c9784d51bdcb6e0051c259 (commit) via a08638edc8cdacf7840414d82bc687727d7b2363 (commit) via 592211b6dc4b9997a60543309378f1595cf38056 (commit) via d901646f7a2e67d27bcae43f90490299857646fc (commit) from 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a91250b7bb718c7e36c9784d51bdcb6e0051c259 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 28 09:50:54 2010 -0500 Add initial 3.4.2 NEWS draft Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a08638edc8cdacf7840414d82bc687727d7b2363 Author: Tobias Eriksson <tobier(a)tobier.se> Date: Wed Oct 20 20:26:36 2010 +0200 Update Swedish translation 442 translated strings, no fuzzies, no untranslated. modified: po/sv.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 592211b6dc4b9997a60543309378f1595cf38056 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sat Oct 23 14:32:33 2010 +0200 PKGBUILD.vim: add special licenses BSD MIT ZLIB Python Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d901646f7a2e67d27bcae43f90490299857646fc Author: Ricardo Pérez <ricpelo(a)gmail.com> Date: Thu Oct 28 09:13:24 2010 -0500 Small updates to Spanish translation Also addresses FS#21373. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 ++ contrib/PKGBUILD.vim | 9 ++- po/es.po | 40 ++++++------ po/sv.po | 168 ++++++++++++++++++++++--------------------------- 4 files changed, 107 insertions(+), 116 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Swedish translations, yet again
by Tobias Eriksson 28 Oct '10

28 Oct '10

Translation of pacman to Swedish. No fuzzies or untranslated entries left. Signed-off-by: Tobias Eriksson <tobier(a)tobier.se> --- po/sv.po | 173 +++++++++++++++++++++++++------------------------------------- 1 files changed, 70 insertions(+), 103 deletions(-) diff --git a/po/sv.po b/po/sv.po index c61ef2f..9418ea0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.3.1\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2010-08-23 21:30-0500\n" -"PO-Revision-Date: 2009-10-06 21:11+0200\n" -"Last-Translator: Christian Larsson <congacx(a)gmail.com>\n" +"PO-Revision-Date: 2010-10-20 20:26+0200\n" +"Last-Translator: Tobias Eriksson <tobier(a)tobier.se>\n" "Language-Team: Swedish\n" "Language: \n" "MIME-Version: 1.0\n" @@ -80,13 +80,13 @@ msgstr ":: %s finns i IgnorePkg/IgnoreGroup. Installera ändå?" msgid ":: Replace %s with %s/%s?" msgstr ":: Ersätt %s med %s/%s?" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict. Remove %s?" -msgstr ":: %s strider mot %s. Ta bort %s?" +msgstr ":: %s krockar med %s. Ta bort %s?" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict (%s). Remove %s?" -msgstr ":: %s strider mot %s. Ta bort %s?" +msgstr ":: %s krockar med %s (%s). Ta bort %s?" #, c-format msgid "" @@ -318,7 +318,7 @@ msgstr "" msgid " -d, --nodeps skip dependency checks\n" msgstr " -d, --nodeps hoppa över kontroll av beroenden\n" -#, fuzzy, c-format +#, c-format msgid "" " -k, --dbonly only remove database entries, do not remove files\n" msgstr "" @@ -335,8 +335,7 @@ msgid "" " (-ss includes explicitly installed dependencies too)\n" msgstr "" " -s, --recursive ta även bort beroenden (som inte stör andra paket)\n" -" (-ss inkluderar även uttryckligt installerade " -"beroenden\n" +" (-ss inkluderar även uttryckligt installerade beroenden\n" #, c-format msgid "" @@ -349,13 +348,15 @@ msgstr "" msgid "" " --print only print the targets instead of performing the " "operation\n" -msgstr "" +msgstr "--print skriv endast ut, utan att utföra operationen\n" #, c-format msgid "" " --print-format <string>\n" " specify how the targets should be printed\n" msgstr "" +" --print-format <string>\n" +" specificera utskriftsformatet\n" #, c-format msgid " --asdeps install packages as non-explicitly installed\n" @@ -371,13 +372,11 @@ msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" " -f, --force tvingfa installation, skriv över motstridiga filer\n" -#, fuzzy, c-format +#, c-format msgid "" " -k, --dbonly add database entries, do not install or keep existing " "files\n" -msgstr "" -" -k, --dbonly ta enbart bort databasinlägg, men ta inte bort några " -"filer\n" +msgstr " -k, --dbonly lägg till databasinlägg, men installera inte eller behåll inga befintliga filer.\n\n" #, c-format msgid " -c, --changelog view the changelog of a package\n" @@ -517,14 +516,13 @@ msgstr "" " ignorera en gruppuppgradering (kan användas mer än en " "gång)\n" -#, fuzzy, c-format +#, c-format msgid " --asdeps mark packages as non-explicitly installed\n" -msgstr "" -" --asdeps installera paket som icke-utryckligt installerade\n" +msgstr " --asdeps markera paket som icke-utryckligt installerade\n" -#, fuzzy, c-format +#, c-format msgid " --asexplicit mark packages as explicitly installed\n" -msgstr " --asexplicit installera paket som utryckligt installerade\n" +msgstr " --asexplicit markera paket som utryckligt installerade\n" #, c-format msgid " --config <path> set an alternate configuration file\n" @@ -572,9 +570,9 @@ msgstr " -b, --dbpath <path> ange en alternativ plats för databasen\n" msgid " --cachedir <dir> set an alternate package cache location\n" msgstr " --cachedir <dir> ange en alternativ plats för paketcachen\n" -#, fuzzy, c-format +#, c-format msgid " --arch <arch> set an alternate architecture\n" -msgstr " --config <path> ange en alternativ konfigurationsfil\n" +msgstr " --arch <arch> ange en alternativ arkitektur\n" #, c-format msgid "" @@ -616,23 +614,23 @@ msgstr "kunde inte chdir till nerladdningskatalogen% s\n" msgid "running XferCommand: fork failed!\n" msgstr "vid körning av XferCommand: delning misslyckades!\n" -#, fuzzy, c-format +#, c-format msgid "directive '%s' without value not recognized\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "direktiv '%s' utan värde känns inte igen\n" #, c-format msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n" -#, fuzzy, c-format +#, c-format msgid "directive '%s' with a value not recognized\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "direktiv '%s' med ett värde känns inte igen\n" #, c-format msgid "" "The mirror '%s' contains the $arch variable, but no Architecture is " "defined.\n" -msgstr "" +msgstr "Adressen '%s' innehålle $arch-variabeln, men ingen arkitektur är definerad.\n" #, c-format msgid "could not add server URL to database '%s': %s (%s)\n" @@ -661,19 +659,19 @@ msgid "config file %s, line %d: All directives must belong to a section.\n" msgstr "" "konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n" -#, fuzzy, c-format +#, c-format msgid "config file %s, line %d: directive %s needs a value\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "konfigurationsfil %s, rad %d: direktiv '%s' kräver ett värde\n" -#, fuzzy, c-format +#, c-format msgid "config file %s, line %d: problem in options section\n" -msgstr "konfigurationsfil %s, rad %d: ogiltigt sektionsnamn.\n" +msgstr "konfigurationsfil %s, rad %d: problem i alternativsektionen.\n" -#, fuzzy, c-format +#, c-format msgid "" "config file %s, line %d: directive '%s' in repository section '%s' not " "recognized.\n" -msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n" +msgstr "konfigurationsfil %s, rad %d: direktiv '%s' i sektion '%s' känns inte igen.\n" #, c-format msgid "failed to initialize alpm library (%s)\n" @@ -695,9 +693,9 @@ msgstr "ingen operation specifierad (använd -h för hjälp)\n" msgid "no file was specified for --owns\n" msgstr "ingen fil specifierades för --owns\n" -#, fuzzy, c-format +#, c-format msgid "failed to find '%s' in PATH: %s\n" -msgstr "misslyckades att läsa fil '%s': %s\n" +msgstr "misslyckades hitta '%s' i PATH: %s\n" #, c-format msgid "failed to read file '%s': %s\n" @@ -751,9 +749,9 @@ msgstr "paketet \"%s\" hittades inte\n" msgid "failed to prepare transaction (%s)\n" msgstr "misslyckades att förbereda överföring (%s)\n" -#, fuzzy, c-format +#, c-format msgid ":: package %s does not have a valid architecture\n" -msgstr "'%s' har inte ett giltigt suffix för arkiv." +msgstr ":: paket %s har inte en giltig arkitektur.\n" #, c-format msgid ":: %s: requires %s\n" @@ -767,9 +765,9 @@ msgstr "%s är utnämnd som en HoldPkg.\n" msgid "HoldPkg was found in target list. Do you want to continue?" msgstr "HoldPkg hittades i mållistan. Vill du fortsätta?" -#, fuzzy, c-format +#, c-format msgid " there is nothing to do\n" -msgstr "Inga paket modifierade, ingenting att göra." +msgstr " det finns inget att göra\n" #, c-format msgid "Do you want to remove these packages?" @@ -827,9 +825,9 @@ msgstr "Vill du ta bort ALLA filer från cacen?" msgid "removing all files from cache...\n" msgstr "tar bort alla filer från cachen...\n" -#, fuzzy, c-format +#, c-format msgid "could not access cache directory %s\n" -msgstr "kunde inte få tillgång till cachekatalogen\n" +msgstr "kunde inte få tillgång till cachekatalogen %s\n" #, c-format msgid "File %s does not seem to be a valid package, remove it?" @@ -847,9 +845,9 @@ msgstr " %s är senaste versionen\n" msgid "failed to synchronize any databases\n" msgstr "misslyckades att synkronisera någon databas\n" -#, fuzzy, c-format +#, c-format msgid "installed" -msgstr "installerar" +msgstr "installerad" #, c-format msgid "repository '%s' does not exist\n" @@ -877,11 +875,11 @@ msgstr ":: Påbörjar full systemuppgradering...\n" #, c-format msgid ":: %s and %s are in conflict\n" -msgstr "" +msgstr ":: %s och %s krockar.\n" -#, fuzzy, c-format +#, c-format msgid ":: %s and %s are in conflict (%s)\n" -msgstr ":: %s: strider mot %s\n" +msgstr ":: %s krockar med %s (%s)\n" #, c-format msgid "Proceed with download?" @@ -1028,9 +1026,8 @@ msgstr "FEL: " msgid "Cleaning up..." msgstr "Städar upp..." -#, fuzzy msgid "Unable to find source file %s." -msgstr "Kunde inte hitta källkodsfil %s att extrahera." +msgstr "Kunde inte hitta källkodsfil %s." msgid "Aborting..." msgstr "Avbryter..." @@ -1041,16 +1038,14 @@ msgstr "Det finns ingen agent angedd för att hantera %s URL. Kolla %s." msgid "The download program %s is not installed." msgstr "Nerladdningsprogramet %s är inte installerat." -#, fuzzy msgid "'%s' returned a fatal error (%i): %s" -msgstr "Pacman returnerade ett allvarligt fel (%i): %s" +msgstr "'%s' returnerade ett allvarligt fel (%i): %s" msgid "Installing missing dependencies..." msgstr "Installerar saknade beroenden..." -#, fuzzy msgid "'%s' failed to install missing dependencies." -msgstr "Pacman misslyckades att installera saknade beroenden" +msgstr "'%s' misslyckades att installera saknade beroenden" msgid "Failed to install all missing dependencies." msgstr "Misslyckades att installera alla saknade beroenden." @@ -1065,7 +1060,7 @@ msgid "Retrieving Sources..." msgstr "Hämtar Källor..." msgid "Found %s" -msgstr "" +msgstr "Hittade %s" msgid "%s was not found in the build directory and is not a URL." msgstr "%s hittades inte i byggkatalogen och är inte ett URL" @@ -1130,9 +1125,8 @@ msgstr "Rensar andra filer..." msgid "Compressing man and info pages..." msgstr "Komprimerar man och info sidor..." -#, fuzzy msgid "Stripping unneeded symbols from binaries and libraries..." -msgstr "Tar bort felsökningssymboler från binärer och bibliotek..." +msgstr "Tar bort onödiga symboler från binärer och bibliotek..." msgid "Removing libtool .la files..." msgstr "Tar bort libtool .la filer..." @@ -1149,12 +1143,11 @@ msgstr "Var vänlig och lägg till en licens rad i din %s!" msgid "Example for GPL'ed software: license=('GPL')." msgstr "Exempel för GPL licenserad mjukvara: license=('GPL')." -#, fuzzy msgid "Invalid backup entry : %s" -msgstr "Ej giltig paketfil '%s'." +msgstr "Ej giltigt backupinlägg : %s." msgid "Package contains reference to %s" -msgstr "" +msgstr "Paketet innehåller referens till %s" msgid "Missing pkg/ directory." msgstr "Saknar pkg/ katalog" @@ -1177,13 +1170,11 @@ msgstr "'%s' är inte ett giltig paket-suffix" msgid "Failed to create package file." msgstr "Misslyckades att skapa paketfil." -#, fuzzy msgid "Failed to create symlink to package file." -msgstr "Misslyckades att skapa källkodsfil." +msgstr "Misslyckades att symbolisk länk till paketfil." -#, fuzzy msgid "Skipping integrity checks." -msgstr "Hoppar över kontroll av beroenden." +msgstr "Hoppar över integritetskontroll." msgid "Creating source package..." msgstr "Skapar källpaket" @@ -1191,9 +1182,8 @@ msgstr "Skapar källpaket" msgid "Adding %s..." msgstr "Lägger till %s..." -#, fuzzy msgid "Adding %s file (%s)..." -msgstr "Lägger till %s..." +msgstr "Lägger till fil %s (%s)..." msgid "Compressing source package..." msgstr "Komprimerar källpaket..." @@ -1201,12 +1191,11 @@ msgstr "Komprimerar källpaket..." msgid "Failed to create source package file." msgstr "Misslyckades att skapa källkodsfil." -#, fuzzy msgid "Installing package %s with %s -U..." -msgstr "genererar %s med %s... " +msgstr "Installerar paket %s med %s -U... " msgid "Installing %s package group with %s -U..." -msgstr "" +msgstr "Installerar paketgruppen %s med %s -U..." msgid "Failed to install built package(s)." msgstr "Misslyckades att installera byggt/byggda paket." @@ -1232,13 +1221,11 @@ msgstr "som arch=('%s')." msgid "Provides array cannot contain comparison (< or >) operators." msgstr "Provides raden kan inte innehålla jämförande (< eller >) tecken" -#, fuzzy msgid "Invalid syntax for optdepend : '%s'" -msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n" +msgstr "Fel syntax för optdepend : '%s'" -#, fuzzy msgid "%s file (%s) does not exist." -msgstr "Installations scriptlet (%s) existerar inte." +msgstr "Filen %s (%s) existerar inte." msgid "options array contains unknown option '%s'" msgstr "options raden innehåller okända parametrar '%s'" @@ -1247,7 +1234,7 @@ msgid "missing package function for split package '%s'" msgstr "saknar paketfunktion för att dela paket '%s'" msgid "requested package %s is not provided in %s" -msgstr "" +msgstr "efterfrågat paket %s finns ej i %s" msgid "Determining latest darcs revision..." msgstr "Fastställer senaste darcs revisionen..." @@ -1322,10 +1309,8 @@ msgstr " -m, --nocolor Inaktivera färglagda meddelanden" msgid " -o, --nobuild Download and extract files only" msgstr " -o, --nobuild Ladda ner och extrahera enbart filerna" -#, fuzzy msgid " -p <file> Use an alternate build script (instead of '%s')" -msgstr "" -" -p <buildscript> Använd ett alternativt byggskript (istället för '%s')" +msgstr " -p <file> Använd ett alternativt byggskript (istället för '%s')" msgid "" " -r, --rmdeps Remove installed dependencies after a successful build" @@ -1337,56 +1322,41 @@ msgstr " -R, --repackage Packa om innehållet i paketet utan att bygga om" msgid " -s, --syncdeps Install missing dependencies with pacman" msgstr " -s, --syncdeps Installera saknade beroende med pacman" -#, fuzzy msgid "" " --allsource Generate a source-only tarball including downloaded " "sources" -msgstr "" -" --allsource Generera en tarball innehållandes enbart nerladdade källor" +msgstr " --allsource Generera en tarball innehållandes enbart nerladdade källkodsfiler" -#, fuzzy msgid " --asroot Allow makepkg to run as root user" msgstr " --asroot Tillåt makepkg att köras som root" -#, fuzzy msgid " --config <file> Use an alternate config file (instead of '%s')" -msgstr "" -" --config <config> Använd en alternativ konfigurationsfil (istället för " -"'%s')" +msgstr " --config <file> Använd en alternativ konfigurationsfil (istället för '%s')" -#, fuzzy msgid "" " --holdver Prevent automatic version bumping for development " "PKGBUILDs" -msgstr "" -" --holdver Förhindra automatisk versionsdump för " -"utvecklingsversioner av PKGBUILDs " +msgstr " --holdver Förhindra automatisk versionsuppdatering för utvecklingsversioner av PKGBUILDs " msgid " --pkg <list> Only build listed packages from a split package" -msgstr "" +msgstr " --pkg <list> Bygg endast listade paket från ett delat paket" -#, fuzzy msgid " --skipinteg Do not fail when integrity checks are missing" msgstr " --skipinteg Misslyckas inte när integritetskontroller saknas" -#, fuzzy msgid "" " --source Generate a source-only tarball without downloaded sources" -msgstr "" -" --source Generera en tarball med enbart källkoden utan att ladda " -"ner källor" +msgstr " --source Generera en tarball med enbart källkod utan nerladdade källkodsfiler" msgid "These options can be passed to pacman:" msgstr "Dessa argument kan skickas till pacman:" -#, fuzzy msgid "" " --noconfirm Do not ask for confirmation when resolving dependencies" msgstr "" " --noconfirm Fråga inte efter bekräftelse vid bestämmande av " "beroenden" -#, fuzzy msgid " --noprogressbar Do not show a progress bar when downloading files" msgstr "" " --noprogressbar Visa inte en förloppsindikator vid nerladdning av " @@ -1409,9 +1379,8 @@ msgstr "" msgid "%s not found." msgstr "% hittades inte." -#, fuzzy msgid "You do not have write permission to store packages in %s." -msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s." +msgstr "Du har inte skrivrättigheter för att spara paket i %s." msgid "You do not have write permission to store downloads in %s." msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s." @@ -1479,7 +1448,7 @@ msgstr "" "Använd inte flaggan '-F'. Detta argument är enbart för användning av makepkg." msgid "Sudo can not be found. Will use su to acquire root privileges." -msgstr "" +msgstr "Sudo kunde inte hittas, använder su för att få root-rättigheter." msgid "%s does not exist." msgstr "%s existerar inte." @@ -1506,10 +1475,10 @@ msgstr "" "över)" msgid "Repackaging without the use of a package() function is deprecated." -msgstr "" +msgstr "Ompaketering utan att använda en package()-funktion är föråldrat." msgid "File permissions may not be preserved." -msgstr "" +msgstr "Filrättigheterna kanske inte bevaras." msgid "Leaving fakeroot environment." msgstr "Lämnar fakeroot miljö." @@ -1517,9 +1486,8 @@ msgstr "Lämnar fakeroot miljö." msgid "Making package: %s" msgstr "Skapar paket: %s" -#, fuzzy msgid "A source package has already been built. (use -f to overwrite)" -msgstr "Ett paket har redan blivit byggt, (använd -f för att skriva över)" +msgstr "Ett källkodspaket har redan blivit byggt, (använd -f för att skriva över)" msgid "Source package created: %s" msgstr "Källkodspaket skapat: %s" @@ -1536,9 +1504,8 @@ msgstr "Kollar beroenden för bygget..." msgid "Could not resolve all dependencies." msgstr "Kan inte lösa alla beroenden." -#, fuzzy msgid "%s was not found in PATH; skipping dependency checks." -msgstr "pacman hittades inte i PATH; hoppar över kontroll av beroenden." +msgstr "%s hittades inte i PATH; hoppar över kontroll av beroenden." msgid "Skipping source retrieval -- using existing src/ tree" msgstr "" -- 1.7.3.1

2 3

[pacman-dev] [PATCH] PKGBUILD.vim: add special licenses BSD MIT ZLIB Python
by Xavier Chantry 23 Oct '10

23 Oct '10

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- contrib/PKGBUILD.vim | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index c2b6045..a50ca12 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -67,10 +67,13 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained -syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL contained +" echo $(pacman -Ql licenses | grep '/usr/share/licenses/common/' | cut -d'/' -f6 | sort -u) +syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RALINK RUBY ZPL contained +" special cases from http://wiki.archlinux.org/index.php/Arch_Packaging_Standards +syn keyword pbLicenseSpecial BSD MIT ZLIB Python contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained -syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense -syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense +syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense +syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicenseSpecial,pbLicense,pbIllegalLicense " backup syn keyword pb_k_backup backup contained -- 1.7.3.2

1 0

[pacman-dev] Swedish translations, again
by Tobias Eriksson 20 Oct '10

20 Oct '10

Gah, sent to wrong list :) Anyways.. Hi all! If you remember, a couple of months ago I sent in patches for the Swedish language files for pacman. Well, I'm sending a new patch, hopefully with better translations this time around :) As usual, feedback is more than welcome, and I'll try to fix any problems that come up! /Tobias

1 0

[pacman-dev] [RFC] New attempt at a better interface for adding/removing target
by Xavier Chantry 19 Oct '10

19 Oct '10

See http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=eeab3… ================================== alpm: deprecate old interface Old interface is marked as deprecated: int alpm_sync_target(char *target); int alpm_sync_dbtarget(char *db, char *target); int alpm_add_target(char *target); int alpm_remove_target(char *target); New recommended interface: int alpm_add_pkg(pmpkg_t *pkg); int alpm_remove_pkg(pmpkg_t *pkg); ================================== Having interfaces dealing directly with pmpkg_t is more powerful and more accurate. Also see http://mailman.archlinux.org/pipermail/pacman-dev/2009-June/008847.html However it's probably also less safe for bad frontends trying to do stupid things and trying to pass invalid or outdated pmpkg. I am not sure what the consequences could be, it might need some more thinking and a few sanity checks. I unified sync_pkg and add_pkg, however there was a slight behavior difference between them, which should be fixed. http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=fca9e… ================================== pacman/upgrade: switch to new interface Note that there is a behavior change here : if the same package name appeared several times in the target list, the alpm_add_target interface chooses the new package, while alpm_add_pkg returns PKG_DUP. I don't see why we cannot unify the behavior of -S and -U, and just choose one behavior that applies to both. Otherwise, it's always possible to handle these different behaviors in the frontend, it just requires more work. ================================== I just picked the two commits I found most relevant and for which I saw some possible concerns, but there are ~10 commits related to this interface rework on my branch.

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-11-g30734c9
by dan＠archlinux.org 18 Oct '10

18 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) from 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-139-g0f3957a
by dan＠archlinux.org 18 Oct '10

18 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0f3957ab48f34df8e151ec026dfac0d9d2df5aec (commit) via ce96f39ac9313a3583f346adfd2c709a658fae58 (commit) via 8f2eaa51c2705a066da3d18af287ec6e0d80c032 (commit) via 9d0b33fd3327ae6d2b15f50870c0885a2068d492 (commit) via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) via 7237903c66af3997ac754df70cc8d25cefc8d1ae (commit) via f5059038f2bd5eb30ccc8ec2ef55923896437906 (commit) from de5f438aef1dd11c68658683996deab2b0714e0e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f3957ab48f34df8e151ec026dfac0d9d2df5aec Merge: ce96f39 30734c9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 18 16:52:57 2010 -0500 Merge branch 'maint' commit ce96f39ac9313a3583f346adfd2c709a658fae58 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 12:16:03 2010 +0200 pactest: use valgrind.supp file Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f2eaa51c2705a066da3d18af287ec6e0d80c032 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:31:31 2010 +0200 Tests: '-S repo/group' syntax when calling '-S repo/group', only group members in <repo> should should be installed (group members in other repos are ignored) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d0b33fd3327ae6d2b15f50870c0885a2068d492 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:22:35 2010 +0200 Tests: Sync group which includes ignored pkgs * FS#19854 (--ignore is ignored with groups) * http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html (operation aborts when a package from a group is ignored/and user chooses not to install it) If a group member is ignored, we expect a) a question whether to install b) after saying 'no' to a), the ignored member not to be installed c) all other group members to be installed d) pacman to execute successfully Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7237903c66af3997ac754df70cc8d25cefc8d1ae Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 19:54:13 2010 +0200 be_package: read force entry and convert to epoch We still need to read force entry in epoch-aware pacman, so that when we install an old force package, EPOCH gets written to the local db. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5059038f2bd5eb30ccc8ec2ef55923896437906 Author: Carlos Diaz <839273(a)gmail.com> Date: Wed Oct 13 00:16:35 2010 -0430 bash_completion: remove upstream deprecated functions Populate $cur and $prev with the new bash-completion 1.2 function, _get_comp_words_by_ref. _get_cword and _get_pword have been deprecated. Signed-off-by: Carlos Diaz <839273(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 6 ++---- lib/libalpm/be_package.c | 5 +++++ lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- test/pacman/pmtest.py | 2 +- test/pacman/tests/ignore007.py | 23 +++++++++++++++++++++++ test/pacman/tests/sync024.py | 23 +++++++++++++++++++++++ 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 test/pacman/tests/ignore007.py create mode 100644 test/pacman/tests/sync024.py hooks/post-receive -- The official pacman repository

1 0