From 4e2ee0c6dd09706f379b980796625439d16cc598 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2011 09:49:51 +0200 Subject: merged from debian-sid --- po/python-apt.pot | 188 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 89 deletions(-) (limited to 'po/python-apt.pot') diff --git a/po/python-apt.pot b/po/python-apt.pot index ec222e09..78f1fd11 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-21 15:14+0100\n" +"POT-Creation-Date: 2011-08-01 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,307 +24,317 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:13 +#: ../data/templates/Ubuntu.info.in:32 +msgid "Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:39 +msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:150 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:31 +#: ../data/templates/Ubuntu.info.in:157 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:94 +#: ../data/templates/Ubuntu.info.in:248 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:112 +#: ../data/templates/Ubuntu.info.in:267 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:124 +#: ../data/templates/Ubuntu.info.in:279 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:126 +#: ../data/templates/Ubuntu.info.in:281 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:127 +#: ../data/templates/Ubuntu.info.in:282 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:134 +#: ../data/templates/Ubuntu.info.in:289 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:136 +#: ../data/templates/Ubuntu.info.in:291 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:137 +#: ../data/templates/Ubuntu.info.in:292 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:175 +#: ../data/templates/Ubuntu.info.in:330 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:193 +#: ../data/templates/Ubuntu.info.in:349 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:236 +#: ../data/templates/Ubuntu.info.in:392 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:254 +#: ../data/templates/Ubuntu.info.in:411 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:297 +#: ../data/templates/Ubuntu.info.in:454 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:315 +#: ../data/templates/Ubuntu.info.in:473 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:358 +#: ../data/templates/Ubuntu.info.in:516 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:376 +#: ../data/templates/Ubuntu.info.in:535 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:420 +#: ../data/templates/Ubuntu.info.in:579 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:438 +#: ../data/templates/Ubuntu.info.in:598 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:483 +#: ../data/templates/Ubuntu.info.in:643 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:501 +#: ../data/templates/Ubuntu.info.in:662 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:546 +#: ../data/templates/Ubuntu.info.in:707 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:564 +#: ../data/templates/Ubuntu.info.in:726 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:606 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:611 +#: ../data/templates/Ubuntu.info.in:773 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:617 +#: ../data/templates/Ubuntu.info.in:779 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:624 +#: ../data/templates/Ubuntu.info.in:787 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:666 +#: ../data/templates/Ubuntu.info.in:829 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:669 +#: ../data/templates/Ubuntu.info.in:832 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:671 +#: ../data/templates/Ubuntu.info.in:834 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:672 +#: ../data/templates/Ubuntu.info.in:835 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:674 +#: ../data/templates/Ubuntu.info.in:837 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:675 +#: ../data/templates/Ubuntu.info.in:838 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:677 +#: ../data/templates/Ubuntu.info.in:840 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:678 +#: ../data/templates/Ubuntu.info.in:841 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:684 +#: ../data/templates/Ubuntu.info.in:848 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:700 +#: ../data/templates/Ubuntu.info.in:864 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:705 +#: ../data/templates/Ubuntu.info.in:869 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:710 +#: ../data/templates/Ubuntu.info.in:874 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:715 +#: ../data/templates/Ubuntu.info.in:879 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:890 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:740 +#: ../data/templates/Ubuntu.info.in:905 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:756 +#: ../data/templates/Ubuntu.info.in:921 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:761 +#: ../data/templates/Ubuntu.info.in:926 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:766 +#: ../data/templates/Ubuntu.info.in:931 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:777 +#: ../data/templates/Ubuntu.info.in:942 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:791 +#: ../data/templates/Ubuntu.info.in:957 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:794 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:960 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:807 +#: ../data/templates/Ubuntu.info.in:973 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:812 +#: ../data/templates/Ubuntu.info.in:978 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:817 +#: ../data/templates/Ubuntu.info.in:983 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:823 +#: ../data/templates/Ubuntu.info.in:989 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:829 +#: ../data/templates/Ubuntu.info.in:995 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:831 +#: ../data/templates/Ubuntu.info.in:997 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:837 +#: ../data/templates/Ubuntu.info.in:1004 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:840 +#: ../data/templates/Ubuntu.info.in:1007 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:842 +#: ../data/templates/Ubuntu.info.in:1009 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:849 +#: ../data/templates/Ubuntu.info.in:1016 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:854 +#: ../data/templates/Ubuntu.info.in:1021 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:859 +#: ../data/templates/Ubuntu.info.in:1026 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -390,7 +400,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:425 +#: ../aptsources/distro.py:210 ../aptsources/distro.py:428 #, python-format msgid "Server for %s" msgstr "" @@ -430,16 +440,16 @@ msgstr "" msgid "Complete" msgstr "" -#: ../apt/package.py:342 +#: ../apt/package.py:358 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1012 ../apt/package.py:1117 +#: ../apt/package.py:1065 ../apt/package.py:1171 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1123 +#: ../apt/package.py:1177 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -448,29 +458,29 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1130 +#: ../apt/package.py:1184 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:81 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:166 +#: ../apt/debfile.py:167 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:187 +#: ../apt/debfile.py:188 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:326 +#: ../apt/debfile.py:327 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -478,63 +488,63 @@ msgid "" msgstr "" #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation -#: ../apt/debfile.py:342 +#: ../apt/debfile.py:343 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:352 +#: ../apt/debfile.py:353 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -#: ../apt/debfile.py:398 +#: ../apt/debfile.py:399 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:403 +#: ../apt/debfile.py:404 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:410 +#: ../apt/debfile.py:411 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:435 +#: ../apt/debfile.py:436 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:465 +#: ../apt/debfile.py:466 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:507 +#: ../apt/debfile.py:508 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:541 +#: ../apt/debfile.py:542 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:547 +#: ../apt/debfile.py:548 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:637 +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:647 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" msgstr "" @@ -559,11 +569,11 @@ msgstr "" msgid "Get:" msgstr "" -#: ../apt/progress/text.py:204 +#: ../apt/progress/text.py:203 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:215 +#: ../apt/progress/text.py:214 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -572,19 +582,19 @@ msgid "" msgstr "" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:224 +#: ../apt/progress/text.py:223 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: ../apt/progress/text.py:240 +#: ../apt/progress/text.py:239 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -#: ../apt/progress/text.py:256 +#: ../apt/progress/text.py:255 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:135 +#: ../apt/cache.py:149 msgid "Building data structures" msgstr "" -- cgit v1.2.3 From 605d4d8661aae031482fb3a93e94cf9b62e29452 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 18:08:23 +0200 Subject: * po/python-apt.pot: - refreshed --- debian/changelog | 2 + po/python-apt.pot | 150 +++++++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 70 deletions(-) (limited to 'po/python-apt.pot') diff --git a/debian/changelog b/debian/changelog index a1a3393a..c5d21936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - use logging instead of print - update distro template Ubuntu.info.in - add xz compression support + * po/python-apt.pot: + - refreshed -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index 78f1fd11..70c68099 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-01 09:30+0200\n" +"POT-Creation-Date: 2011-10-19 18:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,317 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:32 +#: ../data/templates/Ubuntu.info.in:33 +msgid "Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:40 +msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" +msgstr "" + +#. Description +#: ../data/templates/Ubuntu.info.in:151 msgid "Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:39 +#: ../data/templates/Ubuntu.info.in:158 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:150 +#: ../data/templates/Ubuntu.info.in:270 msgid "Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:157 +#: ../data/templates/Ubuntu.info.in:277 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:248 +#: ../data/templates/Ubuntu.info.in:368 msgid "Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:267 +#: ../data/templates/Ubuntu.info.in:388 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:279 +#: ../data/templates/Ubuntu.info.in:400 msgid "Canonical Partners" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:281 +#: ../data/templates/Ubuntu.info.in:402 msgid "Software packaged by Canonical for their partners" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:282 +#: ../data/templates/Ubuntu.info.in:403 msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:289 +#: ../data/templates/Ubuntu.info.in:410 msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:291 +#: ../data/templates/Ubuntu.info.in:412 msgid "Provided by third-party software developers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:292 +#: ../data/templates/Ubuntu.info.in:413 msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:330 +#: ../data/templates/Ubuntu.info.in:451 msgid "Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:349 +#: ../data/templates/Ubuntu.info.in:471 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:392 +#: ../data/templates/Ubuntu.info.in:514 msgid "Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:411 +#: ../data/templates/Ubuntu.info.in:534 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:454 +#: ../data/templates/Ubuntu.info.in:577 msgid "Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:473 +#: ../data/templates/Ubuntu.info.in:596 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:516 +#: ../data/templates/Ubuntu.info.in:639 msgid "Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:535 +#: ../data/templates/Ubuntu.info.in:659 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:579 +#: ../data/templates/Ubuntu.info.in:703 msgid "Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:598 +#: ../data/templates/Ubuntu.info.in:723 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:643 +#: ../data/templates/Ubuntu.info.in:768 msgid "Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:662 +#: ../data/templates/Ubuntu.info.in:787 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:707 +#: ../data/templates/Ubuntu.info.in:832 msgid "Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:726 +#: ../data/templates/Ubuntu.info.in:851 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:768 +#: ../data/templates/Ubuntu.info.in:893 msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:773 +#: ../data/templates/Ubuntu.info.in:898 msgid "Community-maintained" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:779 +#: ../data/templates/Ubuntu.info.in:904 msgid "Restricted software" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:787 +#: ../data/templates/Ubuntu.info.in:912 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:829 +#: ../data/templates/Ubuntu.info.in:954 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:832 +#: ../data/templates/Ubuntu.info.in:957 msgid "Canonical-supported Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:834 +#: ../data/templates/Ubuntu.info.in:959 msgid "Community-maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:835 +#: ../data/templates/Ubuntu.info.in:960 msgid "Community-maintained Open Source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:837 +#: ../data/templates/Ubuntu.info.in:962 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:838 +#: ../data/templates/Ubuntu.info.in:963 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:840 +#: ../data/templates/Ubuntu.info.in:965 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:841 +#: ../data/templates/Ubuntu.info.in:966 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:848 +#: ../data/templates/Ubuntu.info.in:973 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:864 +#: ../data/templates/Ubuntu.info.in:989 msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:869 +#: ../data/templates/Ubuntu.info.in:994 msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:874 +#: ../data/templates/Ubuntu.info.in:999 msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:879 +#: ../data/templates/Ubuntu.info.in:1004 msgid "Unsupported updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:890 +#: ../data/templates/Ubuntu.info.in:1015 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:905 +#: ../data/templates/Ubuntu.info.in:1030 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:921 +#: ../data/templates/Ubuntu.info.in:1046 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:926 +#: ../data/templates/Ubuntu.info.in:1051 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:931 +#: ../data/templates/Ubuntu.info.in:1056 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:942 +#: ../data/templates/Ubuntu.info.in:1067 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:957 +#: ../data/templates/Ubuntu.info.in:1082 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:960 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1085 ../data/templates/Debian.info.in:149 msgid "Officially supported" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:973 +#: ../data/templates/Ubuntu.info.in:1098 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:978 +#: ../data/templates/Ubuntu.info.in:1103 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:983 +#: ../data/templates/Ubuntu.info.in:1108 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:989 +#: ../data/templates/Ubuntu.info.in:1114 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:995 +#: ../data/templates/Ubuntu.info.in:1120 msgid "Community-maintained (Universe)" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:997 +#: ../data/templates/Ubuntu.info.in:1122 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1004 +#: ../data/templates/Ubuntu.info.in:1129 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1007 +#: ../data/templates/Ubuntu.info.in:1132 msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1009 +#: ../data/templates/Ubuntu.info.in:1134 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1016 +#: ../data/templates/Ubuntu.info.in:1141 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1021 +#: ../data/templates/Ubuntu.info.in:1146 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:1026 +#: ../data/templates/Ubuntu.info.in:1151 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -400,7 +410,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:428 +#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 #, python-format msgid "Server for %s" msgstr "" @@ -417,26 +427,26 @@ msgstr "" msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316 +#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322 +#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:342 +#: ../apt/progress/gtk2.py:343 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:430 +#: ../apt/progress/gtk2.py:431 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:436 +#: ../apt/progress/gtk2.py:437 msgid "Complete" msgstr "" -- cgit v1.2.3 From b7ce3c2b47e1234631e00cb0ba8a86fa0aa9c8d8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 10:08:44 +0200 Subject: * python/apt_pkgmodule.cc: - add apt_pkg.get_architectures() call --- debian/changelog | 2 ++ po/python-apt.pot | 20 ++++++++++---------- python/apt_pkgmodule.cc | 27 +++++++++++++++++++++++++++ tests/test_apt_cache.py | 5 +++++ 4 files changed, 44 insertions(+), 10 deletions(-) (limited to 'po/python-apt.pot') diff --git a/debian/changelog b/debian/changelog index 39c506e6..6fbc5241 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.2) UNRELEASED; urgency=low - updated, thanks to Joe Dalton (closes: #631309) * po/sr.po: - updated, thanks to Nikola Nenadic (closes: #638308) + * python/apt_pkgmodule.cc: + - add apt_pkg.get_architectures() call [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) diff --git a/po/python-apt.pot b/po/python-apt.pot index 70c68099..48b4fb18 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-19 18:07+0200\n" +"POT-Creation-Date: 2011-10-21 10:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -455,11 +455,11 @@ msgstr "" msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1065 ../apt/package.py:1171 +#: ../apt/package.py:1068 ../apt/package.py:1174 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1177 +#: ../apt/package.py:1180 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -468,7 +468,7 @@ msgid "" "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1184 +#: ../apt/package.py:1187 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -535,26 +535,26 @@ msgstr "" msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:508 +#: ../apt/debfile.py:510 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:542 +#: ../apt/debfile.py:544 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:548 +#: ../apt/debfile.py:550 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:638 +#: ../apt/debfile.py:640 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:648 +#: ../apt/debfile.py:650 msgid "An essential package would be removed" msgstr "" @@ -605,6 +605,6 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: ../apt/cache.py:149 +#: ../apt/cache.py:148 msgid "Building data structures" msgstr "" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index e8490b4e..03c88e9a 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -393,6 +394,29 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args) return 0; } /*}}}*/ +// get_architectures - return the list of architectures /*{{{*/ +// --------------------------------------------------------------------- +static const char *doc_GetArchitectures = + "get_architectures() -> list\n\n" + "Return the list of supported architectures on this system. On a \n" + "multiarch system this can be more than one.";; +static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) +{ + PyObject *Obj; + if (PyArg_ParseTuple(Args,"",&Obj) == 0) + return 0; + + PyObject *List = PyList_New(0); + vector arches = APT::Configuration::getArchitectures(); + vector::const_iterator I; + for (I = arches.begin(); I != arches.end(); I++) + { + PyList_Append(List, CppPyString(*I)); + } + + return List; +} + /*}}}*/ // init - 3 init functions /*{{{*/ // --------------------------------------------------------------------- static char *doc_Init = @@ -539,6 +563,9 @@ static PyMethodDef methods[] = {"sha1sum",sha1sum,METH_VARARGS,doc_sha1sum}, {"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum}, + // multiarch + {"get_architectures", GetArchitectures, METH_VARARGS, doc_GetArchitectures}, + // Strings {"check_domain_list",StrCheckDomainList,METH_VARARGS, "check_domain_list(host: str, domains: str) -> bool\n\n" diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 2b742dfa..0d80f617 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -191,6 +191,11 @@ class TestAptCache(unittest.TestCase): self.assertEqual([p.name for p in l], ["apt", "libc6", "xterm"]) + def test_get_architectures(self): + main_arch = apt.apt_pkg.config.get("APT::Architecture") + arches = apt_pkg.get_architectures() + self.assertTrue(main_arch in arches) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From d7c8f470a236d70fa6ce8eb0e522702fee64ff5e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Oct 2011 10:11:02 +0200 Subject: python/apt_pkgmodule.cc: improve docstring --- po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'po/python-apt.pot') diff --git a/po/python-apt.pot b/po/python-apt.pot index 48b4fb18..d19871d0 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-21 10:05+0200\n" +"POT-Creation-Date: 2011-10-21 10:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 03c88e9a..8532b1e3 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -399,7 +399,8 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args) static const char *doc_GetArchitectures = "get_architectures() -> list\n\n" "Return the list of supported architectures on this system. On a \n" - "multiarch system this can be more than one.";; + "multiarch system this can be more than one. The main architectures\n" + "is the first item in the list.";; static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) { PyObject *Obj; -- cgit v1.2.3 From 628d7caf9ca6ee819398a4b88c23e42094fe2c10 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Nov 2011 17:20:58 +0100 Subject: fix build against apt in experimental --- debian/changelog | 1 + po/python-apt.pot | 2 +- python/apt_pkgmodule.cc | 11 ++++++----- python/apt_pkgmodule.h | 1 + python/arfile.cc | 8 ++++---- python/cdrom.cc | 4 ++-- python/configuration.cc | 2 +- python/depcache.cc | 1 + python/lock.cc | 2 ++ python/metaindex.cc | 4 ++-- python/progress.cc | 14 +++++++------- python/progress.h | 6 +++--- python/tag.cc | 1 + python/tarfile.cc | 2 +- tests/test_debfile.py | 13 ++++++++++++- 15 files changed, 45 insertions(+), 27 deletions(-) (limited to 'po/python-apt.pot') diff --git a/debian/changelog b/debian/changelog index f5ae2b79..58326dc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ python-apt (0.8.2) UNRELEASED; urgency=low * apt/cache.py: - remove "print" when creating dirs in apt.Cache(rootdir=dir), thanks to Martin Pitt + * fix build against apt in experimental [ Tshepang Lekhonkhobe ] * rm usage of camelcase in cache.py doc (closes: #626617) diff --git a/po/python-apt.pot b/po/python-apt.pot index d19871d0..046f5779 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-21 10:10+0200\n" +"POT-Creation-Date: 2011-11-10 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 8532b1e3..acfdf019 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -185,11 +186,11 @@ static const char *parse_src_depends_doc = "only contains those dependencies for the architecture set in the\n" "configuration variable APT::Architecture"; static PyObject *RealParseDepends(PyObject *Self,PyObject *Args, - bool ParseArchFlags, string name, + bool ParseArchFlags, std::string name, bool debStyle=false) { - string Package; - string Version; + std::string Package; + std::string Version; unsigned int Op; bool StripMultiArch=true; @@ -408,8 +409,8 @@ static PyObject *GetArchitectures(PyObject *Self,PyObject *Args) return 0; PyObject *List = PyList_New(0); - vector arches = APT::Configuration::getArchitectures(); - vector::const_iterator I; + std::vector arches = APT::Configuration::getArchitectures(); + std::vector::const_iterator I; for (I = arches.begin(); I != arches.end(); I++) { PyList_Append(List, CppPyString(*I)); diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h index b3534a30..85c34130 100644 --- a/python/apt_pkgmodule.h +++ b/python/apt_pkgmodule.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "generic.h" // Configuration Stuff diff --git a/python/arfile.cc b/python/arfile.cc index c31ea35e..44cd3c82 100644 --- a/python/arfile.cc +++ b/python/arfile.cc @@ -204,7 +204,7 @@ static PyObject *_extract(FileFd &Fd, const ARArchive::Member *member, if (!Fd.Seek(member->Start)) return HandleErrors(); - string outfile_str = flCombine(dir,member->Name); + std::string outfile_str = flCombine(dir,member->Name); char *outfile = (char*)outfile_str.c_str(); // We are not using FileFd here, because we want to raise OSErrror with @@ -539,8 +539,8 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) for (std::vector::const_iterator t = types.begin(); t != types.end(); ++t) { - string member = string("data.tar.").append(*t); - string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t)); + std::string member = std::string("data.tar.").append(*t); + std::string comp = _config->Find(std::string("Acquire::CompressionTypes::").append(*t)); self->data = _gettar(self, self->Object->FindMember(member.c_str()), comp.c_str()); if (self->data) @@ -548,7 +548,7 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } // no data found, we need to if (!self->data) { - string error; + std::string error; for (std::vector::const_iterator t = types.begin(); t != types.end(); ++t) error.append(*t + ","); diff --git a/python/cdrom.cc b/python/cdrom.cc index 6ac16d59..46bb769c 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -67,7 +67,7 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args) PyCdromProgress progress; progress.setCallbackInst(pyCdromProgressInst); - string ident; + std::string ident; bool res = Cdrom.Ident(ident, &progress); if (res) @@ -94,7 +94,7 @@ static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args) PyCdromProgress progress; progress.setCallbackInst(pyCdromProgressInst); - string ident; + std::string ident; bool res = Cdrom.Ident(ident, &progress); PyObject *boolres = PyBool_FromLong(res); diff --git a/python/configuration.cc b/python/configuration.cc index 9000f71f..3e634901 100644 --- a/python/configuration.cc +++ b/python/configuration.cc @@ -262,7 +262,7 @@ static PyObject *CnfDump(PyObject *Self,PyObject *Args) if (PyArg_ParseTuple(Args,"") == 0) return 0; - stringstream ss; + std::stringstream ss; GetSelf(Self).Dump(ss); return CppPyString(ss.str()); } diff --git a/python/depcache.cc b/python/depcache.cc index e6113429..73993c82 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/python/lock.cc b/python/lock.cc index 2c957df1..38a2bc74 100644 --- a/python/lock.cc +++ b/python/lock.cc @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include "generic.h" static PyObject *systemlock_exit(PyObject *self, PyObject *args) diff --git a/python/metaindex.cc b/python/metaindex.cc index a00cf04e..9e330d3d 100644 --- a/python/metaindex.cc +++ b/python/metaindex.cc @@ -33,8 +33,8 @@ static PyObject *MetaIndexGetIsTrusted(PyObject *Self,void*) { static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) { metaIndex *meta = GetCpp(Self); PyObject *List = PyList_New(0); - vector *indexFiles = meta->GetIndexFiles(); - for (vector::const_iterator I = indexFiles->begin(); + std::vector *indexFiles = meta->GetIndexFiles(); + for (std::vector::const_iterator I = indexFiles->begin(); I != indexFiles->end(); I++) { CppPyObject *Obj; diff --git a/python/progress.cc b/python/progress.cc index bd3c2ad6..a7fd7ae1 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -127,7 +127,7 @@ PyObject *PyFetchProgress::GetDesc(pkgAcquire::ItemDesc *item) { return pyDesc; } -bool PyFetchProgress::MediaChange(string Media, string Drive) +bool PyFetchProgress::MediaChange(std::string Media, std::string Drive) { PyCbObj_END_ALLOW_THREADS //std::cout << "MediaChange" << std::endl; @@ -485,7 +485,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) PyObject *v = PyObject_GetAttrString(callbackInst, "writefd"); if(v) { int fd = PyObject_AsFileDescriptor(v); - cout << "got fd: " << fd << endl; + std::cout << "got fd: " << fd << std::endl; res = pm->DoInstall(fd); } else { res = pm->DoInstall(); @@ -542,7 +542,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm) //----------------------------------------------------------------------------- // apt-cdrom interface -void PyCdromProgress::Update(string text, int current) +void PyCdromProgress::Update(std::string text, int current) { PyObject *arglist = Py_BuildValue("(si)", text.c_str(), current); setattr(callbackInst, "total_steps", "i", totalSteps); @@ -569,7 +569,7 @@ bool PyCdromProgress::ChangeCdrom() } -bool PyCdromProgress::AskCdromName(string &Name) +bool PyCdromProgress::AskCdromName(std::string &Name) { PyObject *arglist = Py_BuildValue("()"); const char *new_name; @@ -582,7 +582,7 @@ bool PyCdromProgress::AskCdromName(string &Name) if(!PyArg_Parse(result, "(bs)", &res, &new_name)) std::cerr << "AskCdromName: result could not be parsed" << std::endl; // set the new name - Name = string(new_name); + Name =std:: string(new_name); return res; } // New style: String on success, None on failure. @@ -593,7 +593,7 @@ bool PyCdromProgress::AskCdromName(string &Name) if(!PyArg_Parse(result, "s", &new_name)) std::cerr << "ask_cdrom_name: result could not be parsed" << std::endl; else - Name = string(new_name); - return true; + Name = std::string(new_name); + return true; } } diff --git a/python/progress.h b/python/progress.h index 4e66c771..af8e3acc 100644 --- a/python/progress.h +++ b/python/progress.h @@ -72,7 +72,7 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj void UpdateStatus(pkgAcquire::ItemDesc & Itm, int status); - virtual bool MediaChange(string Media, string Drive); + virtual bool MediaChange(std::string Media, std::string Drive); void setPyAcquire(PyObject *o) { Py_CLEAR(pyAcquire); @@ -107,11 +107,11 @@ struct PyInstallProgress : public PyCallbackObj struct PyCdromProgress : public pkgCdromStatus, public PyCallbackObj { // update steps, will be called regularly as a "pulse" - virtual void Update(string text="", int current=0); + virtual void Update(std::string text="", int current=0); // ask for cdrom insert virtual bool ChangeCdrom(); // ask for cdrom name - virtual bool AskCdromName(string &Name); + virtual bool AskCdromName(std::string &Name); PyCdromProgress() : PyCallbackObj() {}; }; diff --git a/python/tag.cc b/python/tag.cc index 94554400..3996af8e 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -26,6 +26,7 @@ #include "apt_pkgmodule.h" #include +#include #include #include diff --git a/python/tarfile.cc b/python/tarfile.cc index cdfe0a7c..bd903b57 100644 --- a/python/tarfile.cc +++ b/python/tarfile.cc @@ -348,7 +348,7 @@ static const char *tarfile_extractall_doc = "can be used to change the target directory."; static PyObject *tarfile_extractall(PyObject *self, PyObject *args) { - string cwd = SafeGetCWD(); + std::string cwd = SafeGetCWD(); char *rootdir = 0; if (PyArg_ParseTuple(args,"|s:extractall",&rootdir) == 0) return 0; diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 951c2afe..501b8f61 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -87,7 +87,7 @@ class TestDebfilee(unittest.TestCase): self.assertEqual(deb["Maintainer"], "Samuel Lidén Borell ") - def testContent(self): + def test_content(self): # no python-debian for python3 yet, so fail gracefully try: import debian @@ -130,6 +130,17 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading # we need to support python2.6 self.assertTrue(raised) + def test_multiarch_deb(self): + print apt_pkg.get_architectures() + if apt_pkg.get_architectures() != ["amd64", "i386"]: + logging.warn("skipping test because running on a non-multiarch system") + return + deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb") + print deb.missing_deps() + + + + if __name__ == "__main__": #logging.basicConfig(level=logging.DEBUG) unittest.main() -- cgit v1.2.3 From 2021c1b4973c3201b1e4580d00b7351c23a831c4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:25:37 +0100 Subject: RED: policy should support verfile --- po/python-apt.pot | 50 +++++++++++++++++++++++++------------------------- python/cache.cc | 7 +++++++ tests/test_policy.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 tests/test_policy.py (limited to 'po/python-apt.pot') diff --git a/po/python-apt.pot b/po/python-apt.pot index f1aecc59..a7cf0a8d 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-08 20:01+0100\n" +"POT-Creation-Date: 2012-01-30 15:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -410,7 +410,7 @@ msgid "Non-DFSG-compatible Software" msgstr "" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:434 #, python-format msgid "Server for %s" msgstr "" @@ -418,35 +418,35 @@ msgstr "" #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:228 ../aptsources/distro.py:234 -#: ../aptsources/distro.py:250 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "" -#: ../aptsources/distro.py:254 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "" -#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" #. Setup some child widgets -#: ../apt/progress/gtk2.py:343 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "" -#: ../apt/progress/gtk2.py:431 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "" -#: ../apt/progress/gtk2.py:437 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "" @@ -479,18 +479,18 @@ msgstr "" msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:205 +#: ../apt/debfile.py:202 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:226 +#: ../apt/debfile.py:223 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:371 +#: ../apt/debfile.py:364 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -498,63 +498,63 @@ msgid "" msgstr "" #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation -#: ../apt/debfile.py:387 +#: ../apt/debfile.py:380 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:397 +#: ../apt/debfile.py:390 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -#: ../apt/debfile.py:445 +#: ../apt/debfile.py:438 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:455 +#: ../apt/debfile.py:448 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:462 +#: ../apt/debfile.py:455 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:487 +#: ../apt/debfile.py:480 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:517 +#: ../apt/debfile.py:510 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:561 +#: ../apt/debfile.py:554 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:604 +#: ../apt/debfile.py:597 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:610 +#: ../apt/debfile.py:603 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:700 +#: ../apt/debfile.py:693 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:711 +#: ../apt/debfile.py:704 msgid "An essential package would be removed" msgstr "" diff --git a/python/cache.cc b/python/cache.cc index b263d320..191e2204 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -229,6 +229,12 @@ static PyObject *PkgCacheGetGroups(PyObject *Self, void*) { return CppPyObject_NEW(Self,&PyGroupList_Type,Cache->GrpBegin()); } +static PyObject *PkgCacheGetPolicy(PyObject *Self, void*) { + pkgCacheFile *CacheFile = GetCpp(Self); + std::cerr << "policy: " << CacheFile->Policy << std::endl; + return CppPyObject_NEW(Self,&PyPolicy_Type,CacheFile->Policy); +} + static PyObject *PkgCacheGetPackages(PyObject *Self, void*) { pkgCache *Cache = GetCpp(Self); return CppPyObject_NEW(Self,&PyPackageList_Type,Cache->PkgBegin()); @@ -289,6 +295,7 @@ static PyGetSetDef PkgCacheGetSet[] = { {"group_count",PkgCacheGetGroupCount,0, "The number of apt_pkg.Group objects stored in the cache."}, {"groups", PkgCacheGetGroups, 0, "A list of Group objects in the cache"}, + {"policy", PkgCacheGetPolicy, 0, "The PkgPolicy for the cache"}, {"is_multi_arch", PkgCacheGetIsMultiArch, 0, "Whether the cache supports multi-arch."}, {"package_count",PkgCacheGetPackageCount,0, diff --git a/tests/test_policy.py b/tests/test_policy.py new file mode 100644 index 00000000..2d261f5f --- /dev/null +++ b/tests/test_policy.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# +# Copyright (C) 2012 Michael Vogt +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. + +import apt +import unittest + +class TestAptPolicy(unittest.TestCase): + + def test_apt_policy(self): + # get a policy + cache = apt.Cache() + policy = cache._depcache.policy + self.assertNotEqual(policy, None) + # basic tests + pkg = cache["apt"] + self.assertEqual(policy.get_priority(pkg._pkg), 0) + # get verfile + ver = pkg.candidate._cand + verfile_list = ver.file_list + for verfile in verfile_list: + print verfile + self.assertEqual(policy.get_priority(verfile), 500) + + +if __name__ == "__main__": + unittest.main() -- cgit v1.2.3 From 00ce4d227aef4ccde15f8cfa5b1a5582195eb639 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:33:24 +0100 Subject: GREEN: policy should suppors PkgVerFile now --- po/python-apt.pot | 2 +- python/policy.cc | 3 +++ tests/test_policy.py | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'po/python-apt.pot') diff --git a/po/python-apt.pot b/po/python-apt.pot index a7cf0a8d..b99c36e1 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-30 15:16+0100\n" +"POT-Creation-Date: 2012-01-30 15:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/python/policy.cc b/python/policy.cc index b11e4dde..b7e648b5 100644 --- a/python/policy.cc +++ b/python/policy.cc @@ -46,6 +46,9 @@ PyObject *policy_get_priority(PyObject *self, PyObject *arg) { if (PyObject_TypeCheck(arg, &PyPackage_Type)) { pkgCache::PkgIterator pkg = GetCpp(arg); return MkPyNumber(policy->GetPriority(pkg)); + } else if (PyObject_TypeCheck(arg, &PyPackageFile_Type)) { + pkgCache::PkgFileIterator pkgfile = GetCpp(arg); + return MkPyNumber(policy->GetPriority(pkgfile)); } else { PyErr_SetString(PyExc_TypeError,"Argument must be of Package()."); return 0; diff --git a/tests/test_policy.py b/tests/test_policy.py index 2d261f5f..2aab6722 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -19,12 +19,13 @@ class TestAptPolicy(unittest.TestCase): # basic tests pkg = cache["apt"] self.assertEqual(policy.get_priority(pkg._pkg), 0) - # get verfile - ver = pkg.candidate._cand - verfile_list = ver.file_list - for verfile in verfile_list: - print verfile - self.assertEqual(policy.get_priority(verfile), 500) + # get priority for all pkgfiles + for ver in pkg.versions: + lowlevel_ver = ver._cand + for pkgfile, i in lowlevel_ver.file_list: + #print verfile, i, policy.get_priority(pkgfile) + self.assertTrue(policy.get_priority(pkgfile) > 1) + self.assertTrue(policy.get_priority(pkgfile) < 1001) if __name__ == "__main__": -- cgit v1.2.3 From 055dc32f4025f081293cee32cde935100532c651 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jan 2012 15:40:50 +0100 Subject: RED: apt.Version should have "policy_priority" property --- debian/changelog | 1 + po/python-apt.pot | 2 +- tests/test_policy.py | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'po/python-apt.pot') diff --git a/debian/changelog b/debian/changelog index 7f582bff..1e400dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-apt (0.8.4) UNRELEASED; urgency=low * doc/examples/build-deps.py: - update the build-deps.py example to use the apt API more + * add support for apt_pkg.Policy.get_priority(PkgFileIterator) -- Michael Vogt Wed, 04 Jan 2012 12:07:48 +0100 diff --git a/po/python-apt.pot b/po/python-apt.pot index b99c36e1..58877b55 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-30 15:32+0100\n" +"POT-Creation-Date: 2012-01-30 15:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tests/test_policy.py b/tests/test_policy.py index 2aab6722..449c3961 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -11,7 +11,7 @@ import unittest class TestAptPolicy(unittest.TestCase): - def test_apt_policy(self): + def test_apt_policy_lowlevel(self): # get a policy cache = apt.Cache() policy = cache._depcache.policy @@ -23,10 +23,16 @@ class TestAptPolicy(unittest.TestCase): for ver in pkg.versions: lowlevel_ver = ver._cand for pkgfile, i in lowlevel_ver.file_list: - #print verfile, i, policy.get_priority(pkgfile) + print pkgfile, i, policy.get_priority(pkgfile) self.assertTrue(policy.get_priority(pkgfile) > 1) self.assertTrue(policy.get_priority(pkgfile) < 1001) + def test_apt_policy_highlevel(self): + cache = apt.Cache() + pkg = cache["apt"] + self.assertTrue(pkg.candidate.policy_priority > 1 and + pkg.candidate.policy_priority < 1001) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From fc369093bbefbd319f8713877026df9bedd48f6a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:33:29 +0200 Subject: * data/templates/Debian.info.in: - Add wheezy --- data/templates/Debian.info.in | 25 +++++++++++++++++++++++++ debian/changelog | 2 ++ po/python-apt.pot | 29 +++++++++++++++++------------ 3 files changed, 44 insertions(+), 12 deletions(-) (limited to 'po/python-apt.pot') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index b9f70940..21b07608 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -1,5 +1,30 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: wheezy +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org +MirrorsFile: Debian.mirrors +_Description: Debian 7.0 'Wheezy' +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + +Suite: wheezy/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +MatchURI: security\.debian\.org +ParentSuite: wheezy +_Description: Security updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 92507eed..2ee2a17b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - exec apt-key, otherwise we ignore the return value * debian/control: - Build-depend on fakeroot, needed for the apt.auth tests + * data/templates/Debian.info.in: + - Add wheezy -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index d6ac301e..940cd13a 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -284,7 +284,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "" @@ -356,56 +356,61 @@ msgstr "" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " +msgid "Debian 7.0 'Wheezy' " msgstr "" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " +msgid "Debian 6.0 'Squeeze' " msgstr "" #. Description #: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" +msgid "Debian 5.0 'Lenny' " msgstr "" #. Description #: ../data/templates/Debian.info.in:83 +msgid "Debian 4.0 'Etch'" +msgstr "" + +#. Description +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "" -- cgit v1.2.3