[PackageKit-commit] packagekit: Branch 'master' - 11 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Thu Feb 5 09:07:53 PST 2009
backends/poldek/pk-backend-poldek.c | 71 +-
backends/yum/yumBackend.py | 16
data/org.freedesktop.PackageKitAptBackend.conf.in | 10
docs/html/upload.sh | 4
lib/packagekit-glib/pk-catalog.h | 2
lib/packagekit-glib/pk-client.h | 2
lib/packagekit-glib/pk-connection.h | 2
lib/packagekit-glib/pk-control.h | 2
lib/packagekit-glib/pk-desktop.h | 2
lib/packagekit-glib/pk-obj-list.h | 2
lib/packagekit-glib/pk-package-list.h | 2
lib/packagekit-glib/pk-service-pack.h | 2
lib/packagekit-glib/pk-task-list.h | 2
po/de.po | 705 +++++-----------------
src/egg-dbus-monitor.h | 2
src/pk-backend-dbus.h | 2
src/pk-backend-internal.h | 2
src/pk-backend-spawn.h | 2
src/pk-cache.h | 2
src/pk-conf.h | 2
src/pk-engine.h | 4
src/pk-file-monitor.h | 2
src/pk-inhibit.h | 2
src/pk-network-nm.h | 2
src/pk-network-unix.h | 2
src/pk-network.h | 2
src/pk-notify.h | 2
src/pk-post-trans.h | 2
src/pk-security.h | 2
src/pk-spawn.c | 8
src/pk-spawn.h | 2
src/pk-store.h | 2
src/pk-syslog.h | 2
src/pk-time.h | 2
src/pk-transaction-db.h | 2
src/pk-transaction-list.h | 2
src/pk-transaction.h | 4
src/pk-update-detail-list.h | 2
38 files changed, 280 insertions(+), 602 deletions(-)
New commits:
commit 223953a3a0f7e7a77c80679b23b3f11d3ffcf725
Merge: 7dd5f65... 5d0a645...
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Feb 5 17:05:43 2009 +0000
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 7dd5f65df6427474952e3f774c28e187f9e6a64a
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Feb 5 17:05:24 2009 +0000
bugfix: if we fail to exit from the dispatcher, make sure we cleanup the poll as the child check isn't going to be run
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index df1c1cd..1c31d43 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -477,8 +477,14 @@ pk_spawn_argv (PkSpawn *spawn, gchar **argv, gchar **envp)
egg_debug ("changing dispatcher (exit old instance)");
spawn->priv->is_changing_dispatcher = TRUE;
ret = pk_spawn_exit (spawn);
- if (!ret)
+ if (!ret) {
egg_warning ("failed to exit previous instance");
+ /* remove poll, as we can't reply on pk_spawn_check_child() */
+ if (spawn->priv->poll_id != 0) {
+ g_source_remove (spawn->priv->poll_id);
+ spawn->priv->poll_id = 0;
+ }
+ }
spawn->priv->is_changing_dispatcher = FALSE;
}
commit cdca5bf1b93275e5314e3ecc895bc9b9e0d7f6e9
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Feb 5 17:00:04 2009 +0000
trivial: copy the session api to the website
diff --git a/docs/html/upload.sh b/docs/html/upload.sh
index 90af96a..0ada09a 100755
--- a/docs/html/upload.sh
+++ b/docs/html/upload.sh
@@ -24,4 +24,8 @@ docbook2pdf ../../man/pkmon.xml --output ./files
docbook2pdf ../../man/pkgenpack.xml --output ./files
scp files/* $USER@$SERVER:/$LOCATION/files/
scp ../../contrib/PackageKit.catalog $USER@$SERVER:/$LOCATION/files/
+docbook2html ../../../gnome-packagekit/docs/dbus/org.freedesktop.PackageKit.ref.xml
+mv r1.html api-reference-session.html
+scp api-reference-session.html $USER@$SERVER:/$LOCATION/gtk-doc/
+rm api-reference-session.html
commit 5d0a6456ab9827f99c35c9e122ef9d0be5114699
Author: Fabian Affolter <fabian at bernewireless.net>
Date: Thu Feb 5 10:19:59 2009 +0000
Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/de.po b/po/de.po
index e28ec46..30e9cd2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: packagekit.master.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 16:57+0000\n"
-"PO-Revision-Date: 2008-12-09 22:43+0100\n"
+"POT-Creation-Date: 2008-11-24 01:31+0000\n"
+"PO-Revision-Date: 2009-02-05 11:17+0100\n"
"Last-Translator: Fabian Affolter <fab at fedoraproject.org>\n"
"Language-Team: German <i18 at redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -23,595 +23,419 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Language: German\n"
-
-#. TRANSLATORS: this is an atomic transaction
-#: ../client/pk-console.c:230
-msgid "Transaction"
-msgstr ""
-
-#. TRANSLATORS: this is the time the transaction was started in system timezone
-#: ../client/pk-console.c:232
-msgid "System time"
-msgstr ""
-
-#. TRANSLATORS: this is if the transaction succeeded or not
-#: ../client/pk-console.c:234
-msgid "Succeeded"
-msgstr ""
-
-#. TRANSLATORS: if the repo is enabled
-#: ../client/pk-console.c:234 ../client/pk-console.c:377
-msgid "True"
-msgstr ""
-
-#: ../client/pk-console.c:234 ../client/pk-console.c:377
-msgid "False"
-msgstr ""
-
-#. TRANSLATORS: this is the transactions role, e.g. "update-system"
-#: ../client/pk-console.c:236
-msgid "Role"
-msgstr ""
-
-#. TRANSLATORS: this is The duration of the transaction
-#: ../client/pk-console.c:241
-msgid "Duration"
-msgstr ""
-
-#: ../client/pk-console.c:241
-msgid "(seconds)"
-msgstr ""
-
-#. TRANSLATORS: this is The command line used to do the action
-#: ../client/pk-console.c:245
-#, fuzzy
-msgid "Command line"
-msgstr "Befehl fehlgeschlagen"
-
-#. TRANSLATORS: this is the user ID of the user that started the action
-#: ../client/pk-console.c:247
-msgid "User ID"
-msgstr ""
-
-#. TRANSLATORS: this is the username, e.g. hughsie
-#: ../client/pk-console.c:254
-msgid "Username"
-msgstr ""
-
-#. TRANSLATORS: this is the users real name, e.g. "Richard Hughes"
-#: ../client/pk-console.c:258
-msgid "Real name"
-msgstr ""
-
-#: ../client/pk-console.c:266
-msgid "Affected packages:"
-msgstr ""
-
-#: ../client/pk-console.c:268
-msgid "Affected packages: None"
-msgstr ""
-
-#. TRANSLATORS: this is the distro, e.g. Fedora 10
-#: ../client/pk-console.c:293
-msgid "Distribution"
-msgstr ""
-
-#. TRANSLATORS: this is type of update, stable or testing
-#: ../client/pk-console.c:295
-msgid "Type"
-msgstr ""
-
-#. TRANSLATORS: this is any summary text describing the upgrade
-#. TRANSLATORS: this is the summary of the group
-#: ../client/pk-console.c:297 ../client/pk-console.c:319
-msgid "Summary"
-msgstr ""
-
-#. TRANSLATORS: this is the group category name
-#: ../client/pk-console.c:309
-msgid "Category"
-msgstr ""
-
-#. TRANSLATORS: this is group identifier
-#: ../client/pk-console.c:311
-msgid "ID"
-msgstr ""
-
-#. TRANSLATORS: this is the parent group
-#: ../client/pk-console.c:314
-msgid "Parent"
-msgstr ""
-
-#: ../client/pk-console.c:316
-msgid "Name"
-msgstr ""
-
-#. TRANSLATORS: this is preferred icon for the group
-#: ../client/pk-console.c:322
-msgid "Icon"
-msgstr ""
#. TRANSLATORS: this is a header for the package that can be updated
-#: ../client/pk-console.c:337
+#: ../client/pk-console.c:287
msgid "Details about the update:"
msgstr "Details über die Aktualisierung"
-#: ../client/pk-console.c:338
-#, fuzzy
-msgid "Package"
-msgstr "Paket-Dateien"
-
-#: ../client/pk-console.c:340
-#, fuzzy
-msgid "Updates"
-msgstr "Details werden aktualisiert"
-
-#: ../client/pk-console.c:342
-msgid "Obsoletes"
-msgstr ""
-
-#: ../client/pk-console.c:344
-msgid "Vendor"
-msgstr ""
-
-#: ../client/pk-console.c:346
-msgid "Bugzilla"
-msgstr ""
-
-#: ../client/pk-console.c:348
-msgid "CVE"
-msgstr ""
-
-#: ../client/pk-console.c:350
-msgid "Restart"
-msgstr ""
-
-#: ../client/pk-console.c:352
-#, fuzzy
-msgid "Update text"
-msgstr "Details werden aktualisiert"
-
-#: ../client/pk-console.c:354
-msgid "Changes"
-msgstr ""
-
-#: ../client/pk-console.c:356
-msgid "State"
-msgstr ""
-
-#: ../client/pk-console.c:359
-msgid "Issued"
-msgstr ""
-
-#: ../client/pk-console.c:362
-#, fuzzy
-msgid "Updated"
-msgstr "Details werden aktualisiert"
-
-#: ../client/pk-console.c:448 ../client/pk-console.c:450
-msgid "Percentage"
-msgstr ""
-
-#: ../client/pk-console.c:450
-msgid "Unknown"
-msgstr ""
-
-#. TRANSLATORS: a package requires the system to be restarted
-#: ../client/pk-console.c:501
-#, fuzzy
-msgid "System restart required by:"
-msgstr "Ein Neustart ist erforderlich"
-
-#. TRANSLATORS: a package requires the session to be restarted
-#: ../client/pk-console.c:504
-#, fuzzy
-msgid "Session restart required:"
-msgstr "Ein Neustart ist erforderlich"
-
-#. TRANSLATORS: a package requires the application to be restarted
-#: ../client/pk-console.c:507
-#, fuzzy
-msgid "Application restart required by:"
-msgstr "Ein Programm-Neustart wird benötigt"
-
-#: ../client/pk-console.c:543
+#: ../client/pk-console.c:480
msgid "Please restart the computer to complete the update."
-msgstr "Bitte starten Sie den Computer neu, um das Update abzuschliessen."
+msgstr "Bitte starten Sie den Computer neu, um das Update abzuschließen."
-#: ../client/pk-console.c:545
+#: ../client/pk-console.c:482
msgid "Please logout and login to complete the update."
msgstr "Bitte erneut einloggen um das Update abzuschließen."
-#: ../client/pk-console.c:547
+#: ../client/pk-console.c:484
msgid "Please restart the application as it is being used."
msgstr "Starten Sie die Anwendung neu, da sie benutzt wird."
#. TRANSLATORS: The package is already installed on the system
-#: ../client/pk-console.c:659
+#: ../client/pk-console.c:596
#, c-format
msgid "The package %s is already installed"
msgstr "Das Paket %s ist bereits installiert"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:667
+#: ../client/pk-console.c:604
#, c-format
msgid "The package %s could not be installed: %s"
msgstr "Das Paket %s konnte nicht installiert werden: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
-#: ../client/pk-console.c:692 ../client/pk-console.c:719
-#: ../client/pk-console.c:815 ../client/pk-console.c:932
-#: ../client/pk-tools-common.c:61 ../client/pk-tools-common.c:79
+#: ../client/pk-console.c:629
+#: ../client/pk-console.c:656
+#: ../client/pk-console.c:752
+#: ../client/pk-console.c:869
+#: ../client/pk-tools-common.c:61
+#: ../client/pk-tools-common.c:79
#: ../client/pk-tools-common.c:86
#, c-format
msgid "Internal error: %s"
msgstr "Interner Fehler: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
-#: ../client/pk-console.c:700 ../client/pk-console.c:1327
+#: ../client/pk-console.c:637
+#: ../client/pk-console.c:1264
#, c-format
msgid "This tool could not install the packages: %s"
msgstr "Konnte folgende Pakete nicht installieren: %s"
#. TRANSLATORS: There was an error installing the files. The detailed error follows
-#: ../client/pk-console.c:727
+#: ../client/pk-console.c:664
#, c-format
msgid "This tool could not install the files: %s"
msgstr "Die Dateien konnten nicht installieren werden: %s"
#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
-#: ../client/pk-console.c:783
+#: ../client/pk-console.c:720
#, c-format
msgid "This tool could not remove %s: %s"
msgstr "Dieses Werkzeug konnte %s nicht entfernen: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
-#: ../client/pk-console.c:806 ../client/pk-console.c:844
-#: ../client/pk-console.c:877
+#: ../client/pk-console.c:743
+#: ../client/pk-console.c:781
+#: ../client/pk-console.c:814
#, c-format
msgid "This tool could not remove the packages: %s"
msgstr "Konnte folgende Pakete nicht entfernen: %s"
#. TRANSLATORS: When removing, we might have to remove other dependencies
-#: ../client/pk-console.c:856
+#: ../client/pk-console.c:793
msgid "The following packages have to be removed:"
msgstr "Die folgenden Pakete müssen entfernt werden:"
#. TRANSLATORS: We are checking if it's okay to remove a list of packages
-#: ../client/pk-console.c:863
+#: ../client/pk-console.c:800
msgid "Proceed removing additional packages?"
msgstr "Sollen die zusätzlichen Pakete entfernt werden?"
#. TRANSLATORS: We did not remove any packages
-#: ../client/pk-console.c:868
+#: ../client/pk-console.c:805
msgid "The package removal was canceled!"
msgstr "Die Entfernung der Pakete wurde abgebrochen!"
#. TRANSLATORS: The package name was not found in any software sources
-#: ../client/pk-console.c:909
+#: ../client/pk-console.c:846
#, c-format
msgid "This tool could not download the package %s as it could not be found"
-msgstr ""
-"Dieses Werkzeug konnte das Paket %s konnte nicht finden und somit nicht "
-"herunterladen"
+msgstr "Dieses Werkzeug konnte das Paket %s nicht finden und herunterladen"
#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
-#: ../client/pk-console.c:940
+#: ../client/pk-console.c:877
#, c-format
msgid "This tool could not download the packages: %s"
msgstr "Konnte folgende Pakete nicht herunterladen: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:967 ../client/pk-console.c:976
+#: ../client/pk-console.c:904
+#: ../client/pk-console.c:913
#, c-format
msgid "This tool could not update %s: %s"
msgstr "Dieses Werkzeug konnte %s nicht aktualisieren: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:998 ../client/pk-console.c:1006
+#: ../client/pk-console.c:935
+#: ../client/pk-console.c:943
#, c-format
msgid "This tool could not get the requirements for %s: %s"
-msgstr "Dieses Werkzeug konnte die Voraussetzungen für %s nicht beziehen: %s"
+msgstr "Dieses Werkzeug konnte die Voraussetzungen %s nicht beziehen: %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
-#: ../client/pk-console.c:1028 ../client/pk-console.c:1036
+#: ../client/pk-console.c:965
+#: ../client/pk-console.c:973
#, c-format
msgid "This tool could not get the dependencies for %s: %s"
-msgstr "Dieses Werkzeug konnten keine Abhängigkeiten für %s beziehen: %s"
+msgstr "Dieses Werkzeug konnte keine Abhängigkeiten für %s beziehen: %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
-#: ../client/pk-console.c:1058 ../client/pk-console.c:1066
+#: ../client/pk-console.c:995
+#: ../client/pk-console.c:1003
#, c-format
msgid "This tool could not get package details for %s: %s"
-msgstr "Dieses Werkzeug konnte die Paketdetails für %s nicht abrufen: %s"
+msgstr "Dieses Werkzeug konnte die Paketdetails für %s beziehen: %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:1088
+#: ../client/pk-console.c:1025
#, c-format
msgid "This tool could not find the files for %s: %s"
-msgstr "Dieses Werkzeug konnte die Dateien für %s nicht finden: %s"
+msgstr "Dieses Werkzeug konnte keine Dateien für %s finden: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:1096
+#: ../client/pk-console.c:1033
#, c-format
msgid "This tool could not get the file list for %s: %s"
-msgstr "Dieses Werkzeug konnte die Datei-Liste für %s nicht beziehen: %s"
+msgstr "Dieses Werkzeug konnte die Datei-Liste für %s nicht erstellen: %s"
#. TRANSLATORS: There was an error getting the list of packages. The filename follows
-#: ../client/pk-console.c:1118
+#: ../client/pk-console.c:1055
#, c-format
msgid "File already exists: %s"
msgstr "Datei bereits vorhanden: %s"
#. TRANSLATORS: follows a list of packages to install
-#: ../client/pk-console.c:1123 ../client/pk-console.c:1179
-#: ../client/pk-console.c:1254
+#: ../client/pk-console.c:1060
+#: ../client/pk-console.c:1116
+#: ../client/pk-console.c:1191
msgid "Getting package list"
msgstr "Beziehe Paket-Liste"
#. TRANSLATORS: There was an error getting the list of packages. The detailed error follows
-#: ../client/pk-console.c:1129 ../client/pk-console.c:1185
-#: ../client/pk-console.c:1260
+#: ../client/pk-console.c:1066
+#: ../client/pk-console.c:1122
+#: ../client/pk-console.c:1197
#, c-format
msgid "This tool could not get package list: %s"
msgstr "Konnte folgende Pakete nicht beziehen: %s"
#. TRANSLATORS: There was an error saving the list
-#: ../client/pk-console.c:1140
-#, c-format
+#: ../client/pk-console.c:1077
msgid "Failed to save to disk"
msgstr "Speicher auf die Festplatte fehlgeschlagen"
#. TRANSLATORS: There was an error getting the list. The filename follows
-#: ../client/pk-console.c:1174 ../client/pk-console.c:1249
+#: ../client/pk-console.c:1111
+#: ../client/pk-console.c:1186
#, c-format
msgid "File does not exist: %s"
msgstr "Datei nicht vorhanden: %s"
#. TRANSLATORS: header to a list of packages newly added
-#: ../client/pk-console.c:1206
+#: ../client/pk-console.c:1143
msgid "Packages to add"
msgstr "Paket zum Hinzufügen"
#. TRANSLATORS: header to a list of packages removed
-#: ../client/pk-console.c:1214
+#: ../client/pk-console.c:1151
msgid "Packages to remove"
msgstr "Pakete zum Entfernen"
#. TRANSLATORS: We didn't find any differences
-#: ../client/pk-console.c:1282
-#, c-format
+#: ../client/pk-console.c:1219
msgid "No new packages need to be installed"
msgstr "Keine neuen Pakete müssen installiert werden"
#. TRANSLATORS: follows a list of packages to install
-#: ../client/pk-console.c:1288
+#: ../client/pk-console.c:1225
msgid "To install"
-msgstr "Zum Installieren"
+msgstr "ZUm Installieren"
#. TRANSLATORS: searching takes some time....
-#: ../client/pk-console.c:1299
+#: ../client/pk-console.c:1236
msgid "Searching for package: "
msgstr "Suche nach Paket:"
#. TRANSLATORS: package was not found -- this is the end of a string ended in ...
-#: ../client/pk-console.c:1303
+#: ../client/pk-console.c:1240
msgid "not found."
msgstr "nicht gefunden."
#. TRANSLATORS: We didn't find any packages to install
-#: ../client/pk-console.c:1314
-#, c-format
+#: ../client/pk-console.c:1251
msgid "No packages can be found to install"
msgstr "Keine Pakete zum Installieren gefunden"
#. TRANSLATORS: installing new packages from package list
-#: ../client/pk-console.c:1320
+#: ../client/pk-console.c:1257
msgid "Installing packages"
msgstr "Installiere Pakete"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:1356
+#: ../client/pk-console.c:1293
#, c-format
msgid "This tool could not find the update details for %s: %s"
-msgstr "Dieses Werkzeug konnte für %s keine Aktualisierungsdetails finden : %s"
+msgstr "Dieses Werkzeug konnte für %s keine Aktualisierungsdetails finden: %s"
#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
-#: ../client/pk-console.c:1364
+#: ../client/pk-console.c:1301
#, c-format
msgid "This tool could not get the update details for %s: %s"
-msgstr ""
-"Dieses Werkzeug konnten keine Aktualisierungsdetails für '%s' finden: %s"
+msgstr "Dieses Werkzeug konnte keine Aktualisierungsdetails für %s finden: %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
-#: ../client/pk-console.c:1410
+#: ../client/pk-console.c:1347
msgid "Error:"
msgstr "Fehler:"
#. TRANSLATORS: This a list of details about the package
-#: ../client/pk-console.c:1424
+#: ../client/pk-console.c:1361
msgid "Package description"
msgstr "Paketbeschreibung"
#. TRANSLATORS: This a list files contained in the package
-#: ../client/pk-console.c:1458
+#: ../client/pk-console.c:1394
msgid "Package files"
msgstr "Paket-Dateien"
#. TRANSLATORS: This where the package has no files
-#: ../client/pk-console.c:1466
+#: ../client/pk-console.c:1403
msgid "No files"
msgstr "Keine Dateien"
#. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
-#: ../client/pk-console.c:1489
+#: ../client/pk-console.c:1426
msgid "Repository signature required"
msgstr "Signatur der Paketquellen benötigt"
#. TRANSLATORS: This a prompt asking the user to import the security key
-#: ../client/pk-console.c:1499
+#: ../client/pk-console.c:1436
msgid "Do you accept this signature?"
msgstr "Akzeptieren Sie diese Signatur?"
#. TRANSLATORS: This is where the user declined the security key
-#: ../client/pk-console.c:1503
+#: ../client/pk-console.c:1440
msgid "The signature was not accepted."
msgstr "Diese Signatur wurde nicht akzeptiert."
#. TRANSLATORS: This a request for a EULA
-#: ../client/pk-console.c:1537
+#: ../client/pk-console.c:1474
msgid "End user license agreement required"
msgstr "Endbenutzer Lizenzvereinbarung benötigt"
#. TRANSLATORS: This a prompt asking the user to agree to the license
-#: ../client/pk-console.c:1544
+#: ../client/pk-console.c:1481
msgid "Do you agree to this license?"
msgstr "Sind Sie mit dieser Lizenz einverstanden?"
#. TRANSLATORS: This is where the user declined the license
-#: ../client/pk-console.c:1548
+#: ../client/pk-console.c:1485
msgid "The license was refused."
msgstr "Die Lizenz wurde zurückgewiesen."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
-#: ../client/pk-console.c:1577
+#: ../client/pk-console.c:1514
msgid "The daemon crashed mid-transaction!"
msgstr "Der Dämon stürzte während der Transaktion ab!"
#. TRANSLATORS: This is the header to the --help menu
-#: ../client/pk-console.c:1630
+#: ../client/pk-console.c:1567
msgid "PackageKit Console Interface"
msgstr "PackageKit-Konsolen-Interface"
-#: ../client/pk-console.c:1630
+#: ../client/pk-console.c:1567
msgid "Subcommands:"
msgstr "Unterbefehle:"
-#: ../client/pk-console.c:1719 ../client/pk-generate-pack.c:184
+#: ../client/pk-console.c:1658
+#: ../client/pk-generate-pack.c:184
#: ../client/pk-monitor.c:115
-#: ../contrib/command-not-found/pk-command-not-found.c:510
-#: ../src/pk-main.c:192
+#: ../src/pk-main.c:191
msgid "Show extra debugging information"
-msgstr "Zeige weitere Debug-Informationen"
+msgstr "Zeige extra Debug-Informationen"
-#: ../client/pk-console.c:1721 ../client/pk-monitor.c:117
+#: ../client/pk-console.c:1660
+#: ../client/pk-monitor.c:117
msgid "Show the program version and exit"
msgstr "Zeige Programm-Version und beende"
-#: ../client/pk-console.c:1723
+#: ../client/pk-console.c:1662
msgid "Set the filter, e.g. installed"
msgstr "Setze den Filter, z.B. installiert"
-#: ../client/pk-console.c:1725
+#: ../client/pk-console.c:1664
msgid "Exit without waiting for actions to complete"
msgstr "Beende, ohne auf Beendigung der Aktionen zu warten"
#. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
-#: ../client/pk-console.c:1752
+#: ../client/pk-console.c:1691
msgid "This tool could not connect to system DBUS."
msgstr "Dieses Werkzeug konnte nicht zum System-DBUS verbinden."
#. TRANSLATORS: The user specified an incorrect filter
-#: ../client/pk-console.c:1839
+#: ../client/pk-console.c:1776
msgid "The filter specified was invalid"
msgstr "Der angegebene Filter war ungültig"
-#: ../client/pk-console.c:1856
+#: ../client/pk-console.c:1793
msgid "You need to specify a search type, e.g. name"
msgstr "Sie müssen einen Suchtyp angeben, z.B. einen Namen"
-#: ../client/pk-console.c:1861 ../client/pk-console.c:1868
-#: ../client/pk-console.c:1875 ../client/pk-console.c:1882
-#: ../client/pk-console.c:1990 ../client/pk-console.c:2000
-#: ../client/pk-console.c:2007 ../client/pk-console.c:2014
+#: ../client/pk-console.c:1798
+#: ../client/pk-console.c:1805
+#: ../client/pk-console.c:1812
+#: ../client/pk-console.c:1819
+#: ../client/pk-console.c:1930
+#: ../client/pk-console.c:1940
+#: ../client/pk-console.c:1947
+#: ../client/pk-console.c:1954
msgid "You need to specify a search term"
msgstr "Sie müssen einen Suchwert angeben"
-#: ../client/pk-console.c:1887
+#: ../client/pk-console.c:1824
msgid "Invalid search type"
msgstr "Ungültiger Suchtyp"
-#: ../client/pk-console.c:1892
+#: ../client/pk-console.c:1829
msgid "You need to specify a package or file to install"
msgstr "Sie müssen ein Paket oder eine Datei zum installieren angeben"
-#: ../client/pk-console.c:1899
+#: ../client/pk-console.c:1836
msgid "You need to specify a type, key_id and package_id"
msgstr "Sie müssen einen Typ, Schlüssel_id und Paket_id auswählen"
-#: ../client/pk-console.c:1906
+#: ../client/pk-console.c:1843
msgid "You need to specify a package to remove"
msgstr "Sie müssen ein Paket zum Löschen angeben"
-#: ../client/pk-console.c:1912
-msgid ""
-"You need to specify the destination directory and then the packages to "
-"download"
-msgstr ""
-"Sie müssen ein Zielverzeichnis und dann die Pakete zum herunterladen angeben"
+#: ../client/pk-console.c:1849
+msgid "You need to specify the destination directory and then the packages to download"
+msgstr "Sie müssen ein Zielverzeichnis und dann die Pakete zum herunterladen angeben"
-#: ../client/pk-console.c:1917
+#: ../client/pk-console.c:1854
msgid "Directory not found"
msgstr "Verzeichnis nicht gefunden"
-#: ../client/pk-console.c:1923
+#: ../client/pk-console.c:1860
msgid "You need to specify a licence identifier (eula-id)"
msgstr "Sie müssen eine Lizenz (eula-id) angeben"
-#: ../client/pk-console.c:1939
+#: ../client/pk-console.c:1876
msgid "You need to specify a package name to resolve"
msgstr "Sie müssen einen Paketnamen zum Auflösen angeben"
-#: ../client/pk-console.c:1946 ../client/pk-console.c:1953
+#: ../client/pk-console.c:1885
+#: ../client/pk-console.c:1892
msgid "You need to specify a repository name"
msgstr "Sie müssen einen Repository-Namen angeben"
-#: ../client/pk-console.c:1960
+#: ../client/pk-console.c:1899
msgid "You need to specify a repo name/parameter and value"
-msgstr "Sie müssen einen Repository-Namen/Parameter und Wert angeben"
+msgstr "Sie müssen einen Repositorynamen/Parameter und Wert angeben"
-#: ../client/pk-console.c:1972
+#: ../client/pk-console.c:1912
msgid "You need to specify an action, e.g. 'update-system'"
msgstr "Sie müssen eine Aktion angeben, z.B. 'update-system'"
-#: ../client/pk-console.c:1977
+#: ../client/pk-console.c:1917
msgid "You need to specify a correct role"
msgstr "Sie müssen eine korrekte Rolle angeben"
-#: ../client/pk-console.c:1982
+#: ../client/pk-console.c:1922
msgid "Failed to get last time"
msgstr "Die letzte Zeit konnte nicht herausgefunden werden"
-#: ../client/pk-console.c:2021
+#: ../client/pk-console.c:1961
msgid "You need to specify a package to find the details for"
msgstr "Sie müssen ein Paket, für das nach Details gesucht wird, angeben"
-#: ../client/pk-console.c:2028
+#: ../client/pk-console.c:1968
msgid "You need to specify a package to find the files for"
msgstr "Sie müssen ein Paket, für das nach Dateien gesucht wird, angeben"
-#: ../client/pk-console.c:2035
+#: ../client/pk-console.c:1975
msgid "You need to specify a list file to create"
msgstr "Sie müssen eine Dateiliste zum Erzeugen angeben"
-#: ../client/pk-console.c:2043 ../client/pk-console.c:2051
+#: ../client/pk-console.c:1983
+#: ../client/pk-console.c:1991
msgid "You need to specify a list file to open"
msgstr "Sie müssen eine Dateiliste zum Öffnen angeben"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
-#: ../client/pk-console.c:2104
+#: ../client/pk-console.c:2044
#, c-format
msgid "Option '%s' is not supported"
msgstr "Option '%s' wird nicht unterstützt"
#. TRANSLATORS: User does not have permission to do this
-#: ../client/pk-console.c:2117
+#: ../client/pk-console.c:2057
msgid "You don't have the necessary privileges for this operation"
msgstr "Sie haben nicht die notwendigen Privilegien für diese Operation"
#. TRANSLATORS: Generic failure of what they asked to do
-#: ../client/pk-console.c:2120
+#: ../client/pk-console.c:2060
msgid "Command failed"
msgstr "Befehl fehlgeschlagen"
@@ -628,7 +452,7 @@ msgstr "Lade Pakete herunter"
#. TRANSLATORS: This is when the dependency packages are being downloaded
#: ../client/pk-generate-pack.c:125
msgid "Downloading dependencies"
-msgstr "Lade Abhängigkeiten herunter"
+msgstr "Lade Abhängihkeiten herunter"
#: ../client/pk-generate-pack.c:186
msgid "Set the file name of dependencies to be excluded"
@@ -639,12 +463,13 @@ msgid "The output directory (the current directory is used if ommitted)"
msgstr "Das Ausgabe-Verzeichnis ()"
#: ../client/pk-generate-pack.c:190
+#, fuzzy
msgid "The package to be put into the service pack"
-msgstr "Das Paket in das Service-Paket integrieren"
+msgstr "Das Paket in das Service-Pack integrieren"
#: ../client/pk-generate-pack.c:192
msgid "Put all updates available in the service pack"
-msgstr "Füge alle Aktualisierungen dem Service-Paket hinzu"
+msgstr "Füge alle Aktualisierungen dem Service-Pack hinzu"
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:220
@@ -659,14 +484,12 @@ msgstr "Beide Optionen ausgewählt."
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:261
msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
-"Ein Paket mit dem selben Namen existiert bereits, möchten Sie es "
-"überschreiben?"
+msgstr "Ein Pack mit dem selben Namen existiert bereits, möchten Sie es überschreiben?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:264
msgid "The pack was not overwritten."
-msgstr "Das Paket wurde nicht überschrieben."
+msgstr "Das Pack wurde nicht überschrieben."
#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
#: ../client/pk-generate-pack.c:276
@@ -692,7 +515,7 @@ msgstr "Paket '%s' konnte nicht gefunden werden: %s"
#. TRANSLATORS: This is telling the user we are in the process of making the pack
#: ../client/pk-generate-pack.c:315
msgid "Creating service pack..."
-msgstr "Erstelle Servicepack ..."
+msgstr "Erstelle Servicepack..."
#. TRANSLATORS: we succeeded in making the file
#: ../client/pk-generate-pack.c:322
@@ -712,7 +535,6 @@ msgstr "PackageKit-Monitor"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:114
-#, c-format
msgid "The package could not be found"
msgstr "Das Paket konnte nicht gefunden werden"
@@ -726,246 +548,75 @@ msgstr "Es passen mehr als ein Pakete:"
msgid "Please choose the correct package: "
msgstr "Bitte wählen Sie das korrekte Paket: "
-#: ../client/pk-tools-common.c:157
+#: ../client/pk-tools-common.c:158
#, c-format
msgid "Please enter a number from 1 to %i: "
msgstr "Bitte geben Sie eine Zahl zwischen 1 und %i ein: "
-#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../contrib/command-not-found/pk-command-not-found.c:361
-#, fuzzy
-msgid "Failed to search for file"
-msgstr "Speicher auf die Festplatte fehlgeschlagen"
-
-#. TRANSLATORS: we failed to launch the executable, the error follows
-#: ../contrib/command-not-found/pk-command-not-found.c:485
-#, fuzzy
-msgid "Failed to launch:"
-msgstr "Die letzte Zeit konnte nicht herausgefunden werden"
-
-#. TRANSLATORS: tool that gets called when the command is not found
-#: ../contrib/command-not-found/pk-command-not-found.c:526
-#, fuzzy
-msgid "PackageKit Command Not Found"
-msgstr "PackageKit-Monitor"
-
-#. TRANSLATORS: the prefix of all the output telling the user why it's not executing
-#: ../contrib/command-not-found/pk-command-not-found.c:548
-#, fuzzy
-msgid "Command not found."
-msgstr "nicht gefunden."
-
-#. TRANSLATORS: tell the user what we think the command is
-#: ../contrib/command-not-found/pk-command-not-found.c:555
-#, fuzzy
-msgid "Similar command is:"
-msgstr "Unterbefehle:"
-
-#. TRANSLATORS: Ask the user if we should run the similar command
-#: ../contrib/command-not-found/pk-command-not-found.c:564
-msgid "Run similar command:"
-msgstr ""
-
-#. TRANSLATORS: show the user a list of commands that they could have meant
-#. TRANSLATORS: show the user a list of commands we could run
-#: ../contrib/command-not-found/pk-command-not-found.c:576
-#: ../contrib/command-not-found/pk-command-not-found.c:585
-#, fuzzy
-msgid "Similar commands are:"
-msgstr "Unterbefehle:"
-
-#. TRANSLATORS: ask the user to choose a file to run
-#: ../contrib/command-not-found/pk-command-not-found.c:592
-msgid "Please choose a command to run"
-msgstr ""
-
-#. TRANSLATORS: tell the user what package provides the command
-#: ../contrib/command-not-found/pk-command-not-found.c:607
-#, fuzzy
-msgid "The package providing this file is:"
-msgstr "Das Paket %s ist bereits installiert"
-
-#. TRANSLATORS: as the user if we want to install a package to provide the command
-#: ../contrib/command-not-found/pk-command-not-found.c:612
-#, c-format
-msgid "Install package '%s' to provide command '%s'?"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:633
-msgid "Packages providing this file are:"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that they can install to provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:642
-msgid "Suitable packages are:"
-msgstr ""
-
-#. get selection
-#. TRANSLATORS: ask the user to choose a file to install
-#: ../contrib/command-not-found/pk-command-not-found.c:650
-#, fuzzy
-msgid "Please choose a package to install"
-msgstr "Bitte wählen Sie das korrekte Paket: "
-
#. TRANSLATORS: when we are getting data from the daemon
-#: ../contrib/browser-plugin/src/contents.cpp:298
+#: ../contrib/packagekit-plugin/src/contents.cpp:294
msgid "Getting package information..."
-msgstr "Bekomme Paket-Informationen ..."
+msgstr "Bekomme Paket-Informationen..."
#. TRANSLATORS: run an applicaiton
-#: ../contrib/browser-plugin/src/contents.cpp:304
+#: ../contrib/packagekit-plugin/src/contents.cpp:300
#, c-format
msgid "Run %s"
msgstr "Starte %s"
#. TRANSLATORS: show the installed version of a package
-#: ../contrib/browser-plugin/src/contents.cpp:310
+#: ../contrib/packagekit-plugin/src/contents.cpp:306
msgid "Installed version"
msgstr "Installierte Version"
#. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/src/contents.cpp:318
+#: ../contrib/packagekit-plugin/src/contents.cpp:314
#, c-format
msgid "Run version %s now"
msgstr "Starte Version %s jetzt"
-#: ../contrib/browser-plugin/src/contents.cpp:324
+#: ../contrib/packagekit-plugin/src/contents.cpp:320
msgid "Run now"
msgstr "Starte jetzt"
#. TRANSLATORS: update to a new version of the package
-#: ../contrib/browser-plugin/src/contents.cpp:330
+#: ../contrib/packagekit-plugin/src/contents.cpp:326
#, c-format
msgid "Update to version %s"
msgstr "Aktualisiere auf Version %s"
#. TRANSLATORS: To install a package
-#: ../contrib/browser-plugin/src/contents.cpp:336
+#: ../contrib/packagekit-plugin/src/contents.cpp:332
#, c-format
msgid "Install %s now"
msgstr "Installiere %s jetzt"
#. TRANSLATORS: the version of the package
-#: ../contrib/browser-plugin/src/contents.cpp:339
+#: ../contrib/packagekit-plugin/src/contents.cpp:335
msgid "Version"
msgstr "Version"
#. TRANSLATORS: noting found, so can't install
-#: ../contrib/browser-plugin/src/contents.cpp:344
+#: ../contrib/packagekit-plugin/src/contents.cpp:340
msgid "No packages found for your system"
msgstr "Keine Pakete für Ihr System gefunden"
#. TRANSLATORS: package is being installed
-#: ../contrib/browser-plugin/src/contents.cpp:349
+#: ../contrib/packagekit-plugin/src/contents.cpp:345
msgid "Installing..."
-msgstr "Installiere ..."
+msgstr "Installiere..."
#: ../data/packagekit-catalog.xml.in.h:1
msgid "PackageKit Catalog"
msgstr "PackageKit Katalog"
-#: ../data/packagekit-package-list.xml.in.h:1
-msgid "PackageKit Package List"
-msgstr "PackageKit-Paketliste"
-
#: ../data/packagekit-servicepack.xml.in.h:1
msgid "PackageKit Service Pack"
msgstr "PackageKit Service-Pack"
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid ""
-"Authentication is required to cancel a task that was not started by yourself"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-msgid "Authentication is required to change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-msgid "Authentication is required to install a signed package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-msgid "Authentication is required to install an untrusted package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to refresh the system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to remove packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid "Authentication is required to rollback a transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Authentication is required to update packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Cancel foreign task"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-#, fuzzy
-msgid "Install signed package"
-msgstr "Installiere Pakete"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Install untrusted local file"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Remove package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Rollback to a previous transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:21
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:22
-msgid "Update packages"
-msgstr ""
+#: ../data/packagekit-package-list.xml.in.h:1
+msgid "PackageKit Package List"
+msgstr "PackageKit-Paketliste"
#: ../src/pk-main.c:86
msgid "Startup failed due to security policies on this machine."
@@ -977,129 +628,108 @@ msgstr "Dies kann aus zwei Gründen passieren:"
#: ../src/pk-main.c:88
msgid "The correct user is not launching the executable (usually root)"
-msgstr ""
-"Der korrekte Benutzer führt nicht das Programm aus (normalerweise root)"
+msgstr "Der korrekte Benutzer führt nicht das Programm aus (normalerweise root)"
#: ../src/pk-main.c:89
-msgid ""
-"The org.freedesktop.PackageKit.conf file is not installed in the system "
-"directory:"
-msgstr ""
-"Die org.freedesktop.PackageKit.conf-Datei ist nicht auf Ihrem Rechner im "
-"system-Verzeichnis:"
+msgid "The org.freedesktop.PackageKit.conf file is not installed in the system directory:"
+msgstr "Die org.freedesktop.PackageKit.conf-Datei ist nicht auf Ihrem Rechner im system-Verzeichnis:"
-#: ../src/pk-main.c:188
+#: ../src/pk-main.c:187
msgid "Packaging backend to use, e.g. dummy"
msgstr "Verwende Packaging-Backend z.B. dummy"
-#: ../src/pk-main.c:190
+#: ../src/pk-main.c:189
msgid "Daemonize and detach from the terminal"
msgstr "Dämonisiere und löse vom Terminal ab"
-#: ../src/pk-main.c:194
+#: ../src/pk-main.c:193
msgid "Disable the idle timer"
msgstr "Deaktiviere Idle-Timer"
-#: ../src/pk-main.c:196
+#: ../src/pk-main.c:195
msgid "Show version and exit"
msgstr "Zeige Version und beende"
-#: ../src/pk-main.c:198
+#: ../src/pk-main.c:197
msgid "Exit after a small delay"
msgstr "Beende nach kurzer Verzögerung"
-#: ../src/pk-main.c:200
+#: ../src/pk-main.c:199
#, fuzzy
msgid "Exit after the engine has loaded"
-msgstr "Beende, nachdem die Kern geladen wurde"
+msgstr "Beende, nachdem der Kern geladen wurde"
-#: ../src/pk-main.c:214
+#: ../src/pk-main.c:213
msgid "PackageKit service"
msgstr "PackageKit-Dienst"
-#: ../src/pk-main.c:250
+#: ../src/pk-main.c:249
msgid "Cannot connect to the system bus"
msgstr "Konnte nicht zum System-Bus verbinden"
-#: ../src/pk-main.c:299
+#: ../src/pk-main.c:298
#, c-format
msgid "Error trying to start: %s\n"
msgstr "Fehler beim Starten von: %s\n"
#~ msgid "This tool could not remove the packages: '%s'"
#~ msgstr "Dieser Werkzeug konnte das Paket nicht entfernen: '%s'"
-
+#~ msgid "Update detail"
+#~ msgstr "Details werden aktualisiert"
+#~ msgid "A system restart is required"
+#~ msgstr "Ein Neustart ist erforderlich"
#~ msgid "A logout and login is required"
#~ msgstr "Ein Aus- und Einloggen ist erforderlich"
-
+#~ msgid "An application restart is required"
+#~ msgstr "Ein Programm-Neustart wird benötigt"
#~ msgid "Could not find package to remove"
#~ msgstr "Packet zum Löschen konnte nicht gefunden werden"
-
#~ msgid "Cancelled!"
#~ msgstr "Abbruch!"
-
#~ msgid "Could not find package to download"
#~ msgstr "Das Packet zum Herunterladen konnte nicht gefunden werden"
-
#~ msgid "Could not find package to update"
#~ msgstr "Das Packet zum Aktualisieren konnte nicht gefunden werden"
-
#~ msgid "Could not find what packages require"
#~ msgstr "Konnte nicht herausfinden, was die Packete benötigen"
-
#~ msgid "Could not find details for"
#~ msgstr "Konnte keine Details finden für"
-
#~ msgid "Okay to import key?"
#~ msgstr "Soll der Schlüssel importiert werden?"
-
#~ msgid "Did not import key"
#~ msgstr "Schlüssel wurde nicht importiert"
-
#~ msgid "Did not agree to licence, task will fail"
#~ msgstr "Sie stimmten der Lizenz nicht zu, die Aufgabe wird fehlschlagen"
-
#~ msgid "Could not find a package match"
#~ msgstr "Es konnte kein Packet gefunden werden"
-
#~ msgid "failed to download: invalid package_id and/or directory"
#~ msgstr ""
#~ "Herunterladen fehlgeschlagen: Ungültige package_id und/oder ungültiges "
#~ "Verzeichnis"
-
#~ msgid "Could not find a valid metadata file"
#~ msgstr "Eine gültige Metadata–Datei konnte nicht gefunden werden"
-
#~ msgid "Okay to download the additional packages"
#~ msgstr "Möchten Sie die zusätzlichen Packete herunterladen"
-
#~ msgid "You need to specify the pack name and packages to be packed\n"
#~ msgstr "Sie müssen einen Packnamen und Packete zum Packen angeben\n"
-
#~ msgid ""
#~ "Invalid name for the service pack, Specify a name with .servicepack "
#~ "extension\n"
#~ msgstr ""
#~ "Ungültiger Name für ein Service Pack, geben Sie einen Namen an mit ."
#~ "servicepack als Endung\n"
-
#~ msgid "Could not set database readonly"
#~ msgstr "Datenbank konnte nicht nur-lesbar gesetzt werden"
-
#~ msgid "Could not open database: %s"
#~ msgstr "Datenbank %s konnte nicht geöffnet werden"
-
#~ msgid "You probably need to run this program as the root user"
#~ msgstr "Sie sollten dieses Programm vermutlich als Benutzer root ausführen"
-
#~ msgid "<span color='#%06x' underline='single' size='larger'>Run %s</span>"
#~ msgstr ""
#~ "<span color='#%06x' underline='single' size='larger'>%s wird ausgeführt</"
#~ "span>"
-
#~ msgid "<big>%s</big>"
#~ msgstr "<big>%s</big>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Run version %s now</span>"
@@ -1107,30 +737,27 @@ msgstr "Fehler beim Starten von: %s\n"
#~ "\n"
#~ "<span color='#%06x' underline='single'>Version %s wird jetzt ausgeführt</"
#~ "span>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Run now</span>"
#~ msgstr ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Wird jetzt ausgeführt</span>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Upgrade to version %s</span>"
#~ msgstr ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Aktualisiere zu Version %s</span>"
-
#~ msgid ""
#~ "<span color='#%06x' underline='single' size='larger'>Install %s Now</span>"
#~ msgstr ""
#~ "<span color='#%06x' underline='single' size='larger'>%s wird jetzt "
#~ "installiert</span>"
-
#~ msgid ""
#~ "\n"
#~ "<small>Version: %s</small>"
#~ msgstr ""
#~ "\n"
#~ "<small>Version: %s</small>"
+
commit 13b2bd55722cf86a7917fe43c4c4a91f95978fbe
Merge: da5ff85... 8dc68ae...
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Feb 4 19:11:30 2009 +0000
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit da5ff85aace59064fcf083cd15bc2c1e2179de6b
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Feb 4 19:04:13 2009 +0000
yum: add support for the new font and mimehandler provides
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index e9c5233..1689c31 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -638,9 +638,21 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
fltlist = filters.split(';')
pkgfilter = YumFilter(fltlist)
+ # old standard
+ if search.startswith("gstreamer0.10("):
+ provide = search
+ elif provides_type == PROVIDES_CODEC:
+ provide = "gstreamer0.10(%s)" % search
+ elif provides_type == PROVIDES_FONT:
+ provide = "font(%s)" % search
+ elif provides_type == PROVIDES_MIMETYPE:
+ provide = "mimehandler(%s)" % search
+ else:
+ self.error(ERROR_NOT_SUPPORTED, "this backend does not support %s provides" % provides_type)
+
# Check installed for file
try:
- pkgs = self.yumbase.rpmdb.searchProvides(search)
+ pkgs = self.yumbase.rpmdb.searchProvides(provide)
except Exception, e:
self.error(ERROR_INTERNAL_ERROR, _format_str(traceback.format_exc()))
pkgfilter.add_installed(pkgs)
@@ -648,7 +660,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
if not FILTER_INSTALLED in fltlist:
# Check available for file
try:
- pkgs = self.yumbase.pkgSack.searchProvides(search)
+ pkgs = self.yumbase.pkgSack.searchProvides(provide)
except yum.Errors.RepoError, e:
self.error(ERROR_NO_CACHE, _to_unicode(e))
except Exception, e:
commit 8dc68aec0ceaf1cd57ff081e092956eafce2c78c
Merge: 22c6a71... f8fb0e0...
Author: Sebastian Heinlein <devel at glatzor.de>
Date: Wed Feb 4 17:51:05 2009 +0100
Merge branch 'master' of git+ssh://glatzor@git.packagekit.org/srv/git/PackageKit
commit 22c6a716e1a811d7c38160201852c7581ebcd2a9
Author: Sebastian Heinlein <devel at glatzor.de>
Date: Wed Feb 4 17:50:24 2009 +0100
APT: allow the properties and introspection interface of the backend to everyone
diff --git a/data/org.freedesktop.PackageKitAptBackend.conf.in b/data/org.freedesktop.PackageKitAptBackend.conf.in
index e579501..ec84fcf 100644
--- a/data/org.freedesktop.PackageKitAptBackend.conf.in
+++ b/data/org.freedesktop.PackageKitAptBackend.conf.in
@@ -4,8 +4,14 @@
<busconfig>
<policy user="@PK_BACKEND_USER@">
<allow own="org.freedesktop.PackageKitAptBackend"/>
- <allow send_destination="org.freedesktop.PackageKitAptBackend"/>
- <allow send_interface="org.freedesktop.PackageKitBackend"/>
+ <allow send_destination="org.freedesktop.PackageKitAptBackend"
+ send_interface="org.freedesktop.PackageKitBackend"/>
+ </policy>
+ <policy context="default">
+ <allow send_destination="org.freedesktop.PackageKitAptBackend"
+ send_interface="org.freedesktop.DBus.Properties"/>
+ <allow send_destination="org.freedesktop.PackageKitAptBackend"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
</policy>
</busconfig>
commit 8017535c55aba3d8ca0e64f20d4eaa86f0af2c4e
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Feb 4 09:41:16 2009 +0000
bugfix: fix compile failure with gcc-4.4.0 and old versions of glib2
diff --git a/lib/packagekit-glib/pk-catalog.h b/lib/packagekit-glib/pk-catalog.h
index 4f30588..bd4c23f 100644
--- a/lib/packagekit-glib/pk-catalog.h
+++ b/lib/packagekit-glib/pk-catalog.h
@@ -60,7 +60,7 @@ typedef enum {
PK_CATALOG_PROGRESS_LAST
} PkCatalogProgress;
-GType pk_catalog_get_type (void) G_GNUC_CONST;
+GType pk_catalog_get_type (void);
PkCatalog *pk_catalog_new (void);
PkPackageList *pk_catalog_process_files (PkCatalog *catalog,
gchar **filenames);
diff --git a/lib/packagekit-glib/pk-client.h b/lib/packagekit-glib/pk-client.h
index 912cebf..2342282 100644
--- a/lib/packagekit-glib/pk-client.h
+++ b/lib/packagekit-glib/pk-client.h
@@ -158,7 +158,7 @@ struct _PkClientClass
GQuark pk_client_error_quark (void);
GType pk_client_error_get_type (void);
-GType pk_client_get_type (void) G_GNUC_CONST;
+GType pk_client_get_type (void);
PkClient *pk_client_new (void);
gboolean pk_client_set_tid (PkClient *client,
diff --git a/lib/packagekit-glib/pk-connection.h b/lib/packagekit-glib/pk-connection.h
index c560587..c184f5a 100644
--- a/lib/packagekit-glib/pk-connection.h
+++ b/lib/packagekit-glib/pk-connection.h
@@ -54,7 +54,7 @@ struct _PkConnectionClass
gboolean connected);
};
-GType pk_connection_get_type (void) G_GNUC_CONST;
+GType pk_connection_get_type (void);
PkConnection *pk_connection_new (void);
gboolean pk_connection_valid (PkConnection *connection);
diff --git a/lib/packagekit-glib/pk-control.h b/lib/packagekit-glib/pk-control.h
index c1a1b7c..b7d3403 100644
--- a/lib/packagekit-glib/pk-control.h
+++ b/lib/packagekit-glib/pk-control.h
@@ -88,7 +88,7 @@ struct _PkControlClass
};
GQuark pk_control_error_quark (void);
-GType pk_control_get_type (void) G_GNUC_CONST;
+GType pk_control_get_type (void);
PkControl *pk_control_new (void);
gboolean pk_control_allocate_transaction_id (PkControl *control,
diff --git a/lib/packagekit-glib/pk-desktop.h b/lib/packagekit-glib/pk-desktop.h
index 48c2e40..0a14081 100644
--- a/lib/packagekit-glib/pk-desktop.h
+++ b/lib/packagekit-glib/pk-desktop.h
@@ -66,7 +66,7 @@ struct _PkDesktopClass
GObjectClass parent_class;
};
-GType pk_desktop_get_type (void) G_GNUC_CONST;
+GType pk_desktop_get_type (void);
PkDesktop *pk_desktop_new (void);
gboolean pk_desktop_open_database (PkDesktop *desktop,
GError **error);
diff --git a/lib/packagekit-glib/pk-obj-list.h b/lib/packagekit-glib/pk-obj-list.h
index b4d0adb..7483915 100644
--- a/lib/packagekit-glib/pk-obj-list.h
+++ b/lib/packagekit-glib/pk-obj-list.h
@@ -57,7 +57,7 @@ typedef gboolean (*PkObjListEqualFunc) (gconstpointer data1,
typedef gpointer (*PkObjListFromStringFunc) (const gchar *data);
typedef gchar *(*PkObjListToStringFunc) (gconstpointer data);
-GType pk_obj_list_get_type (void) G_GNUC_CONST;
+GType pk_obj_list_get_type (void);
PkObjList *pk_obj_list_new (void);
void pk_obj_list_set_new (PkObjList *list,
diff --git a/lib/packagekit-glib/pk-package-list.h b/lib/packagekit-glib/pk-package-list.h
index e351d1d..f91acab 100644
--- a/lib/packagekit-glib/pk-package-list.h
+++ b/lib/packagekit-glib/pk-package-list.h
@@ -55,7 +55,7 @@ struct _PkPackageListClass
PkObjListClass parent_class;
};
-GType pk_package_list_get_type (void) G_GNUC_CONST;
+GType pk_package_list_get_type (void);
PkPackageList *pk_package_list_new (void);
gboolean pk_package_list_add (PkPackageList *plist,
PkInfoEnum info,
diff --git a/lib/packagekit-glib/pk-service-pack.h b/lib/packagekit-glib/pk-service-pack.h
index 4abb181..e1b83e7 100644
--- a/lib/packagekit-glib/pk-service-pack.h
+++ b/lib/packagekit-glib/pk-service-pack.h
@@ -86,7 +86,7 @@ typedef struct
GQuark pk_service_pack_error_quark (void);
GType pk_service_pack_error_get_type (void);
-GType pk_service_pack_get_type (void) G_GNUC_CONST;
+GType pk_service_pack_get_type (void);
PkServicePack *pk_service_pack_new (void);
/* used by the server */
diff --git a/lib/packagekit-glib/pk-task-list.h b/lib/packagekit-glib/pk-task-list.h
index 16838a1..9ab143e 100644
--- a/lib/packagekit-glib/pk-task-list.h
+++ b/lib/packagekit-glib/pk-task-list.h
@@ -78,7 +78,7 @@ struct _PkTaskListClass
const gchar *details);
};
-GType pk_task_list_get_type (void) G_GNUC_CONST;
+GType pk_task_list_get_type (void);
PkTaskList *pk_task_list_new (void);
gboolean pk_task_list_refresh (PkTaskList *tlist);
diff --git a/src/egg-dbus-monitor.h b/src/egg-dbus-monitor.h
index ea40f15..c03816d 100644
--- a/src/egg-dbus-monitor.h
+++ b/src/egg-dbus-monitor.h
@@ -56,7 +56,7 @@ typedef enum {
EGG_DBUS_MONITOR_SYSTEM
} EggDbusMonitorType;
-GType egg_dbus_monitor_get_type (void) G_GNUC_CONST;
+GType egg_dbus_monitor_get_type (void);
EggDbusMonitor *egg_dbus_monitor_new (void);
gboolean egg_dbus_monitor_reset (EggDbusMonitor *monitor);
gboolean egg_dbus_monitor_assign (EggDbusMonitor *monitor,
diff --git a/src/pk-backend-dbus.h b/src/pk-backend-dbus.h
index 24e6811..399f92e 100644
--- a/src/pk-backend-dbus.h
+++ b/src/pk-backend-dbus.h
@@ -61,7 +61,7 @@ typedef struct
GObjectClass parent_class;
} PkBackendDbusClass;
-GType pk_backend_dbus_get_type (void) G_GNUC_CONST;
+GType pk_backend_dbus_get_type (void);
PkBackendDbus *pk_backend_dbus_new (void);
gboolean pk_backend_dbus_refresh_cache (PkBackendDbus *backend_dbus,
gboolean force);
diff --git a/src/pk-backend-internal.h b/src/pk-backend-internal.h
index 32ccb9b..a497f0b 100644
--- a/src/pk-backend-internal.h
+++ b/src/pk-backend-internal.h
@@ -53,7 +53,7 @@ struct _PkBackendClass
GObjectClass parent_class;
};
-GType pk_backend_get_type (void) G_GNUC_CONST;
+GType pk_backend_get_type (void);
PkBackend *pk_backend_new (void);
gboolean pk_backend_lock (PkBackend *backend)
G_GNUC_WARN_UNUSED_RESULT;
diff --git a/src/pk-backend-spawn.h b/src/pk-backend-spawn.h
index 50b629e..894c4a6 100644
--- a/src/pk-backend-spawn.h
+++ b/src/pk-backend-spawn.h
@@ -50,7 +50,7 @@ typedef struct
} PkBackendSpawnClass;
/* general */
-GType pk_backend_spawn_get_type (void) G_GNUC_CONST;
+GType pk_backend_spawn_get_type (void);
PkBackendSpawn *pk_backend_spawn_new (void);
gboolean pk_backend_spawn_helper (PkBackendSpawn *backend_spawn,
const gchar *first_element, ...);
diff --git a/src/pk-cache.h b/src/pk-cache.h
index 9c8f863..7154665 100644
--- a/src/pk-cache.h
+++ b/src/pk-cache.h
@@ -47,7 +47,7 @@ typedef struct
GObjectClass parent_class;
} PkCacheClass;
-GType pk_cache_get_type (void) G_GNUC_CONST;
+GType pk_cache_get_type (void);
PkCache *pk_cache_new (void);
PkPackageList *pk_cache_get_updates (PkCache *cache);
diff --git a/src/pk-conf.h b/src/pk-conf.h
index 942e948..fecb687 100644
--- a/src/pk-conf.h
+++ b/src/pk-conf.h
@@ -49,7 +49,7 @@ typedef struct
#define PK_CONF_VALUE_INT_MISSING -1
#define PK_CONF_VALUE_STRING_MISSING NULL
-GType pk_conf_get_type (void) G_GNUC_CONST;
+GType pk_conf_get_type (void);
PkConf *pk_conf_new (void);
gchar *pk_conf_get_filename (void);
diff --git a/src/pk-engine.h b/src/pk-engine.h
index 58bb864..4dc367d 100644
--- a/src/pk-engine.h
+++ b/src/pk-engine.h
@@ -65,8 +65,8 @@ typedef enum
GQuark pk_engine_error_quark (void);
-GType pk_engine_error_get_type (void) G_GNUC_CONST;
-GType pk_engine_get_type (void) G_GNUC_CONST;
+GType pk_engine_error_get_type (void);
+GType pk_engine_get_type (void);
PkEngine *pk_engine_new (void);
/* general */
diff --git a/src/pk-file-monitor.h b/src/pk-file-monitor.h
index 984b373..0cafaf9 100644
--- a/src/pk-file-monitor.h
+++ b/src/pk-file-monitor.h
@@ -46,7 +46,7 @@ typedef struct
GObjectClass parent_class;
} PkFileMonitorClass;
-GType pk_file_monitor_get_type (void) G_GNUC_CONST;
+GType pk_file_monitor_get_type (void);
gboolean pk_file_monitor_set_file (PkFileMonitor *file_monitor,
const gchar *filename);
PkFileMonitor *pk_file_monitor_new (void);
diff --git a/src/pk-inhibit.h b/src/pk-inhibit.h
index 232488a..535cd32 100644
--- a/src/pk-inhibit.h
+++ b/src/pk-inhibit.h
@@ -46,7 +46,7 @@ typedef struct
GObjectClass parent_class;
} PkInhibitClass;
-GType pk_inhibit_get_type (void) G_GNUC_CONST;
+GType pk_inhibit_get_type (void);
PkInhibit *pk_inhibit_new (void);
gboolean pk_inhibit_locked (PkInhibit *inhibit)
diff --git a/src/pk-network-nm.h b/src/pk-network-nm.h
index 89091a8..a05ba8d 100644
--- a/src/pk-network-nm.h
+++ b/src/pk-network-nm.h
@@ -58,7 +58,7 @@ struct _PkNetworkNmClass
GObjectClass parent_class;
};
-GType pk_network_nm_get_type (void) G_GNUC_CONST;
+GType pk_network_nm_get_type (void);
PkNetworkNm *pk_network_nm_new (void);
PkNetworkEnum pk_network_nm_get_network_state (PkNetworkNm *network_nm);
diff --git a/src/pk-network-unix.h b/src/pk-network-unix.h
index e43d7f5..a37dc5a 100644
--- a/src/pk-network-unix.h
+++ b/src/pk-network-unix.h
@@ -58,7 +58,7 @@ struct _PkNetworkUnixClass
GObjectClass parent_class;
};
-GType pk_network_unix_get_type (void) G_GNUC_CONST;
+GType pk_network_unix_get_type (void);
PkNetworkUnix *pk_network_unix_new (void);
PkNetworkEnum pk_network_unix_get_network_state (PkNetworkUnix *network_unix);
diff --git a/src/pk-network.h b/src/pk-network.h
index 5ec1e13..2ec6a07 100644
--- a/src/pk-network.h
+++ b/src/pk-network.h
@@ -58,7 +58,7 @@ struct _PkNetworkClass
GObjectClass parent_class;
};
-GType pk_network_get_type (void) G_GNUC_CONST;
+GType pk_network_get_type (void);
PkNetwork *pk_network_new (void);
PkNetworkEnum pk_network_get_network_state (PkNetwork *network);
diff --git a/src/pk-notify.h b/src/pk-notify.h
index aa36881..d941690 100644
--- a/src/pk-notify.h
+++ b/src/pk-notify.h
@@ -46,7 +46,7 @@ typedef struct
GObjectClass parent_class;
} PkNotifyClass;
-GType pk_notify_get_type (void) G_GNUC_CONST;
+GType pk_notify_get_type (void);
PkNotify *pk_notify_new (void);
gboolean pk_notify_repo_list_changed (PkNotify *notify);
diff --git a/src/pk-post-trans.h b/src/pk-post-trans.h
index 7d33db1..66abd14 100644
--- a/src/pk-post-trans.h
+++ b/src/pk-post-trans.h
@@ -46,7 +46,7 @@ typedef struct
GObjectClass parent_class;
} PkPostTransClass;
-GType pk_post_trans_get_type (void) G_GNUC_CONST;
+GType pk_post_trans_get_type (void);
PkPostTrans *pk_post_trans_new (void);
gboolean pk_post_trans_clear_firmware_requests (PkPostTrans *post);
diff --git a/src/pk-security.h b/src/pk-security.h
index aa0bc07..a90d9f4 100644
--- a/src/pk-security.h
+++ b/src/pk-security.h
@@ -55,7 +55,7 @@ typedef struct
typedef struct PkSecurityCaller_ PkSecurityCaller;
-GType pk_security_get_type (void) G_GNUC_CONST;
+GType pk_security_get_type (void);
PkSecurity *pk_security_new (void);
PkSecurityCaller *pk_security_caller_new_from_sender (PkSecurity *security,
diff --git a/src/pk-spawn.h b/src/pk-spawn.h
index 98211f0..6d81bab 100644
--- a/src/pk-spawn.h
+++ b/src/pk-spawn.h
@@ -63,7 +63,7 @@ typedef enum {
PK_SPAWN_EXIT_TYPE_UNKNOWN
} PkSpawnExitType;
-GType pk_spawn_get_type (void) G_GNUC_CONST;
+GType pk_spawn_get_type (void);
PkSpawn *pk_spawn_new (void);
gboolean pk_spawn_argv (PkSpawn *spawn,
diff --git a/src/pk-store.h b/src/pk-store.h
index 98f6a58..161a64a 100644
--- a/src/pk-store.h
+++ b/src/pk-store.h
@@ -46,7 +46,7 @@ typedef struct
GObjectClass parent_class;
} PkStoreClass;
-GType pk_store_get_type (void) G_GNUC_CONST;
+GType pk_store_get_type (void);
PkStore *pk_store_new (void);
gboolean pk_store_set_array (PkStore *store,
diff --git a/src/pk-syslog.h b/src/pk-syslog.h
index 297b5ac..45a67f9 100644
--- a/src/pk-syslog.h
+++ b/src/pk-syslog.h
@@ -53,7 +53,7 @@ typedef enum {
PK_SYSLOG_TYPE_UNKNOWN
} PkSyslogType;
-GType pk_syslog_get_type (void) G_GNUC_CONST;
+GType pk_syslog_get_type (void);
PkSyslog *pk_syslog_new (void);
void pk_syslog_add (PkSyslog *syslog,
PkSyslogType type,
diff --git a/src/pk-time.h b/src/pk-time.h
index 510f6a5..f39f125 100644
--- a/src/pk-time.h
+++ b/src/pk-time.h
@@ -48,7 +48,7 @@ typedef struct
GObjectClass parent_class;
} PkTimeClass;
-GType pk_time_get_type (void) G_GNUC_CONST;
+GType pk_time_get_type (void);
PkTime *pk_time_new (void);
gboolean pk_time_add_data (PkTime *time,
diff --git a/src/pk-transaction-db.h b/src/pk-transaction-db.h
index c4b2bfe..91c4b0e 100644
--- a/src/pk-transaction-db.h
+++ b/src/pk-transaction-db.h
@@ -47,7 +47,7 @@ typedef struct
GObjectClass parent_class;
} PkTransactionDbClass;
-GType pk_transaction_db_get_type (void) G_GNUC_CONST;
+GType pk_transaction_db_get_type (void);
PkTransactionDb *pk_transaction_db_new (void);
gboolean pk_transaction_db_empty (PkTransactionDb *tdb);
gboolean pk_transaction_db_add (PkTransactionDb *tdb,
diff --git a/src/pk-transaction-list.h b/src/pk-transaction-list.h
index c6f1ebd..48b5808 100644
--- a/src/pk-transaction-list.h
+++ b/src/pk-transaction-list.h
@@ -51,7 +51,7 @@ typedef struct
GObjectClass parent_class;
} PkTransactionListClass;
-GType pk_transaction_list_get_type (void) G_GNUC_CONST;
+GType pk_transaction_list_get_type (void);
PkTransactionList *pk_transaction_list_new (void);
gboolean pk_transaction_list_create (PkTransactionList *tlist,
diff --git a/src/pk-transaction.h b/src/pk-transaction.h
index c1b66f3..a3b5925 100644
--- a/src/pk-transaction.h
+++ b/src/pk-transaction.h
@@ -75,8 +75,8 @@ typedef enum
} PkTransactionError;
GQuark pk_transaction_error_quark (void);
-GType pk_transaction_error_get_type (void) G_GNUC_CONST;
-GType pk_transaction_get_type (void) G_GNUC_CONST;
+GType pk_transaction_error_get_type (void);
+GType pk_transaction_get_type (void);
PkTransaction *pk_transaction_new (void);
/* go go go! */
diff --git a/src/pk-update-detail-list.h b/src/pk-update-detail-list.h
index 876a2dd..cb2b93b 100644
--- a/src/pk-update-detail-list.h
+++ b/src/pk-update-detail-list.h
@@ -47,7 +47,7 @@ typedef struct
GObjectClass parent_class;
} PkUpdateDetailListClass;
-GType pk_update_detail_list_get_type (void) G_GNUC_CONST;
+GType pk_update_detail_list_get_type (void);
PkUpdateDetailList *pk_update_detail_list_new (void);
gboolean pk_update_detail_list_clear (PkUpdateDetailList *list);
commit f8fb0e02c44842736fedee3e5d803e5d275ae21a
Author: Marcin Banasiak <megabajt at pld-linux.org>
Date: Tue Feb 3 12:27:14 2009 +0100
poldek: for NOT_INSTALLED filter return only available packages that are NOT installed
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index ca3ae46..17e63b2 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -1559,8 +1559,29 @@ search_package_thread (PkBackend *backend)
n_array_sort_ex(pkgs, (tn_fn_cmp)pkg_cmp_name_evr_rev_recno);
n_array_free (installed);
- } else if (pk_bitfield_contain (filters, PK_FILTER_ENUM_NOT_INSTALLED) || available) {
+
+ } else if (pk_bitfield_contain (filters, PK_FILTER_ENUM_NOT_INSTALLED) && available) {
+ tn_array *dbpkgs = NULL;
+ guint i;
+
+ dbpkgs = poldek_get_installed_packages ();
+ pkgs = n_array_new (4, (tn_fn_free)pkg_free, NULL);
+
+ for (i = 0; i < n_array_size (available); i++) {
+ struct pkg *pkg = n_array_nth (available, i);
+
+ /* drop installed packages */
+ if (!poldek_pkg_in_array (pkg, dbpkgs, (tn_fn_cmp)pkg_cmp_name_evr)) {
+ n_array_push (pkgs, pkg_link (pkg));
+ }
+ }
+
+ n_array_free (available);
+ n_array_free (dbpkgs);
+
+ } else if (available) {
pkgs = available;
+
} else if (pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED) || installed)
pkgs = installed;
}
commit 6de50efdf771999976d10c0f8a8b0b4543dea4c0
Author: Marcin Banasiak <megabajt at pld-linux.org>
Date: Tue Feb 3 12:21:11 2009 +0100
poldek: build fix by Patryk Zawadzki
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index be5b723..ca3ae46 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -260,7 +260,7 @@ get_locale_variants (PkBackend *backend, const gchar *lang)
tn_array *langs;
gchar *copy;
gchar *wocc = NULL;
- gchar *sep = "@.";
+ const gchar *sep = "@.";
gint len;
/* first check cached_locale_variants */
@@ -393,7 +393,7 @@ poldek_get_bytes_to_download_from_ts (struct poldek_ts *ts)
static long
do_get_bytes_to_download (struct poldek_ts *ts, tn_array *pkgs)
{
- gint i;
+ size_t i;
long bytes = 0;
for (i = 0; i < n_array_size (pkgs); i++) {
@@ -498,7 +498,7 @@ poldek_vf_progress_reset (void *bar)
static gint
poldek_pkg_in_array_idx (const struct pkg *pkg, const tn_array *array, tn_fn_cmp cmp_fn)
{
- gint i;
+ size_t i;
if (array) {
for (i = 0; i < n_array_size (array); i++) {
@@ -534,7 +534,8 @@ ts_confirm (void *data, struct poldek_ts *ts)
{
tn_array *ipkgs, *dpkgs, *rpkgs;
PkBackend *backend = (PkBackend *)data;
- gint i = 0, result = 1;
+ size_t i = 0;
+ gint result = 1;
egg_debug ("START\n");
@@ -763,17 +764,17 @@ get_pkgid_from_localpath (const gchar *localpath)
db = pkgdb_open (ts->pmctx, ts->rootdir, NULL, O_RDONLY, NULL);
if (db) {
- const struct pm_dbrec *dbrec;
+ const struct pm_dbrec *ldbrec;
struct pkgdb_it it;
pkgdb_it_init (db, &it, PMTAG_FILE, localpath);
/* get only one package */
- if ((dbrec = pkgdb_it_get (&it)) != NULL) {
+ if ((ldbrec = pkgdb_it_get (&it)) != NULL) {
gchar *name = NULL, *version = NULL, *release = NULL, *arch = NULL;
gint epoch;
- pm_dbrec_nevr (dbrec, &name, &epoch, &version, &release, &arch, NULL);
+ pm_dbrec_nevr (ldbrec, &name, &epoch, &version, &release, &arch, NULL);
pkgid = g_strdup_printf ("%s-%s-%s.%s", name, version, release, arch);
}
@@ -1129,7 +1130,7 @@ do_requires (tn_array *installed, tn_array *available, tn_array *requires,
struct pkg *pkg, PkBackend *backend)
{
tn_array *tmp = NULL;
- gint i;
+ size_t i;
PkBitfield filters;
gboolean recursive;
@@ -1140,7 +1141,7 @@ do_requires (tn_array *installed, tn_array *available, tn_array *requires,
if (!pk_bitfield_contain (filters, PK_FILTER_ENUM_NOT_INSTALLED)) {
for (i = 0; i < n_array_size (installed); i++) {
struct pkg *ipkg = n_array_nth (installed, i);
- int j;
+ size_t j;
/* self match */
if (pkg_cmp_name_evr (pkg, ipkg) == 0)
@@ -1173,7 +1174,7 @@ do_requires (tn_array *installed, tn_array *available, tn_array *requires,
if (!pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED)) {
for (i = 0; i < n_array_size (available); i++) {
struct pkg *apkg = n_array_nth (available, i);
- int j;
+ size_t j;
/* self match */
if (pkg_cmp_name_evr (pkg, apkg) == 0)
@@ -1225,7 +1226,7 @@ do_depends (tn_array *installed, tn_array *available, tn_array *depends, struct
{
tn_array *reqs = pkg->reqs;
tn_array *tmp = NULL;
- gint i;
+ size_t i;
PkBitfield filters;
gboolean recursive;
@@ -1240,7 +1241,7 @@ do_depends (tn_array *installed, tn_array *available, tn_array *depends, struct
for (i = 0; i < n_array_size (reqs); i++) {
struct capreq *req = n_array_nth (reqs, i);
gboolean found = FALSE;
- gint j;
+ size_t j;
/* skip it */
if (capreq_is_rpmlib (req))
@@ -1782,7 +1783,7 @@ show_rpm_progress (PkBackend *backend, gchar *message)
/* emit remove for packages marked for removal */
if (rpkgs) {
- gint i;
+ size_t i;
/* XXX: don't release rpkgs array here! */
for (i = 0; i < n_array_size (rpkgs); i++) {
@@ -2070,7 +2071,7 @@ backend_download_packages_thread (PkBackend *backend)
tn_array *pkgs;
gchar **package_ids;
const gchar *destdir;
- gint i;
+ size_t i;
package_ids = pk_backend_get_strv (backend, "package_ids");
destdir = pk_backend_get_string (backend, "directory");
@@ -2188,7 +2189,7 @@ backend_get_depends_thread (PkBackend *backend)
{
struct pkg *pkg;
tn_array *deppkgs, *available, *installed;
- gint i;
+ size_t i;
gchar **package_ids;
pb_load_packages (backend);
@@ -2297,7 +2298,7 @@ static gboolean
backend_get_files_thread (PkBackend *backend)
{
gchar **package_ids;
- gint n;
+ size_t n;
package_ids = pk_backend_get_strv (backend, "package_ids");
@@ -2311,7 +2312,8 @@ backend_get_files_thread (PkBackend *backend)
if (pkg != NULL) {
struct pkgflist *flist = pkg_get_flist (pkg);
GString *filelist;
- gchar *result, *sep;
+ gchar *result;
+ const gchar *sep;
gint i, j;
sep = "";
@@ -2442,7 +2444,7 @@ backend_get_requires_thread (PkBackend *backend)
{
struct pkg *pkg;
tn_array *reqpkgs, *available, *installed;
- gint i;
+ size_t i;
gchar **package_ids;
pb_load_packages (backend);
@@ -2491,7 +2493,7 @@ get_obsoletedby_pkg (struct pkg *pkg)
{
tn_array *dbpkgs;
GString *obsoletes = NULL;
- gint i;
+ size_t i;
g_return_val_if_fail (pkg != NULL, NULL);
@@ -2696,7 +2698,7 @@ backend_install_packages_thread (PkBackend *backend)
struct vf_progress vf_progress;
gchar **package_ids;
GString *cmd;
- gint i;
+ size_t i;
pk_backend_set_uint (backend, "ts_type", TS_TYPE_ENUM_INSTALL);
package_ids = pk_backend_get_strv (backend, "package_ids");
@@ -2768,7 +2770,7 @@ backend_refresh_cache_thread (PkBackend *backend)
sources = poldek_get_sources (ctx);
if (sources) {
- gint i;
+ size_t i;
pk_backend_set_uint (backend, "ts_type", TS_TYPE_ENUM_REFRESH_CACHE);
pd->step = 0;
@@ -2834,7 +2836,7 @@ backend_remove_packages_thread (PkBackend *backend)
GString *cmd;
gchar *command;
gchar **package_ids;
- gint i;
+ size_t i;
package_ids = pk_backend_get_strv (backend, "package_ids");
pb_load_packages (backend);
@@ -2993,7 +2995,7 @@ backend_get_repo_list (PkBackend *backend, PkBitfield filters)
sources = poldek_get_sources (ctx);
if (sources) {
- gint i;
+ size_t i;
for (i = 0; i < n_array_size (sources); i++) {
struct source *src = n_array_nth (sources, i);
More information about the PackageKit-commit
mailing list