From b6c6b52fbb09df15933ab9ec8a3d98d2643b1268 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 12:48:15 +0200 Subject: refresh po/pot files in doc/ and po/ --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1235a0266..dd2cc6e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.8.0~pre1) unstable; urgency=low * merge of the debian-expermental-ma branch - + * refresh po/pot files in doc/ and po/ -- Michael Vogt Fri, 30 Jul 2010 12:42:57 +0200 -- cgit v1.2.3-70-g09d2 From 0fe4000eed3c22e9f614ff8f15d5448d93894a44 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 18:24:51 +0200 Subject: set to UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dd2cc6e93..831023ce1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.0~pre1) unstable; urgency=low +apt (0.8.0~pre1) UNRELASED; urgency=low * merge of the debian-expermental-ma branch * refresh po/pot files in doc/ and po/ -- cgit v1.2.3-70-g09d2 From 8d3489abd90a64715b92976a7c60b42a386a4c5c Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Mon, 9 Aug 2010 20:28:00 -0400 Subject: * Swedish translation update. Closes: #592366 * Swedish translation update. Closes: #592366 --- debian/changelog | 5 + po/sv.po | 302 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 213 insertions(+), 94 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 831023ce1..d9908d0a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ apt (0.8.0~pre1) UNRELASED; urgency=low + [ Michael Vogt ] * merge of the debian-expermental-ma branch * refresh po/pot files in doc/ and po/ + [ Programs translations ] + * Swedish translation update. Closes: #592366 + -- Michael Vogt Fri, 30 Jul 2010 12:42:57 +0200 apt (0.7.26~exp12) experimental; urgency=low @@ -349,6 +353,7 @@ apt (0.7.26~exp5) experimental; urgency=low [ Christian Perrier ] * Slovak translation update. Closes: #581159 * Italian translation update. Closes: #581742 + * Swedish translation update. Closes: #592366 -- Michael Vogt Tue, 25 May 2010 16:01:42 +0200 diff --git a/po/sv.po b/po/sv.po index c599eff89..1d389b2e7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,16 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages +# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt package. # Peter Karlsson , 2002-2008. -# Daniel Nylander , 2005-2009. +# Daniel Nylander , 2005-2010. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-07-30 12:45+0200\n" -"PO-Revision-Date: 2009-03-03 23:15+0100\n" +"PO-Revision-Date: 2010-08-09 17:11+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -20,7 +22,7 @@ msgstr "" #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -"Paketet %s med versionen %s har ett beroende som inte kan tillfredsställas:\n" +"Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n" #: cmdline/apt-cache.cc:284 msgid "Total package names: " @@ -28,12 +30,13 @@ msgstr "Totalt antal paketnamn: " #: cmdline/apt-cache.cc:286 #, fuzzy +#| msgid "Total package names: " msgid "Total package structures: " msgstr "Totalt antal paketnamn: " #: cmdline/apt-cache.cc:326 msgid " Normal packages: " -msgstr " Normala paket: " +msgstr " Vanliga paket: " #: cmdline/apt-cache.cc:327 msgid " Pure virtual packages: " @@ -98,6 +101,7 @@ msgstr "Paketfilen %s är inte synkroniserad." #: cmdline/apt-cache.cc:1273 #, fuzzy +#| msgid "You must give exactly one pattern" msgid "You must give at least one search pattern" msgstr "Du måste ange exakt ett mönster" @@ -158,6 +162,42 @@ msgstr "%s %s för %s kompilerad den %s %s\n" #: cmdline/apt-cache.cc:1739 #, fuzzy +#| msgid "" +#| "Usage: apt-cache [options] command\n" +#| " apt-cache [options] add file1 [file2 ...]\n" +#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-cache is a low-level tool used to manipulate APT's binary\n" +#| "cache files, and query information from them\n" +#| "\n" +#| "Commands:\n" +#| " add - Add a package file to the source cache\n" +#| " gencaches - Build both the package and source cache\n" +#| " showpkg - Show some general information for a single package\n" +#| " showsrc - Show source records\n" +#| " stats - Show some basic statistics\n" +#| " dump - Show the entire file in a terse form\n" +#| " dumpavail - Print an available file to stdout\n" +#| " unmet - Show unmet dependencies\n" +#| " search - Search the package list for a regex pattern\n" +#| " show - Show a readable record for the package\n" +#| " depends - Show raw dependency information for a package\n" +#| " rdepends - Show reverse dependency information for a package\n" +#| " pkgnames - List the names of all packages in the system\n" +#| " dotty - Generate package graphs for GraphViz\n" +#| " xvcg - Generate package graphs for xvcg\n" +#| " policy - Show policy settings\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -p=? The package cache.\n" +#| " -s=? The source cache.\n" +#| " -q Disable progress indicator.\n" +#| " -i Show only important deps for the unmet command.\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -233,18 +273,17 @@ msgstr "" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" #: cmdline/apt-cdrom.cc:77 -#, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 2.1r1 Disk 1\"" +msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "Mata in en skiva i enheten och tryck på Enter" #: cmdline/apt-cdrom.cc:127 -#, fuzzy, c-format +#, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Misslyckades med att byta namn på %s till %s" +msgstr "Misslyckades med att montera \"%s\" till \"%s\"" #: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." @@ -445,7 +484,6 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB är gammal, försöker uppgradera %s" #: ftparchive/cachedb.cc:72 -#, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -764,16 +802,19 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #: cmdline/apt-get.cc:634 #, fuzzy, c-format +#| msgid "Note, selecting %s for regex '%s'\n" msgid "Note, selecting '%s' for task '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" #: cmdline/apt-get.cc:640 #, fuzzy, c-format +#| msgid "Note, selecting %s for regex '%s'\n" msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" #: cmdline/apt-get.cc:647 #, fuzzy, c-format +#| msgid "Selected version %s (%s) for %s\n" msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Vald version %s (%s) för %s\n" @@ -788,6 +829,7 @@ msgstr " [Installerat]" #: cmdline/apt-get.cc:677 #, fuzzy +#| msgid "Candidate versions" msgid " [Not candidate version]" msgstr "Kandiderande versioner" @@ -812,6 +854,7 @@ msgstr "Dock kan följande paket ersätta det:" #: cmdline/apt-get.cc:712 #, fuzzy, c-format +#| msgid "Package %s has no installation candidate" msgid "Package '%s' has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" @@ -822,6 +865,7 @@ msgstr "" #: cmdline/apt-get.cc:754 #, fuzzy, c-format +#| msgid "Note, selecting %s instead of %s\n" msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Observera, väljer %s istället för %s\n" @@ -833,6 +877,7 @@ msgstr "" #: cmdline/apt-get.cc:788 #, fuzzy, c-format +#| msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" @@ -878,6 +923,8 @@ msgid " Done" msgstr " Färdig" #: cmdline/apt-get.cc:949 +#, fuzzy +#| msgid "You might want to run `apt-get -f install' to correct these." msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"." @@ -1039,18 +1086,18 @@ msgstr "" #: cmdline/apt-get.cc:1454 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgstr "Ignorera otillgängliga målutgåvan \"%s\" av paketet \"%s\"" #: cmdline/apt-get.cc:1486 -#, fuzzy, c-format +#, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Kunde inte ta status på källkodspaketlistan %s" +msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) #: cmdline/apt-get.cc:1524 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" +msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\"" #: cmdline/apt-get.cc:1540 msgid "The update command takes no arguments" @@ -1063,6 +1110,9 @@ msgstr "" #: cmdline/apt-get.cc:1653 #, fuzzy +#| msgid "" +#| "The following packages were automatically installed and are no longer " +#| "required:" msgid "" "The following package is automatically installed and is no longer required:" msgid_plural "" @@ -1075,13 +1125,15 @@ msgstr[1] "" #: cmdline/apt-get.cc:1657 #, fuzzy, c-format +#| msgid "" +#| "%lu packages were automatically installed and are no longer required.\n" msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "" -"Följande paket har installerats automatiskt och är inte längre nödvändiga:" +"%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" msgstr[1] "" -"Följande paket har installerats automatiskt och är inte längre nödvändiga:" +"%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" #: cmdline/apt-get.cc:1659 msgid "Use 'apt-get autoremove' to remove them." @@ -1118,6 +1170,8 @@ msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" #: cmdline/apt-get.cc:1779 +#, fuzzy +#| msgid "You might want to run `apt-get -f install' to correct these:" msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" @@ -1165,6 +1219,7 @@ msgstr "Kunde inte hitta paketet %s" #: cmdline/apt-get.cc:1981 #, fuzzy, c-format +#| msgid "%s set to manually installed.\n" msgid "%s set to automatically installed.\n" msgstr "%s är satt till manuellt installerad.\n" @@ -1324,6 +1379,47 @@ msgstr "Moduler som stöds:" #: cmdline/apt-get.cc:2786 #, fuzzy +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1369,19 +1465,19 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Användning: apt-get [flaggor] kommando\n" -" apt-get [flaggor] install|remove paket1 [paket2 ...]\n" -" apt-get [flaggor] source paket1 [paket2 ...]\n" +" apt-get [flaggor] install|remove paket1 [paket2 ...]\n" +" apt-get [flaggor] source paket1 [paket2 ...]\n" "\n" "apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n" "paket. De mest använda kommandona är \"update\" och \"install\".\n" "\n" "Kommandon:\n" " update - Hämta nya paketlistor\n" -" upgrade - Utför en uppgradering\n" +" upgrade - Genomför en uppgradering\n" " install - Installera nya paket (paket är libc6, inte libc6.deb)\n" " remove - Ta bort paket\n" " autoremove - Ta automatiskt bort alla oanvända paket\n" -" purge - Ta bort och helt radera paket\n" +" purge - Ta bort paket och konfigurationsfiler\n" " source - Hämta källkodsarkiv\n" " build-dep - Tillfredsställ byggberoenden för källkodspaket\n" " dist-upgrade - Uppgradering av distributionen, se apt-get(8)\n" @@ -1415,6 +1511,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" +"OBSERVERA: Detta är endast en simulation!\n" +" apt-get behöver root-privilegier för verklig körning.\n" +" Tänk också på att låsningen är inaktiverad, så\n" +" förlita dig inte på relevansen till den verkliga situationen!" # Måste vara tre bokstäver(?) # "Hit" = aktuell version är fortfarande giltig @@ -1503,18 +1603,17 @@ msgstr "Vill du ta bort eventuellt tidigare hämtade .deb-filer?" # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. #: dselect/install:101 -#, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Det uppstod fel vid uppackning. Jag kommer konfigurera de paket" +msgstr "Det uppstod fel vid uppackning. Paketen som blev installerade kommer" #: dselect/install:102 -#, fuzzy msgid "will be configured. This may result in duplicate errors" -msgstr "som installerades. Detta kan ge dubbla fel eller fel orsakade av" +msgstr "" +"att konfigureras. Detta kan resultera i dubbletta fel eller fel orsakade" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "saknade beroenden. Detta är okej, endast felen ovanför det här" +msgstr "av saknade beroenden. Detta är okej, endast felen ovanför detta" #: dselect/install:104 msgid "" @@ -1555,9 +1654,9 @@ msgid "Error reading archive member header" msgstr "Fel vid läsning av rubrik för arkivdel" #: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format +#, c-format msgid "Invalid archive member header %s" -msgstr "Ogiltigt arkivdelsrubrik" +msgstr "Ogiltig arkivdelsrubrik %s" #: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" @@ -2041,20 +2140,20 @@ msgstr "Temporärt fel vid uppslagning av \"%s\"" # Okänd felkod; %i = koden #: methods/connect.cc:196 -#, fuzzy, c-format +#, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)" +msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" #: methods/connect.cc:243 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s:%s:" -msgstr "Kunde inte ansluta till %s %s:" +msgstr "Kunde inte ansluta till %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:71 -#, fuzzy, c-format +#, c-format msgid "No keyring installed in %s." -msgstr "Avbryter installationen." +msgstr "Ingen nyckelring installerad i %s." #: methods/gpgv.cc:163 msgid "" @@ -2069,6 +2168,7 @@ msgstr "Minst en ogiltig signatur träffades på." #: methods/gpgv.cc:172 #, fuzzy +#| msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)" @@ -2172,6 +2272,7 @@ msgstr "Kan inte utföra mmap på en tom fil" #: apt-pkg/contrib/mmap.cc:89 #, fuzzy, c-format +#| msgid "Couldn't open pipe for %s" msgid "Couldn't duplicate file descriptor %i" msgstr "Kunde inte öppna rör för %s" @@ -2182,11 +2283,13 @@ msgstr "Kunde inte utföra mmap på %lu byte" #: apt-pkg/contrib/mmap.cc:124 #, fuzzy +#| msgid "Unable to open %s" msgid "Unable to close mmap" msgstr "Kunde inte öppna %s" #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 #, fuzzy +#| msgid "Unable to invoke " msgid "Unable to synchronize mmap" msgstr "Kunde inte starta " @@ -2215,25 +2318,25 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:371 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%lih %limin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%limin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:390 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" #: apt-pkg/contrib/strutl.cc:1119 #, c-format @@ -2287,6 +2390,7 @@ msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" #: apt-pkg/contrib/configuration.cc:777 #, fuzzy, c-format +#| msgid "Syntax error %s:%u: Directives can only be done at the top level" msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" @@ -2399,9 +2503,9 @@ msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." #: apt-pkg/contrib/fileutl.cc:635 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." +msgstr "Underprocessen %s tog emot signal %u." #: apt-pkg/contrib/fileutl.cc:639 #, c-format @@ -2420,8 +2524,9 @@ msgstr "Kunde inte öppna filen %s" #: apt-pkg/contrib/fileutl.cc:714 #, fuzzy, c-format +#| msgid "Could not open file %s" msgid "Could not open file descriptor %d" -msgstr "Kunde inte öppna rör för %s" +msgstr "Kunde inte öppna filen %s" #: apt-pkg/contrib/fileutl.cc:774 #, c-format @@ -2435,21 +2540,25 @@ msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" #: apt-pkg/contrib/fileutl.cc:906 #, fuzzy, c-format +#| msgid "Problem closing the file" msgid "Problem closing the gzip file %s" msgstr "Problem med att stänga filen" #: apt-pkg/contrib/fileutl.cc:909 #, fuzzy, c-format +#| msgid "Problem closing the file" msgid "Problem closing the file %s" msgstr "Problem med att stänga filen" #: apt-pkg/contrib/fileutl.cc:914 #, fuzzy, c-format +#| msgid "Problem syncing the file" msgid "Problem renaming the file %s to %s" msgstr "Problem med att synkronisera filen" #: apt-pkg/contrib/fileutl.cc:925 #, fuzzy, c-format +#| msgid "Problem unlinking the file" msgid "Problem unlinking the file %s" msgstr "Problem med att länka ut filen" @@ -2511,11 +2620,11 @@ msgstr "Föråldrar" #: apt-pkg/pkgcache.cc:292 msgid "Breaks" -msgstr "Trasar sönder" +msgstr "Gör sönder" #: apt-pkg/pkgcache.cc:292 msgid "Enhances" -msgstr "" +msgstr "Utökar" #: apt-pkg/pkgcache.cc:303 msgid "important" @@ -2527,7 +2636,7 @@ msgstr "nödvändigt" #: apt-pkg/pkgcache.cc:303 msgid "standard" -msgstr "normalt" +msgstr "standard" #: apt-pkg/pkgcache.cc:304 msgid "optional" @@ -2580,26 +2689,31 @@ msgstr "Kunde inte tolka paketfilen %s (2)" #: apt-pkg/sourcelist.cc:92 #, fuzzy, c-format +#| msgid "Malformed line %lu in source list %s (dist parse)" msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" #: apt-pkg/sourcelist.cc:95 #, fuzzy, c-format +#| msgid "Malformed line %lu in source list %s (dist)" msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "Rad %lu i källistan %s har fel format (dist)" #: apt-pkg/sourcelist.cc:106 #, fuzzy, c-format +#| msgid "Malformed line %lu in source list %s (dist parse)" msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" #: apt-pkg/sourcelist.cc:112 #, fuzzy, c-format +#| msgid "Malformed line %lu in source list %s (dist parse)" msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" #: apt-pkg/sourcelist.cc:115 #, fuzzy, c-format +#| msgid "Malformed line %lu in source list %s (dist parse)" msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" @@ -2654,6 +2768,8 @@ msgid "" "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" +"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " +"under APT::Immediate-Configure för information. (%d)" #: apt-pkg/packagemanager.cc:452 #, c-format @@ -2673,6 +2789,8 @@ msgid "" "Could not perform immediate configuration on already unpacked '%s'.Please " "see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" +"Kunde inte genomföra omedelbar konfiguration på redan uppackade \"%s\". Se " +"man 5 apt.conf under APT::Immediate-Configure för information." #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2696,7 +2814,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1184 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kunde inte korrigera problemen, du har hållt tillbaka trasiga paket." +msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." #: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462 msgid "" @@ -2708,16 +2826,19 @@ msgstr "" #: apt-pkg/acquire.cc:79 #, fuzzy, c-format +#| msgid "Lists directory %spartial is missing." msgid "List directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." #: apt-pkg/acquire.cc:83 #, fuzzy, c-format +#| msgid "Archive directory %spartial is missing." msgid "Archives directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." #: apt-pkg/acquire.cc:91 #, fuzzy, c-format +#| msgid "Unable to lock the list directory" msgid "Unable to lock directory %s" msgstr "Kunde inte låsa listkatalogen" @@ -2778,9 +2899,9 @@ msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\ # "Package" är en sträng i konfigurationsfilen #: apt-pkg/policy.cc:343 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas" +msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas" #: apt-pkg/policy.cc:365 #, c-format @@ -2824,6 +2945,7 @@ msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 #: apt-pkg/pkgcachegen.cc:324 #, fuzzy, c-format +#| msgid "Error occurred while processing %s (NewVersion1)" msgid "Error occurred while processing %s (NewVersion%d)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" @@ -2955,29 +3077,31 @@ msgid "Size mismatch" msgstr "Storleken stämmer inte" #: apt-pkg/indexrecords.cc:53 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Kunde inte tolka paketfilen %s (1)" +msgstr "Kunde inte tolka \"Release\"-filen %s" #: apt-pkg/indexrecords.cc:60 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Observera, väljer %s istället för %s\n" +msgstr "Inga sektioner i Release-filen %s" #: apt-pkg/indexrecords.cc:94 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Ingen Hash-post i Release-filen %s" #: apt-pkg/indexrecords.cc:107 #, fuzzy, c-format +#| msgid "No Hash entry in Release file %s" msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Felaktig rad i omdirigeringsfilen: %s" +msgstr "Ingen Hash-post i Release-filen %s" #: apt-pkg/indexrecords.cc:122 #, fuzzy, c-format +#| msgid "No Hash entry in Release file %s" msgid "Invalid 'Date' entry in Release file %s" -msgstr "Kunde inte tolka paketfilen %s (1)" +msgstr "Ingen Hash-post i Release-filen %s" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -3042,6 +3166,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva " +"eller felaktig arkitektur?" #: apt-pkg/cdrom.cc:703 #, c-format @@ -3094,19 +3220,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" #: apt-pkg/indexcopy.cc:532 -#, fuzzy, c-format +#, c-format msgid "Skipping nonexistent file %s" -msgstr "Öppnar konfigurationsfilen %s" +msgstr "Hoppar över icke-existerande filen %s" #: apt-pkg/indexcopy.cc:538 #, c-format msgid "Can't find authentication record for: %s" -msgstr "" +msgstr "Kan inte hitta autentiseringspost för: %s" #: apt-pkg/indexcopy.cc:544 -#, fuzzy, c-format +#, c-format msgid "Hash mismatch for: %s" -msgstr "Hash-kontrollsumman stämmer inte" +msgstr "Hash-kontrollsumman stämmer inte för: %s" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format @@ -3124,9 +3250,9 @@ msgid "Removing %s" msgstr "Tar bort %s" #: apt-pkg/deb/dpkgpm.cc:55 -#, fuzzy, c-format +#, c-format msgid "Completely removing %s" -msgstr "Tog bort hela %s" +msgstr "Tar bort hela %s" #: apt-pkg/deb/dpkgpm.cc:56 #, c-format @@ -3144,9 +3270,9 @@ msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671 -#, fuzzy, c-format +#, c-format msgid "Could not open file '%s'" -msgstr "Kunde inte öppna filen %s" +msgstr "Kunde inte öppna filen \"%s\"" #: apt-pkg/deb/dpkgpm.cc:812 #, c-format @@ -3195,7 +3321,7 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:1070 msgid "Running dpkg" -msgstr "" +msgstr "Kör dpkg" #: apt-pkg/deb/dpkgpm.cc:1273 msgid "No apport report written because MaxReports is reached already" @@ -3235,23 +3361,29 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" +"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?" #: apt-pkg/deb/debsystem.cc:72 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Kunde inte låsa listkatalogen" +msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a #: apt-pkg/deb/debsystem.cc:88 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "dpkg was interrupted, you must manually run 'dpkg --configure -a' to " +#| "correct the problem. " msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" +"dpkg avbröts. Du måste köra \"dpkg --configure -a\" manuellt för att rätta " +"till problemet. " #: apt-pkg/deb/debsystem.cc:106 msgid "Not locked" -msgstr "" +msgstr "Inte låst" #: methods/rred.cc:465 #, c-format @@ -3259,6 +3391,8 @@ msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" +"Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen " +"verkar vara skadad." #: methods/rred.cc:470 #, c-format @@ -3266,6 +3400,8 @@ msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" +"Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen verkar " +"vara skadad." #: methods/rsh.cc:329 msgid "Connection closed prematurely" @@ -3280,23 +3416,23 @@ msgstr "Anslutningen stängdes i förtid" #~ msgid "Couldn't find task %s" #~ msgstr "Kunde inte hitta funktionen %s" +#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting." +#~ msgstr "F: För många nyckelringar skulle skickas till gpgv. Avslutar." + #~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." #~ msgstr "" #~ "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar." -#~ msgid "Couldn't open pipe for %s" -#~ msgstr "Kunde inte öppna rör för %s" - # %s = programnamn #~ msgid "Read error from %s process" #~ msgstr "Läsfel från %s-processen" -#~ msgid "Error occurred while processing %s (NewVersion2)" -#~ msgstr "Fel uppstod vid hantering av %s (NewVersion2)" - #~ msgid "Malformed line %u in source list %s (vendor id)" #~ msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Fel uppstod vid hantering av %s (NewVersion2)" + #~ msgid "Couldn't access keyring: '%s'" #~ msgstr "Kunde inte komma åt nyckelring: \"%s\"" @@ -3305,25 +3441,3 @@ msgstr "Anslutningen stängdes i förtid" #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" - -# Prioritet följt av URI -#~ msgid "%4i %s\n" -#~ msgstr "%4i %s\n" - -#~ msgid "Processing triggers for %s" -#~ msgstr "Behandlar utlösare för %s" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "Dynamisk MMap fick slut på utrymme" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Eftersom du bad om en enda handling är det mycket troligt att paketet\n" -#~ "helt enkelt inte kan installeras och att en felrapport om detta bör\n" -#~ "skickas in." - -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "Rad %d är för lång (max %lu)" -- cgit v1.2.3-70-g09d2 From 47f6d1b72bc883ecdc00542da4c824a5c4fb79fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 10 Aug 2010 15:58:09 +0200 Subject: * apt-pkg/algorithms.cc: - change the debug outputs to display also arch of the package and version dependencies information --- apt-pkg/algorithms.cc | 74 ++++++++++++++++++++++++------------------------ apt-pkg/cacheiterators.h | 3 ++ apt-pkg/pkgcache.cc | 24 ++++++++++++++++ debian/changelog | 7 ++++- 4 files changed, 70 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f17c76d6c..12c5b8710 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -58,7 +58,7 @@ void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Current,bool Candid { VerIterator Ver(Sim); - out << Pkg.Name(); + out << Pkg.FullName(true); if (Current == true) { @@ -123,9 +123,9 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) { if ((Sim[End] & pkgDepCache::DepGInstall) == 0) { - cout << " [" << I.Name() << " on " << Start.TargetPkg().Name() << ']'; + cout << " [" << I.FullName(false) << " on " << Start.TargetPkg().FullName(false) << ']'; if (Start->Type == pkgCache::Dep::Conflicts) - _error->Error("Fatal, conflicts violated %s",I.Name()); + _error->Error("Fatal, conflicts violated %s",I.FullName(false).c_str()); } } } @@ -165,7 +165,7 @@ bool pkgSimulate::Configure(PkgIterator iPkg) // Sim.MarkInstall(Pkg,false); if (Sim[Pkg].InstBroken() == true) { - cout << "Conf " << Pkg.Name() << " broken" << endl; + cout << "Conf " << Pkg.FullName(false) << " broken" << endl; Sim.Update(); @@ -177,17 +177,17 @@ bool pkgSimulate::Configure(PkgIterator iPkg) continue; if (D->Type == pkgCache::Dep::Obsoletes) - cout << " Obsoletes:" << D.TargetPkg().Name(); + cout << " Obsoletes:" << D.TargetPkg().FullName(false); else if (D->Type == pkgCache::Dep::Conflicts) - cout << " Conflicts:" << D.TargetPkg().Name(); + cout << " Conflicts:" << D.TargetPkg().FullName(false); else if (D->Type == pkgCache::Dep::DpkgBreaks) - cout << " Breaks:" << D.TargetPkg().Name(); + cout << " Breaks:" << D.TargetPkg().FullName(false); else - cout << " Depends:" << D.TargetPkg().Name(); + cout << " Depends:" << D.TargetPkg().FullName(false); } cout << endl; - _error->Error("Conf Broken %s",Pkg.Name()); + _error->Error("Conf Broken %s",Pkg.FullName(false)); } else { @@ -254,7 +254,7 @@ void pkgSimulate::ShortBreaks() if (Sim[I].InstBroken() == true) { if (Flags[I->ID] == 0) - cout << I.Name() << ' '; + cout << I.FullName(false) << ' '; /* else cout << I.Name() << "! ";*/ } @@ -290,7 +290,7 @@ bool pkgApplyStatus(pkgDepCache &Cache) Cache.MarkInstall(I, false, 0, false); else return _error->Error(_("The package %s needs to be reinstalled, " - "but I can't find an archive for it."),I.Name()); + "but I can't find an archive for it."),I.FullName(true)); } continue; @@ -325,7 +325,7 @@ bool pkgApplyStatus(pkgDepCache &Cache) default: if (I->InstState != pkgCache::State::Ok) return _error->Error("The package %s is not ok and I " - "don't know how to fix it!",I.Name()); + "don't know how to fix it!",I.FullName(false)); } } return true; @@ -709,7 +709,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) if ((Flags[P->ID] & Protected) == Protected) { if (Debug == true) - clog << " Reinst Failed because of protected " << P.Name() << endl; + clog << " Reinst Failed because of protected " << P.FullName(false) << endl; Fail = true; } else @@ -720,7 +720,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) if (DoUpgrade(P) == false) { if (Debug == true) - clog << " Reinst Failed because of " << P.Name() << endl; + clog << " Reinst Failed because of " << P.FullName(false) << endl; Fail = true; } else @@ -739,7 +739,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) break; if (Debug == true) - clog << " Reinst Failed early because of " << Start.TargetPkg().Name() << endl; + clog << " Reinst Failed early because of " << Start.TargetPkg().FullName(false) << endl; Fail = true; } } @@ -763,7 +763,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) } if (Debug == true) - clog << " Re-Instated " << Pkg.Name() << endl; + clog << " Re-Instated " << Pkg.FullName(false) << endl; return true; } /*}}}*/ @@ -863,7 +863,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) (Flags[I->ID] & ReInstateTried) == 0) { if (Debug == true) - clog << " Try to Re-Instate " << I.Name() << endl; + clog << " Try to Re-Instate " << I.FullName(false) << endl; unsigned long OldBreaks = Cache.BrokenCount(); pkgCache::Version *OldVer = Cache[I].InstallVer; Flags[I->ID] &= ReInstateTried; @@ -879,14 +879,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } else if (Debug == true) - clog << "Re-Instated " << I.Name() << " (" << OldBreaks << " vs " << Cache.BrokenCount() << ')' << endl; + clog << "Re-Instated " << I.FullName(false) << " (" << OldBreaks << " vs " << Cache.BrokenCount() << ')' << endl; } if (Cache[I].InstallVer == 0 || Cache[I].InstBroken() == false) continue; if (Debug == true) - clog << "Investigating " << I.Name() << endl; + clog << "Investigating " << I << endl; // Isolate the problem dependency PackageKill KillList[100]; @@ -911,7 +911,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if ((Flags[I->ID] & Protected) != Protected) { if (Debug == true) - clog << " Or group remove for " << I.Name() << endl; + clog << " Or group remove for " << I.FullName(false) << endl; Cache.MarkDelete(I); Change = true; } @@ -919,7 +919,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (OldEnd == LEnd && OrOp == OrKeep) { if (Debug == true) - clog << " Or group keep for " << I.Name() << endl; + clog << " Or group keep for " << I.FullName(false) << endl; Cache.MarkKeep(I, false, false); Change = true; } @@ -956,7 +956,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug == true) - clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl; + clog << "Broken " << Start << endl; /* Look across the version list. If there are no possible targets then we keep the package and bail. This is necessary @@ -987,8 +987,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::PkgIterator Pkg = Ver.ParentPkg(); if (Debug == true) - clog << " Considering " << Pkg.Name() << ' ' << (int)Scores[Pkg->ID] << - " as a solution to " << I.Name() << ' ' << (int)Scores[I->ID] << endl; + clog << " Considering " << Pkg.FullName(false) << ' ' << (int)Scores[Pkg->ID] << + " as a solution to " << I.FullName(false) << ' ' << (int)Scores[I->ID] << endl; /* Try to fix the package under consideration rather than fiddle with the VList package */ @@ -1026,7 +1026,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) Cache.MarkInstall(I, false, 0, false); if (Debug == true) - clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; + clog << " Holding Back " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl; } else { @@ -1036,7 +1036,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (InOr == false) { if (Debug == true) - clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; + clog << " Removing " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl; Cache.MarkDelete(I); if (Counter > 1 && Scores[Pkg->ID] > Scores[I->ID]) Scores[I->ID] = Scores[Pkg->ID]; @@ -1068,7 +1068,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (Cache[End] & pkgDepCache::DepGCVer) { if (Debug) - clog << " Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl; + clog << " Upgrading " << Pkg.FullName(false) << " due to Breaks field in " << I.FullName(false) << endl; Cache.MarkInstall(Pkg, false, 0, false); continue; } @@ -1079,7 +1079,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) continue; if (Debug == true) - clog << " Added " << Pkg.Name() << " to the remove list" << endl; + clog << " Added " << Pkg.FullName(false) << " to the remove list" << endl; LEnd->Pkg = Pkg; LEnd->Dep = End; @@ -1111,12 +1111,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) Cache.MarkInstall(I, false, 0, false); if (Debug == true) - clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl; + clog << " Holding Back " << I.FullName(false) << " because I can't find " << Start.TargetPkg().FullName(false) << endl; } else { if (Debug == true) - clog << " Removing " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl; + clog << " Removing " << I.FullName(false) << " because I can't find " << Start.TargetPkg().FullName(false) << endl; if (InOr == false) Cache.MarkDelete(I); } @@ -1146,14 +1146,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) J->Dep->Type == pkgCache::Dep::Obsoletes) { if (Debug == true) - clog << " Fixing " << I.Name() << " via remove of " << J->Pkg.Name() << endl; + clog << " Fixing " << I.FullName(false) << " via remove of " << J->Pkg.FullName(false) << endl; Cache.MarkDelete(J->Pkg); } } else { if (Debug == true) - clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl; + clog << " Fixing " << I.FullName(false) << " via keep of " << J->Pkg.FullName(false) << endl; Cache.MarkKeep(J->Pkg, false, false); } @@ -1189,7 +1189,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) for (;I.end() != true; I++) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { if(_config->FindI("Debug::pkgAutoRemove",false)) { - std::clog << "Resolve installed new pkg: " << I.Name() + std::clog << "Resolve installed new pkg: " << I.FullName(false) << " (now marking it as auto)" << std::endl; } Cache[I].Flags |= pkgCache::Flag::Auto; @@ -1252,7 +1252,7 @@ bool pkgProblemResolver::ResolveByKeep() if ((Flags[I->ID] & Protected) == 0) { if (Debug == true) - clog << "Keeping package " << I.Name() << endl; + clog << "Keeping package " << I.FullName(false) << endl; Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { @@ -1283,7 +1283,7 @@ bool pkgProblemResolver::ResolveByKeep() while (true) { if (Debug == true) - clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl; + clog << "Package " << I.FullName(false) << " " << Start << endl; // Look at all the possible provides on this package SPtrArray VList = Start.AllTargets(); @@ -1300,7 +1300,7 @@ bool pkgProblemResolver::ResolveByKeep() if ((Flags[I->ID] & Protected) == 0) { if (Debug == true) - clog << " Keeping Package " << Pkg.Name() << " due to " << Start.DepType() << endl; + clog << " Keeping Package " << Pkg.FullName(false) << " due to " << Start.DepType() << endl; Cache.MarkKeep(Pkg, false, false); } @@ -1325,7 +1325,7 @@ bool pkgProblemResolver::ResolveByKeep() // Restart again. if (K == LastStop) - return _error->Error("Internal Error, pkgProblemResolver::ResolveByKeep is looping on package %s.",I.Name()); + return _error->Error("Internal Error, pkgProblemResolver::ResolveByKeep is looping on package %s.",I.FullName(false)); LastStop = K; K = PList - 1; } diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 0be9368bd..26070636e 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -293,6 +293,9 @@ class pkgCache::DepIterator : public Iterator { inline const char *CompType() const {return Owner->CompType(S->CompareOp);}; inline const char *DepType() const {return Owner->DepType(S->Type);}; + //Nice printable representation + friend std::ostream& operator <<(std::ostream& out, DepIterator D); + inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : Iterator(Owner, Trg), Type(DepVer) { if (S == 0) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 9e1f8b633..2b051cbb0 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -661,6 +661,30 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) } } /*}}}*/ +// ostream operator to handle string representation of a dependecy /*{{{*/ +// --------------------------------------------------------------------- +/* */ +std::ostream& operator<<(ostream& out, pkgCache::DepIterator D) +{ + if (D.end() == true) + return out << "invalid dependency"; + + pkgCache::PkgIterator P = D.ParentPkg(); + pkgCache::PkgIterator T = D.TargetPkg(); + + out << (P.end() ? "invalid pkg" : P.FullName(false)) << " " << D.DepType() + << " on "; + if (T.end() == true) + out << "invalid pkg"; + else + out << T; + + if (D->Version != 0) + out << " (" << D.CompType() << " " << D.TargetVer() << ")"; + + return out; +} + /*}}}*/ // VerIterator::CompareVer - Fast version compare for same pkgs /*{{{*/ // --------------------------------------------------------------------- /* This just looks over the version list to see if B is listed before A. In diff --git a/debian/changelog b/debian/changelog index d9908d0a6..69b1649c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,12 @@ apt (0.8.0~pre1) UNRELASED; urgency=low [ Programs translations ] * Swedish translation update. Closes: #592366 - -- Michael Vogt Fri, 30 Jul 2010 12:42:57 +0200 + [ David Kalnischkies ] + * apt-pkg/algorithms.cc: + - change the debug outputs to display also arch of the + package and version dependencies information + + -- David Kalnischkies Tue, 10 Aug 2010 15:56:11 +0200 apt (0.7.26~exp12) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 086bb6d7b5ba933e0a8a6de13d731fcfb8eeda74 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 11 Aug 2010 19:39:44 +0200 Subject: * cmdline/apt-get.cc: - let APT::Get::Arch-Only in build-dep default to false again (Closes: #592628) Thanks Mohamed Amine IL Idrissi for report! --- cmdline/apt-get.cc | 4 +++- debian/changelog | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c0e74b37b..dac0d42a8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -28,6 +28,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include #include #include #include @@ -2493,6 +2494,7 @@ bool DoBuildDep(CommandLine &CmdL) return false; unsigned J = 0; + bool const StripMultiArch = APT::Configuration::getArchitectures().size() <= 1; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; @@ -2502,7 +2504,7 @@ bool DoBuildDep(CommandLine &CmdL) // Process the build-dependencies vector BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false) + if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present diff --git a/debian/changelog b/debian/changelog index 1207fb52f..0a6a7a8fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,11 @@ apt (0.8.0~pre1) UNRELASED; urgency=low * apt-pkg/algorithms.cc: - change the debug outputs to display also arch of the package and version dependencies information + * cmdline/apt-get.cc: + - let APT::Get::Arch-Only in build-dep default to false again + (Closes: #592628) Thanks Mohamed Amine IL Idrissi for report! - -- David Kalnischkies Tue, 10 Aug 2010 15:56:11 +0200 + -- David Kalnischkies Wed, 11 Aug 2010 19:36:21 +0200 apt (0.7.26~exp12) experimental; urgency=low -- cgit v1.2.3-70-g09d2