[PackageKit-commit] packagekit: Branch 'master' - 16 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri Jul 23 01:40:27 PDT 2010
backends/alpm/pk-backend-alpm.c | 43 +++------
backends/entropy/entropyBackend.py | 8 -
backends/opkg/pk-backend-opkg.c | 2
backends/pacman/backend-search.c | 13 ++
backends/pacman/backend-transaction.c | 4
backends/pacman/backend-update.c | 11 +-
backends/yum/Yum.conf | 2
backends/yum/yumBackend.py | 7 +
client/pk-console.c | 1
contrib/command-not-found/PackageKit.sh.in | 2
contrib/cron/packagekit-background.cron | 2
docs/html/img/users-0install.png |binary
docs/html/index.html | 2
docs/html/pk-authors.html | 2
docs/html/pk-bugs.html | 2
docs/html/pk-download.html | 2
docs/html/pk-faq.html | 2
docs/html/pk-help.html | 2
docs/html/pk-intro.html | 2
docs/html/pk-matrix.html | 2
docs/html/pk-profiles.html | 2
docs/html/pk-reference.html | 2
docs/html/pk-screenshots.html | 2
docs/html/pk-users.html | 22 ++++
docs/html/pk-using.html | 2
lib/packagekit-glib2/pk-task.c | 50 +++++++++++
po/ja.po | 128 +++++++++++++++--------------
po/nl.po | 73 ++++++++--------
28 files changed, 237 insertions(+), 155 deletions(-)
New commits:
commit 36333a4ba1fadecd9e014aef74ffe5dd9ebf720c
Author: Vincent Untz <vuntz at gnome.org>
Date: Fri Jul 23 10:22:27 2010 +0200
cron: Do not exit with 1 if the cron script is disabled in the config
Exiting with 1 means it is an error, while it's really just a
configuration option.
diff --git a/contrib/cron/packagekit-background.cron b/contrib/cron/packagekit-background.cron
index e62d204..0a053b6 100755
--- a/contrib/cron/packagekit-background.cron
+++ b/contrib/cron/packagekit-background.cron
@@ -13,7 +13,7 @@
# are we disabled?
if [ "$ENABLED" = "no" ]; then
- exit 1
+ exit 0
fi
# set default for SYSTEM_NAME
commit 4cf075e020d818cd16dd2df32cd5f138cbf3d3e0
Author: Jonathan Conder <j at skurvy.no-ip.org>
Date: Fri Jul 23 13:27:47 2010 +1200
pacman: add support for versioned provides field
diff --git a/backends/pacman/backend-search.c b/backends/pacman/backend-search.c
index f819252..32b4df8 100644
--- a/backends/pacman/backend-search.c
+++ b/backends/pacman/backend-search.c
@@ -187,15 +187,20 @@ backend_match_provides (PacmanPackage *package, gpointer pattern)
{
/* TODO: implement GStreamer codecs, Pango fonts, etc. */
const PacmanList *provides;
- const gchar *needle = (const gchar *) pattern;
g_return_val_if_fail (package != NULL, FALSE);
- g_return_val_if_fail (needle != NULL, FALSE);
+ g_return_val_if_fail (pattern != NULL, FALSE);
/* match features provided by package */
for (provides = pacman_package_get_provides (package); provides != NULL; provides = pacman_list_next (provides)) {
- const gchar *name = (const gchar *) pacman_list_get (provides);
- if (g_strcmp0 (needle, name) == 0) {
+ const gchar *needle = (const gchar *) pattern, *name = (const gchar *) pacman_list_get (provides);
+
+ while (*needle == *name && *needle != '\0') {
+ ++needle;
+ ++name;
+ }
+
+ if (*needle == '\0' && (*name == '\0' || *name == '=')) {
return TRUE;
}
}
commit fc468469bf955520b3cfcbd609b3b3b1252a0e40
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 22 15:25:21 2010 +0100
yum: add gnome-packagekit and kpackagekit to the list of infrastructure packages
diff --git a/backends/yum/Yum.conf b/backends/yum/Yum.conf
index 2985c7a..79ca313 100644
--- a/backends/yum/Yum.conf
+++ b/backends/yum/Yum.conf
@@ -35,7 +35,7 @@ SystemPackages=yum;rpm;glibc;PackageKit
# infrastructure packages too, and are included in the update viewer.
#
# default=PackageKit;yum;rpm
-InfrastructurePackages=PackageKit;yum;rpm
+InfrastructurePackages=PackageKit;yum;rpm;gnome-packagekit;kpackagekit
# Yum is slow, and we can use Zif to accelerate some simple transactions
#
commit c46cc1401f9ed10a6416b4da2267e0ced2678257
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 22 15:24:45 2010 +0100
glib: Add an 'interactive' property to PkTask so that we can use it to do '-y' in pkcon properly
diff --git a/client/pk-console.c b/client/pk-console.c
index 9fea6bb..c7913cb 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -1356,6 +1356,7 @@ main (int argc, char *argv[])
g_object_set (task,
"background", background,
"simulate", !noninteractive,
+ "interactive", !noninteractive,
NULL);
/* set the proxy */
diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
index e4e8c6a..53d36a3 100644
--- a/lib/packagekit-glib2/pk-task.c
+++ b/lib/packagekit-glib2/pk-task.c
@@ -49,11 +49,13 @@ struct _PkTaskPrivate
{
GPtrArray *array;
gboolean simulate;
+ gboolean interactive;
};
enum {
PROP_0,
PROP_SIMULATE,
+ PROP_INTERACTIVE,
PROP_LAST
};
@@ -810,6 +812,13 @@ pk_task_ready_cb (GObject *source_object, GAsyncResult *res, PkTaskState *state)
if (state->exit_enum == PK_EXIT_ENUM_NEED_UNTRUSTED) {
state->only_trusted = FALSE;
+ /* running non-interactive */
+ if (!state->task->priv->interactive) {
+ egg_debug ("working non-interactive, so calling accept");
+ pk_task_user_accepted (state->task, state->request);
+ goto out;
+ }
+
/* no support */
if (klass->untrusted_question == NULL) {
error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_NOT_SUPPORTED,
@@ -826,6 +835,14 @@ pk_task_ready_cb (GObject *source_object, GAsyncResult *res, PkTaskState *state)
/* need key */
if (state->exit_enum == PK_EXIT_ENUM_KEY_REQUIRED) {
+
+ /* running non-interactive */
+ if (!state->task->priv->interactive) {
+ egg_debug ("working non-interactive, so calling accept");
+ pk_task_user_accepted (state->task, state->request);
+ goto out;
+ }
+
/* no support */
if (klass->key_question == NULL) {
error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_NOT_SUPPORTED,
@@ -842,6 +859,14 @@ pk_task_ready_cb (GObject *source_object, GAsyncResult *res, PkTaskState *state)
/* need EULA */
if (state->exit_enum == PK_EXIT_ENUM_EULA_REQUIRED) {
+
+ /* running non-interactive */
+ if (!state->task->priv->interactive) {
+ egg_debug ("working non-interactive, so calling accept");
+ pk_task_user_accepted (state->task, state->request);
+ goto out;
+ }
+
/* no support */
if (klass->eula_question == NULL) {
error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_NOT_SUPPORTED,
@@ -858,6 +883,14 @@ pk_task_ready_cb (GObject *source_object, GAsyncResult *res, PkTaskState *state)
/* need media change */
if (state->exit_enum == PK_EXIT_ENUM_MEDIA_CHANGE_REQUIRED) {
+
+ /* running non-interactive */
+ if (!state->task->priv->interactive) {
+ egg_debug ("working non-interactive, so calling accept");
+ pk_task_user_accepted (state->task, state->request);
+ goto out;
+ }
+
/* no support */
if (klass->media_change_question == NULL) {
error = g_error_new (PK_CLIENT_ERROR, PK_CLIENT_ERROR_NOT_SUPPORTED,
@@ -2171,6 +2204,9 @@ pk_task_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
case PROP_SIMULATE:
g_value_set_boolean (value, priv->simulate);
break;
+ case PROP_INTERACTIVE:
+ g_value_set_boolean (value, priv->interactive);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2190,6 +2226,9 @@ pk_task_set_property (GObject *object, guint prop_id, const GValue *value, GPara
case PROP_SIMULATE:
priv->simulate = g_value_get_boolean (value);
break;
+ case PROP_INTERACTIVE:
+ priv->interactive = g_value_get_boolean (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2218,6 +2257,16 @@ pk_task_class_init (PkTaskClass *klass)
G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_SIMULATE, pspec);
+ /**
+ * PkTask:interactive:
+ *
+ * Since: 0.6.7
+ */
+ pspec = g_param_spec_boolean ("interactive", NULL, NULL,
+ TRUE,
+ G_PARAM_READWRITE);
+ g_object_class_install_property (object_class, PROP_INTERACTIVE, pspec);
+
g_type_class_add_private (klass, sizeof (PkTaskPrivate));
}
@@ -2230,6 +2279,7 @@ pk_task_init (PkTask *task)
task->priv = PK_TASK_GET_PRIVATE (task);
task->priv->array = g_ptr_array_new ();
task->priv->simulate = TRUE;
+ task->priv->interactive = TRUE;
}
/**
commit 41c2fb6044042f7700190ed46275c6f3f957c8e7
Author: Jonathan Conder <j at skurvy.no-ip.org>
Date: Thu Jul 22 14:20:38 2010 +1200
trivial: pacman: cosmetic fixes
diff --git a/backends/pacman/backend-transaction.c b/backends/pacman/backend-transaction.c
index b16458d..458ad83 100644
--- a/backends/pacman/backend-transaction.c
+++ b/backends/pacman/backend-transaction.c
@@ -502,9 +502,7 @@ backend_transaction_commit (PkBackend *backend, PacmanTransaction *transaction)
{
GError *error = NULL;
- if (backend_cancelled (backend)) {
- return transaction;
- } else if (transaction != NULL) {
+ if (transaction != NULL && !backend_cancelled (backend)) {
pk_backend_set_status (backend, PK_STATUS_ENUM_RUNNING);
if (!pacman_transaction_commit (transaction, &error)) {
diff --git a/backends/pacman/backend-update.c b/backends/pacman/backend-update.c
index 7ead935..256ba2f 100644
--- a/backends/pacman/backend-update.c
+++ b/backends/pacman/backend-update.c
@@ -66,6 +66,7 @@ pacman_package_make_replaces_ids (PacmanPackage *package)
static gchar *
pacman_package_make_vendor_url (PacmanPackage *package)
{
+ GString *string = g_string_new ("");
#ifdef PACMAN_PACKAGE_URL
const gchar *name, *arch, *repo, *url;
#else
@@ -76,6 +77,9 @@ pacman_package_make_vendor_url (PacmanPackage *package)
/* grab the URL of the package... */
url = pacman_package_get_url (package);
+ if (url != NULL) {
+ g_string_append_printf (string, "%s;Package website;", url);
+ }
#ifdef PACMAN_PACKAGE_URL
/* ... and construct the distro URL if possible */
@@ -83,10 +87,11 @@ pacman_package_make_vendor_url (PacmanPackage *package)
arch = pacman_package_get_arch (package);
repo = pacman_database_get_name (pacman_package_get_database (package));
- return g_strdup_printf ("%s;Package website;" PACMAN_PACKAGE_URL ";Distribution website", url, repo, arch, name);
-#else
- return g_strdup_printf ("%s;Package website", url);
+ g_string_append_printf (string, PACMAN_PACKAGE_URL ";Distribution website;", repo, arch, name);
#endif
+
+ g_string_truncate (string, string->len - 1);
+ return g_string_free (string, FALSE);
}
static gint
commit 90e45f88c1a1692950b90a471960af4598caa826
Author: Carlo Marcelo Arenas Belon <carenas at sajinet.com.pe>
Date: Sun Jul 18 15:05:46 2010 -0700
web: update 0install logo
there is no official logo but the closest to one is using instead the
one that is already published in freshmeant
diff --git a/docs/html/img/users-0install.png b/docs/html/img/users-0install.png
index f842f8f..ea6b0f5 100644
Binary files a/docs/html/img/users-0install.png and b/docs/html/img/users-0install.png differ
commit 041669640da6e6e37490f0162ff766082b090d7e
Author: Carlo Marcelo Arenas Belon <carenas at sajinet.com.pe>
Date: Sun Jul 18 14:45:44 2010 -0700
web: trivial upgrade of copyright date
diff --git a/docs/html/index.html b/docs/html/index.html
index b64dd72..7b32cc5 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -44,7 +44,7 @@
</table>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-authors.html b/docs/html/pk-authors.html
index c5fb82a..2b1ab7b 100644
--- a/docs/html/pk-authors.html
+++ b/docs/html/pk-authors.html
@@ -351,7 +351,7 @@
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-bugs.html b/docs/html/pk-bugs.html
index 014bd81..a0a1dac 100644
--- a/docs/html/pk-bugs.html
+++ b/docs/html/pk-bugs.html
@@ -113,7 +113,7 @@ give you more information.
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-download.html b/docs/html/pk-download.html
index be146bc..4e5adba 100644
--- a/docs/html/pk-download.html
+++ b/docs/html/pk-download.html
@@ -230,7 +230,7 @@ as easy as possible.
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-faq.html b/docs/html/pk-faq.html
index 8d42a3c..73904e7 100644
--- a/docs/html/pk-faq.html
+++ b/docs/html/pk-faq.html
@@ -642,7 +642,7 @@ I now work at Red Hat full time.
<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-help.html b/docs/html/pk-help.html
index b6cdaeb..a492c22 100644
--- a/docs/html/pk-help.html
+++ b/docs/html/pk-help.html
@@ -64,7 +64,7 @@ existing backends as a template for what you are trying to do.
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-intro.html b/docs/html/pk-intro.html
index 4ea7bf4..1a405eb 100644
--- a/docs/html/pk-intro.html
+++ b/docs/html/pk-intro.html
@@ -135,7 +135,7 @@ cross-architecture API.
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-matrix.html b/docs/html/pk-matrix.html
index ec8d93b..8efe49f 100644
--- a/docs/html/pk-matrix.html
+++ b/docs/html/pk-matrix.html
@@ -826,7 +826,7 @@
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-profiles.html b/docs/html/pk-profiles.html
index c80a6c4..239dd99 100644
--- a/docs/html/pk-profiles.html
+++ b/docs/html/pk-profiles.html
@@ -118,7 +118,7 @@ He says that when files are downloading, "the Internet gets slower".
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-reference.html b/docs/html/pk-reference.html
index f5266ec..bcea515 100644
--- a/docs/html/pk-reference.html
+++ b/docs/html/pk-reference.html
@@ -27,7 +27,7 @@ here</a>. Please update your links!
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-screenshots.html b/docs/html/pk-screenshots.html
index c1286e8..4e140e7 100644
--- a/docs/html/pk-screenshots.html
+++ b/docs/html/pk-screenshots.html
@@ -245,7 +245,7 @@
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-users.html b/docs/html/pk-users.html
index 8a7f21f..fe6cd13 100644
--- a/docs/html/pk-users.html
+++ b/docs/html/pk-users.html
@@ -304,7 +304,7 @@
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
diff --git a/docs/html/pk-using.html b/docs/html/pk-using.html
index c3ef178..f75e43b 100644
--- a/docs/html/pk-using.html
+++ b/docs/html/pk-using.html
@@ -92,7 +92,7 @@ The latest interface is available in the source tree or <a href="http://gitweb.f
<p>Back to the <a href="index.html">main page</a></p>
<p class="footer">
- Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2009</a><br/>
+ Copyright <a href="mailto:richard at hughsie.com">Richard Hughes 2007-2010</a><br/>
<a href="http://validator.w3.org/check/referer">Optimized</a>
for <a href="http://www.w3.org/">standards</a>.
</p>
commit c0e98c1855b1219286c7a26b2622993c8b62ebeb
Author: makoto <makoto at fedoraproject.org>
Date: Thu Jul 15 13:18:22 2010 +0000
l10n: Updates to Japanese (ja) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/ja.po b/po/ja.po
index e99bb9d..bd06bd5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,17 +5,18 @@
#
# Hyu_gabaru Ryu_ichi <hyu_gabaru at yahoo.co.jp>, 2009.
# Kiyoto Hashida <khashida at redhat.com>, 2009, 2010.
+# Makoto Mizukami <makoto at fedoraporject.org>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 22:36+0000\n"
-"PO-Revision-Date: 2010-06-03 11:32+0900\n"
-"Last-Translator: Kiyoto Hashida <khashida at redhat.com>\n"
-"Language-Team: Japanese <jp at li.org>\n"
+"POT-Creation-Date: 2010-07-15 07:40+0000\n"
+"PO-Revision-Date: 2010-07-15 22:17+0900\n"
+"Last-Translator: Makoto Mizukami <makoto at fedoraporject.org>\n"
+"Language-Team: Japanese <trans-ja at lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
"X-Generator: KBabel 1.11.4\n"
@@ -282,8 +283,8 @@ msgstr "é‡å¤§ãªã‚¨ãƒ©ãƒ¼"
#. TRANSLATORS: the transaction failed in a way we could not expect
#: ../client/pk-console.c:696
-#: ../contrib/command-not-found/pk-command-not-found.c:433
-#: ../contrib/command-not-found/pk-command-not-found.c:606
+#: ../contrib/command-not-found/pk-command-not-found.c:454
+#: ../contrib/command-not-found/pk-command-not-found.c:634
msgid "The transaction failed"
msgstr "トランザクションãŒå¤±æ•—"
@@ -331,8 +332,8 @@ msgid ""
"Expected package name, actually got file. Try using 'pkcon install-local %s' "
"instead."
msgstr ""
-"予期ã•ã‚Œã‚‹ãƒ‘ッケージåã¯å®Ÿéš›ã«ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒã¡ã¾ã™ã€‚代ã‚ã‚Šã« 'pkcon install-local %s' ã‚’ "
-"試ã—ã¦ä¸‹ã•ã„。"
+"予期ã•ã‚Œã‚‹ãƒ‘ッケージåã¯å®Ÿéš›ã«ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒã¡ã¾ã™ã€‚代ã‚ã‚Šã« 'pkcon install-"
+"local %s' ã‚’ 試ã—ã¦ä¸‹ã•ã„。"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:860
@@ -381,10 +382,11 @@ msgstr "サブコマンド:"
#. TRANSLATORS: we keep a database updated with the time that an action was last executed
#: ../client/pk-console.c:1228
msgid "Failed to get the time since this action was last completed"
-msgstr "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯ç›´å‰ã«å®Œäº†ã—ãŸã‚‚ã®ã ã£ãŸã®ã§ã€æ™‚刻を得るã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
+msgstr ""
+"ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯ç›´å‰ã«å®Œäº†ã—ãŸã‚‚ã®ã ã£ãŸã®ã§ã€æ™‚刻を得るã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
#. TRANSLATORS: command line argument, just show the version string
-#: ../client/pk-console.c:1268 ../client/pk-monitor.c:356
+#: ../client/pk-console.c:1268 ../client/pk-monitor.c:373
msgid "Show the program version and exit"
msgstr "プãƒã‚°ãƒ©ãƒ ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¦çµ‚了"
@@ -416,7 +418,8 @@ msgstr "éŠä¼‘ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒãƒ³ãƒ‰å¹…ã¨ã‚ˆã‚Šå°‘ãªã„電力を使用
#. TRANSLATORS: command line argument, just output without fancy formatting
#: ../client/pk-console.c:1286
-msgid "Print to screen a machine readable output, rather than using animated widgets"
+msgid ""
+"Print to screen a machine readable output, rather than using animated widgets"
msgstr "å‹•ç”»ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ä½¿ç”¨ã§ã¯ãªãã€ãƒžã‚·ãƒ³å¯èªã®å‡ºåŠ›ã‚’ç”»é¢ã«è¡¨ç¤º"
#. TRANSLATORS: we failed to contact the daemon
@@ -656,156 +659,161 @@ msgstr "'%s' ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
msgid "Failed to get daemon state"
msgstr "デーモンã®çŠ¶æ…‹ã‚’å¾—ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
+#: ../client/pk-monitor.c:351
+msgid "Failed to get properties"
+msgstr "プãƒãƒ‘ティã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
+
#. TRANSLATORS: this is a program that monitors PackageKit
-#: ../client/pk-monitor.c:372
+#: ../client/pk-monitor.c:389
msgid "PackageKit Monitor"
msgstr "PackageKit モニター"
#. TRANSLATORS: when we are getting data from the daemon
-#: ../contrib/browser-plugin/pk-plugin-install.c:494
+#: ../contrib/browser-plugin/pk-plugin-install.c:497
msgid "Getting package information..."
msgstr "パッケージã®æƒ…å ±ã‚’ç²å¾—ä¸..."
#. TRANSLATORS: run an applicaiton
-#: ../contrib/browser-plugin/pk-plugin-install.c:500
+#: ../contrib/browser-plugin/pk-plugin-install.c:503
#, c-format
msgid "Run %s"
msgstr "%s 実行"
#. TRANSLATORS: show the installed version of a package
-#: ../contrib/browser-plugin/pk-plugin-install.c:506
+#: ../contrib/browser-plugin/pk-plugin-install.c:509
msgid "Installed version"
msgstr "インストールã•ã‚ŒãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³"
#. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/pk-plugin-install.c:514
+#: ../contrib/browser-plugin/pk-plugin-install.c:517
#, c-format
msgid "Run version %s now"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã‚’ã™ãã«å®Ÿè¡Œ"
#. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/pk-plugin-install.c:520
+#: ../contrib/browser-plugin/pk-plugin-install.c:523
msgid "Run now"
msgstr "ã™ãã«å®Ÿè¡Œ"
#. TRANSLATORS: update to a new version of the package
-#: ../contrib/browser-plugin/pk-plugin-install.c:526
+#: ../contrib/browser-plugin/pk-plugin-install.c:529
#, c-format
msgid "Update to version %s"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°"
#. TRANSLATORS: To install a package
-#: ../contrib/browser-plugin/pk-plugin-install.c:532
+#: ../contrib/browser-plugin/pk-plugin-install.c:535
#, c-format
msgid "Install %s now"
msgstr "%s ã‚’ã™ãã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
#. TRANSLATORS: the version of the package
-#: ../contrib/browser-plugin/pk-plugin-install.c:535
+#: ../contrib/browser-plugin/pk-plugin-install.c:538
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
#. TRANSLATORS: noting found, so can't install
-#: ../contrib/browser-plugin/pk-plugin-install.c:540
+#: ../contrib/browser-plugin/pk-plugin-install.c:543
msgid "No packages found for your system"
msgstr "ユーザーã®ã‚·ã‚¹ãƒ†ãƒ 用ã®ãƒ‘ッケージãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#. TRANSLATORS: package is being installed
-#: ../contrib/browser-plugin/pk-plugin-install.c:545
+#: ../contrib/browser-plugin/pk-plugin-install.c:548
msgid "Installing..."
msgstr "インストールä¸..."
#. TRANSLATORS: downloading repo data so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:366
+#: ../contrib/command-not-found/pk-command-not-found.c:367
msgid "Downloading details about the software sources."
msgstr "ソフトウェアソースã«ã¤ã„ã¦ã®è©³ç´°ã‚’ダウンãƒãƒ¼ãƒ‰ä¸ã€‚"
#. TRANSLATORS: downloading file lists so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:370
+#: ../contrib/command-not-found/pk-command-not-found.c:371
msgid "Downloading filelists (this may take some time to complete)."
msgstr "ファイル一覧をダウンãƒãƒ¼ãƒ‰ä¸ (完了ã¾ã§æ™‚é–“ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“)。"
#. TRANSLATORS: waiting for native lock
-#: ../contrib/command-not-found/pk-command-not-found.c:374
+#: ../contrib/command-not-found/pk-command-not-found.c:375
msgid "Waiting for package manager lock."
msgstr "パッケージマãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®ãƒãƒƒã‚¯ã‚’å¾…ã£ã¦ã„ã¾ã™ã€‚"
#. TRANSLATORS: loading package cache so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:378
+#: ../contrib/command-not-found/pk-command-not-found.c:379
msgid "Loading list of packages."
msgstr "パッケージã®ä¸€è¦§ã‚’ãƒãƒ¼ãƒ‰ä¸ã€‚"
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../contrib/command-not-found/pk-command-not-found.c:424
+#: ../contrib/command-not-found/pk-command-not-found.c:445
msgid "Failed to search for file"
msgstr "ファイルã®æŽ¢ç´¢ã«å¤±æ•—ã—ã¾ã—ãŸ"
#. TRANSLATORS: we failed to launch the executable, the error follows
-#: ../contrib/command-not-found/pk-command-not-found.c:569
+#: ../contrib/command-not-found/pk-command-not-found.c:597
msgid "Failed to launch:"
msgstr "èµ·å‹•ã«å¤±æ•—:"
#. TRANSLATORS: we failed to install the package
-#: ../contrib/command-not-found/pk-command-not-found.c:597
+#: ../contrib/command-not-found/pk-command-not-found.c:625
msgid "Failed to install packages"
msgstr "パッケージをインストールã§ãã¾ã›ã‚“"
#. TRANSLATORS: tool that gets called when the command is not found
-#: ../contrib/command-not-found/pk-command-not-found.c:673
+#: ../contrib/command-not-found/pk-command-not-found.c:701
msgid "PackageKit Command Not Found"
msgstr "PackageKit コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#. TRANSLATORS: the prefix of all the output telling the user why it's not executing
-#: ../contrib/command-not-found/pk-command-not-found.c:699
+#: ../contrib/command-not-found/pk-command-not-found.c:727
msgid "Command not found."
msgstr "コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#. TRANSLATORS: tell the user what we think the command is
-#: ../contrib/command-not-found/pk-command-not-found.c:717
+#: ../contrib/command-not-found/pk-command-not-found.c:745
msgid "Similar command is:"
msgstr "よãä¼¼ãŸã‚³ãƒžãƒ³ãƒ‰ã¯:"
#. TRANSLATORS: Ask the user if we should run the similar command
-#: ../contrib/command-not-found/pk-command-not-found.c:727
+#: ../contrib/command-not-found/pk-command-not-found.c:755
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:741
-#: ../contrib/command-not-found/pk-command-not-found.c:750
+#: ../contrib/command-not-found/pk-command-not-found.c:769
+#: ../contrib/command-not-found/pk-command-not-found.c:778
msgid "Similar commands are:"
msgstr "よãä¼¼ãŸã‚³ãƒžãƒ³ãƒ‰ã¯:"
#. TRANSLATORS: ask the user to choose a file to run
-#: ../contrib/command-not-found/pk-command-not-found.c:757
+#: ../contrib/command-not-found/pk-command-not-found.c:785
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:775
+#: ../contrib/command-not-found/pk-command-not-found.c:803
msgid "The package providing this file is:"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æä¾›ã—ã¦ã„るパッケージã¯:"
#. TRANSLATORS: as the user if we want to install a package to provide the command
-#: ../contrib/command-not-found/pk-command-not-found.c:780
+#: ../contrib/command-not-found/pk-command-not-found.c:808
#, c-format
msgid "Install package '%s' to provide command '%s'?"
-msgstr "コマンド %2$s' ã‚’æä¾›ã™ã‚‹ãŸã‚ã«ãƒ‘ッケージ '%1$s' をインストールã—ã¾ã™ã‹?"
+msgstr ""
+"コマンド %2$s' ã‚’æä¾›ã™ã‚‹ãŸã‚ã«ãƒ‘ッケージ '%1$s' をインストールã—ã¾ã™ã‹?"
#. TRANSLATORS: Show the user a list of packages that provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:804
+#: ../contrib/command-not-found/pk-command-not-found.c:832
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:814
+#: ../contrib/command-not-found/pk-command-not-found.c:842
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:823
+#: ../contrib/command-not-found/pk-command-not-found.c:851
msgid "Please choose a package to install"
msgstr "インストールã™ã‚‹ãƒ‘ッケージをé¸ã‚“ã§ãã ã•ã„"
@@ -818,11 +826,13 @@ msgstr "インストールを開始ã—ã¾ã™"
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:409
#, c-format
msgid "Failed to find the package %s, or already installed: %s"
-msgstr "パッケージ %s ã®æŽ¢ç´¢ã«å¤±æ•—ã—ã¾ã—ãŸã€ã¾ãŸã¯æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™: %s"
+msgstr ""
+"パッケージ %s ã®æŽ¢ç´¢ã«å¤±æ•—ã—ã¾ã—ãŸã€ã¾ãŸã¯æ—¢ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™: %s"
#. command line argument, simulate what would be done, but don't actually do it
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:518
-msgid "Don't actually install any packages, only simulate what would be installed"
+msgid ""
+"Don't actually install any packages, only simulate what would be installed"
msgstr ""
"ã©ã®ãƒ‘ッケージも実際ã«ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã›ãšã€ä½•ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚‹ã‹ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼"
"トã ã‘ã—ã¾ã™"
@@ -1722,7 +1732,8 @@ msgid "Authentication is required to accept a EULA"
msgstr "EULA を承èªã™ã‚‹ã«ã¯èªè¨¼ãŒå¿…è¦ã§ã™"
#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to cancel a task that was not started by yourself"
+msgid ""
+"Authentication is required to cancel a task that was not started by yourself"
msgstr "ユーザー自身ãŒé–‹å§‹ã—ã¦ã„ãªã„タスクをã‚ャンセルã™ã‚‹ã«ã¯èªè¨¼ãŒå¿…è¦ã§ã™"
#: ../policy/org.freedesktop.packagekit.policy.in.h:10
@@ -1730,7 +1741,8 @@ msgid "Authentication is required to change software source parameters"
msgstr "ソフトウェアã®ã‚½ãƒ¼ã‚¹ãƒ‘ラメータを変更ã™ã‚‹ã«ã¯èªè¨¼ãŒå¿…è¦ã§ã™"
#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to change the location used to decompress packages"
+msgid ""
+"Authentication is required to change the location used to decompress packages"
msgstr "パッケージã®å±•é–‹ã«ä½¿ç”¨ã•ã‚Œã‚‹å ´æ‰€ã‚’変更ã™ã‚‹ã«ã¯ èªè¨¼ãŒå¿…è¦ã§ã™"
#: ../policy/org.freedesktop.packagekit.policy.in.h:12
@@ -1918,47 +1930,47 @@ msgstr ""
"ã•ã‚Œã¦ã„ãªã„:"
#. TRANSLATORS: a backend is the system package tool, e.g. yum, apt
-#: ../src/pk-main.c:199
+#: ../src/pk-main.c:200
msgid "Packaging backend to use, e.g. dummy"
msgstr "使用ã™ã‚‹ãƒ‘ッケージãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã€ä¾‹ã€ãƒ€ãƒŸãƒ¼"
#. TRANSLATORS: if we should run in the background
-#: ../src/pk-main.c:202
+#: ../src/pk-main.c:203
msgid "Daemonize and detach from the terminal"
msgstr "ターミナルã‹ã‚‰ãƒ‡ãƒ¼ãƒ¢ãƒ³åŒ–ã—ã¦éš”離"
#. TRANSLATORS: if we should not monitor how long we are inactive for
-#: ../src/pk-main.c:205
+#: ../src/pk-main.c:206
msgid "Disable the idle timer"
msgstr "éŠä¼‘タイマーを無効ã«ã™ã‚‹"
#. TRANSLATORS: show version
-#: ../src/pk-main.c:208
+#: ../src/pk-main.c:209
msgid "Show version and exit"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¦çµ‚了"
#. TRANSLATORS: exit after we've started up, used for user profiling
-#: ../src/pk-main.c:211
+#: ../src/pk-main.c:212
msgid "Exit after a small delay"
msgstr "å°‘ã—é…ã‚Œã¦çµ‚了"
#. TRANSLATORS: exit straight away, used for automatic profiling
-#: ../src/pk-main.c:214
+#: ../src/pk-main.c:215
msgid "Exit after the engine has loaded"
msgstr "エンジンãŒãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã‹ã‚‰çµ‚了"
#. TRANSLATORS: describing the service that is running
-#: ../src/pk-main.c:229
+#: ../src/pk-main.c:230
msgid "PackageKit service"
msgstr "PackageKit サービス"
#. TRANSLATORS: fatal error, dbus is not running
-#: ../src/pk-main.c:266
+#: ../src/pk-main.c:267
msgid "Cannot connect to the system bus"
msgstr "システムãƒã‚¹ã«æŽ¥ç¶šã§ãã¾ã›ã‚“"
#. TRANSLATORS: cannot register on system bus, unknown reason -- geeky error follows
-#: ../src/pk-main.c:317
+#: ../src/pk-main.c:318
msgid "Error trying to start:"
msgstr "スタートã®è©¦è¡Œã§ã‚¨ãƒ©ãƒ¼:"
@@ -1975,7 +1987,8 @@ msgstr "ソフトウェアã¯ä¿¡é ¼ã§ãるソースã®ã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›
#: ../src/pk-polkit-action-lookup.c:176
msgid "Do not update this package unless you are sure it is safe to do so."
-msgstr "実行ãŒå®‰å…¨ãªã“ã¨ã‚’確信ã§ããªã„é™ã‚Šã¯ã“ã®ãƒ‘ッケージを更新ã—ãªã„ã§ä¸‹ã•ã„。"
+msgstr ""
+"実行ãŒå®‰å…¨ãªã“ã¨ã‚’確信ã§ããªã„é™ã‚Šã¯ã“ã®ãƒ‘ッケージを更新ã—ãªã„ã§ä¸‹ã•ã„。"
#: ../src/pk-polkit-action-lookup.c:177
msgid "Do not update these packages unless you are sure it is safe to do so."
@@ -2032,4 +2045,3 @@ msgstr "デãƒãƒƒã‚®ãƒ³ã‚°ã‚ªãƒ—ション"
#: ../src/egg-debug.c:468
msgid "Show debugging options"
msgstr "デãƒãƒƒã‚°ã‚ªãƒ—ションを表示"
-
commit c1f23831fcb1d41310fad8f961b6f4fd7f0682c6
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 13 10:58:16 2010 +0100
yum: ensure we call _check_init when we do GetCategories
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 90c4062..5d862ef 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -850,6 +850,13 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
'''
Implement the get-categories functionality
'''
+ try:
+ self._check_init(lazy_cache=True)
+ except PkError, e:
+ self.error(e.code, e.details, exit=False)
+ return
+ self.yumbase.conf.cache = 0 # Allow new files
+ self.percentage(None)
self.status(STATUS_QUERY)
self.allow_cancel(True)
cats = []
commit f38e3a17c273cbd48f9ccd9f8639fc7ce151bca6
Author: warrink <warrink at fedoraproject.org>
Date: Tue Jul 13 11:53:14 2010 +0000
l10n: Updates to Dutch (Flemish) (nl) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/nl.po b/po/nl.po
index d6c1fd6..369ec7d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: packagekit.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-07 06:51+0000\n"
-"PO-Revision-Date: 2010-07-07 14:22+0200\n"
+"POT-Creation-Date: 2010-07-13 05:29+0000\n"
+"PO-Revision-Date: 2010-07-13 13:52+0200\n"
"Last-Translator: Geert Warrink <geert.warrink at onsnet.nu>\n"
"Language-Team: Fedora\n"
"Language: nl\n"
@@ -81,7 +81,7 @@ msgstr "Werkelijke naam"
#: ../client/pk-console.c:212
msgid "Affected packages:"
-msgstr "Betrokken pakketten"
+msgstr "Betrokken pakketten:"
#: ../client/pk-console.c:214
msgid "Affected packages: None"
@@ -131,7 +131,7 @@ msgstr "Icoon"
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:341
msgid "Details about the update:"
-msgstr "Details van de vernieuwing:"
+msgstr "Details over de vernieuwing:"
#. TRANSLATORS: details about the update, package name and version
#. TRANSLATORS: the package that is being processed
@@ -222,7 +222,7 @@ msgstr "Herstart systeem vereist door:"
#. TRANSLATORS: a package requires the session to be restarted
#: ../client/pk-console.c:464
msgid "Session restart required:"
-msgstr "Het is vereist de sessie te herstarten:"
+msgstr "Herstart sessie vereist door:"
#. TRANSLATORS: a package requires the system to be restarted due to a security update
#: ../client/pk-console.c:467
@@ -242,7 +242,7 @@ msgstr "Herstart vereist door toepassing:"
#. TRANSLATORS: This a list of details about the package
#: ../client/pk-console.c:508
msgid "Package description"
-msgstr "Pakket omschrijving"
+msgstr "Pakket beschrijving"
#. TRANSLATORS: This a message (like a little note that may be of interest) from the transaction
#: ../client/pk-console.c:539
@@ -298,12 +298,12 @@ msgstr "Er zijn op dit moment geen upgrades beschikbaar."
#. TRANSLATORS: a package needs to restart their system
#: ../client/pk-console.c:817
msgid "Please restart the computer to complete the update."
-msgstr "Herstart a.u.b de computer om de vernieuwing af te maken."
+msgstr "Herstart de computer om de vernieuwing af te maken."
#. TRANSLATORS: a package needs to restart the session
#: ../client/pk-console.c:820
msgid "Please logout and login to complete the update."
-msgstr "Log a.u.b uit en weer in om de vernieuwing af te maken."
+msgstr "Log uit en weer in om de vernieuwing af te maken."
#. TRANSLATORS: a package needs to restart their system (due to security)
#: ../client/pk-console.c:823
@@ -311,7 +311,7 @@ msgid ""
"Please restart the computer to complete the update as important security "
"updates have been installed."
msgstr ""
-"Herstart a.u.b de computer om de vernieuwing af te maken omdat belangrijke "
+"Herstart de computer om de vernieuwing af te maken omdat belangrijke "
"beveiliging vernieuwingen geïnstalleerd zijn."
#. TRANSLATORS: a package needs to restart the session (due to security)
@@ -320,7 +320,7 @@ msgid ""
"Please logout and login to complete the update as important security updates "
"have been installed."
msgstr ""
-"Log a.u.b. uit en weer in om de vernieuwing af te maken omdat belangrijke "
+"Log uit en weer in om de vernieuwing af te maken omdat belangrijke "
"beveiliging vernieuwingen geïnstalleerd zijn."
#. TRANSLATORS: The user used 'pkcon install dave.rpm' rather than 'pkcon install-local dave.rpm'
@@ -330,7 +330,7 @@ msgid ""
"Expected package name, actually got file. Try using 'pkcon install-local %s' "
"instead."
msgstr ""
-"Verwachtte pakketnaam, maar kreeg een bestand. Probeer in plaats daarvan "
+"Verwachtte pakket naam, maar kreeg een bestand. Probeer in plaats daarvan "
"'pkcon install-local %s' te gebruiken."
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
@@ -401,7 +401,7 @@ msgstr "Stel de installeer root in, b.v. '/' of '/mnt/ltsp'"
#. TRANSLATORS: command line argument, work asynchronously
#: ../client/pk-console.c:1277
msgid "Exit without waiting for actions to complete"
-msgstr "Afsluiten zonder te wachten tot de transacties zijn afgerond"
+msgstr "Afsluiten zonder te wachten tot transacties zijn afgerond"
#. command line argument, do we ask questions
#: ../client/pk-console.c:1280
@@ -531,7 +531,7 @@ msgstr "Een correcte rol is vereist"
#: ../client/pk-console.c:1651 ../client/pk-console.c:1671
#: ../client/pk-console.c:1680 ../client/pk-generate-pack.c:316
msgid "A package name is required"
-msgstr "Een pakke tnaam is vereist"
+msgstr "Een pakket naam is vereist"
#. TRANSLATORS: each package "provides" certain things, e.g. mime(gstreamer-decoder-mp3), the user didn't specify it
#: ../client/pk-console.c:1660
@@ -552,7 +552,8 @@ msgstr "Opdracht mislukt"
#. TRANSLATORS: we can exclude certain packages (glibc) when we know they'll exist on the target
#: ../client/pk-generate-pack.c:255
msgid "Set the file name of dependencies to be excluded"
-msgstr "Zet de bestandsnamen van afhankelijkheden die moeten worden uitgesloten"
+msgstr ""
+"Stel de bestandsnamen van afhankelijkheden in die moeten worden uitgesloten"
#. TRANSLATORS: the output location
#: ../client/pk-generate-pack.c:258
@@ -610,7 +611,7 @@ msgstr ""
#: ../client/pk-generate-pack.c:377
msgid "If specifying a file, the service pack name must end with"
msgstr ""
-"Bij het specificeren van een bestand moet de service pac knaam eindigen op"
+"Bij het specificeren van een bestand moet de service pack naam eindigen op"
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:393
@@ -666,7 +667,7 @@ msgstr "Daemon status verkrijgen mislukte."
#: ../client/pk-monitor.c:351
msgid "Failed to get properties"
-msgstr "Eigenschappen ophalen niet gelukt"
+msgstr "Eigenschappen ophalen mislukte"
#. TRANSLATORS: this is a program that monitors PackageKit
#: ../client/pk-monitor.c:389
@@ -750,12 +751,12 @@ msgstr "Lijst van pakketten laden."
#. TRANSLATORS: we failed to find the package, this shouldn't happen
#: ../contrib/command-not-found/pk-command-not-found.c:445
msgid "Failed to search for file"
-msgstr "Zoeken naar bestand niet gelukt"
+msgstr "Zoeken naar bestand mislukte"
#. TRANSLATORS: we failed to launch the executable, the error follows
#: ../contrib/command-not-found/pk-command-not-found.c:597
msgid "Failed to launch:"
-msgstr "Opstarten mislukt:"
+msgstr "Opstarten mislukte:"
#. TRANSLATORS: we failed to install the package
#: ../contrib/command-not-found/pk-command-not-found.c:625
@@ -792,7 +793,7 @@ msgstr "Vergelijkbare commando's zijn:"
#. TRANSLATORS: ask the user to choose a file to run
#: ../contrib/command-not-found/pk-command-not-found.c:785
msgid "Please choose a command to run"
-msgstr "Kies a.u.b. een commando om te draaien"
+msgstr "Kies een commando om te draaien"
#. TRANSLATORS: tell the user what package provides the command
#: ../contrib/command-not-found/pk-command-not-found.c:803
@@ -819,18 +820,18 @@ msgstr "Geschikte pakketten zijn:"
#. TRANSLATORS: ask the user to choose a file to install
#: ../contrib/command-not-found/pk-command-not-found.c:851
msgid "Please choose a package to install"
-msgstr "Kies a.u.b. een pakket om te installeren"
+msgstr "Kies een pakket om te installeren"
#. TRANSLATORS: we are starting to install the packages
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:197
msgid "Starting install"
-msgstr "Installeren starten"
+msgstr "Starten met installeren"
#. TRANSLATORS: we couldn't find the package name, non-fatal
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:409
#, c-format
msgid "Failed to find the package %s, or already installed: %s"
-msgstr "Pakket %s vinden is mislukt, of is reeds geïnstalleerd: %s"
+msgstr "Pakket %s vinden misluktu, of is reeds geïnstalleerd: %s"
#. command line argument, simulate what would be done, but don't actually do it
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:518
@@ -997,7 +998,7 @@ msgstr "Pakketten installeren"
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:875
#, c-format
msgid "Could not install packages: %s"
-msgstr "Kon pakketten %s niet installeren."
+msgstr "Kon pakketten %s niet installeren."
#. TRANSLATORS: we are now disabling all debuginfo repos we previously enabled
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:907
@@ -1020,18 +1021,18 @@ msgstr "%i debug bronnen uitgezet."
#. TRANSLATORS: couldn't open device to write
#: ../contrib/device-rebind/pk-device-rebind.c:62
msgid "Failed to open file"
-msgstr "Bestand openen niet gelukt"
+msgstr "Bestand openen mislukte"
#. TRANSLATORS: could not write to the device
#: ../contrib/device-rebind/pk-device-rebind.c:71
msgid "Failed to write to the file"
-msgstr "Naar bestand schrijven niet gelukt"
+msgstr "Naar bestand schrijven mislukte"
#. TRANSLATORS: we failed to release the current driver
#: ../contrib/device-rebind/pk-device-rebind.c:111
#: ../contrib/device-rebind/pk-device-rebind.c:148
msgid "Failed to write to device"
-msgstr "Naar schijf schrijven niet gelukt"
+msgstr "Naar schijf schrijven mislukte"
#. TRANSLATORS: the device could not be found in sysfs
#: ../contrib/device-rebind/pk-device-rebind.c:176
@@ -1134,7 +1135,7 @@ msgstr "Er zijn meerdere pakketten die matchen:"
#. TRANSLATORS: This finds out which package in the list to use
#: ../lib/packagekit-glib2/pk-console-shared.c:202
msgid "Please choose the correct package: "
-msgstr "Kies a.u.b. het juiste pakket: "
+msgstr "Kies het juiste pakket: "
#. TRANSLATORS: This is when the transaction status is not known
#: ../lib/packagekit-glib2/pk-console-shared.c:257
@@ -1154,7 +1155,7 @@ msgstr "Wachten in wachtrij"
#. TRANSLATORS: transaction state, just started
#: ../lib/packagekit-glib2/pk-console-shared.c:269
msgid "Running"
-msgstr "Draaiende"
+msgstr "Draaiend"
#. TRANSLATORS: transaction state, is querying data
#: ../lib/packagekit-glib2/pk-console-shared.c:273
@@ -1625,7 +1626,7 @@ msgstr "Sleutel vingerafdruk"
#. TRANSLATORS: the timestamp (a bit like a machine readable time)
#: ../lib/packagekit-glib2/pk-task-text.c:144
msgid "Key Timestamp"
-msgstr "Sleutel tijdtempel"
+msgstr "Sleutel tijdstempel"
#. TRANSLATORS: ask the user if they want to import
#: ../lib/packagekit-glib2/pk-task-text.c:157
@@ -1680,7 +1681,7 @@ msgstr "Tekst"
#. TRANSLATORS: ask the user to insert the media
#: ../lib/packagekit-glib2/pk-task-text.c:282
msgid "Please insert the correct media"
-msgstr "Breng a.u.b de juiste media in"
+msgstr "Breng de juiste media in"
#. TRANSLATORS: tell the user we've not done anything as they are lazy
#: ../lib/packagekit-glib2/pk-task-text.c:287
@@ -1746,7 +1747,7 @@ msgstr ""
#: ../policy/org.freedesktop.packagekit.policy.in.h:10
msgid "Authentication is required to change software source parameters"
msgstr ""
-"Authenticatie wordt vereist om de parameters van de software bronnen te "
+"Authenticatie wordt vereist om parameters van de software bronnen te "
"wijzigen"
#: ../policy/org.freedesktop.packagekit.policy.in.h:11
@@ -1762,7 +1763,7 @@ msgid ""
"trusted"
msgstr ""
"Authenticatie wordt vereist om een sleutel te overwegen die gebruikt wordt "
-"om een pakket als vertrouwt te ondertekenen "
+"om een pakket als vertrouwd te ondertekenen "
#: ../policy/org.freedesktop.packagekit.policy.in.h:13
msgid "Authentication is required to install a signed package"
@@ -1795,8 +1796,8 @@ msgid ""
"Authentication is required to set the network proxy used for downloading "
"packages"
msgstr ""
-"Authenticatie wordt vereist om de netwerk proxy die gebruikt wordt om "
-"pakketten te installeren in te stellen "
+"Authenticatie wordt vereist voor het instellen van de netwerk proxy die "
+"gebruikt wordt om pakketten te installeren"
#: ../policy/org.freedesktop.packagekit.policy.in.h:20
msgid "Authentication is required to update packages"
@@ -2052,7 +2053,7 @@ msgstr "Debug deze specifieke functies"
#. TRANSLATORS: save to a log
#: ../src/egg-debug.c:464
msgid "Log debugging data to a file"
-msgstr "Log debug data naar een file"
+msgstr "Log debug data naar een bestand"
#: ../src/egg-debug.c:468
msgid "Debugging Options"
@@ -2060,7 +2061,7 @@ msgstr "Debug opties"
#: ../src/egg-debug.c:468
msgid "Show debugging options"
-msgstr "Toon debug opties"
+msgstr "Laat debug opties zien"
#~ msgid "Malicious software can damage your computer or cause other harm."
#~ msgstr ""
commit 95a93421a3eae2f2defdb6a2baa3e98ce3b9020a
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date: Mon Jul 12 14:57:54 2010 +0200
opkg: fix status type in get_updates
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index be30ad1..6318457 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -638,7 +638,7 @@ backend_get_updates_thread (PkBackend *backend)
static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
- pk_backend_set_status (backend, PK_STATUS_ENUM_UPDATE);
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
pk_backend_set_percentage (backend, PK_BACKEND_PERCENTAGE_INVALID);
pk_backend_thread_create (backend, backend_get_updates_thread);
commit 83626eb50585400079bc181a9f5b822523435f9e
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 12 09:39:24 2010 +0100
Unbreak CNF after the daemon moved to libexec. Fixes rh#613514
diff --git a/contrib/command-not-found/PackageKit.sh.in b/contrib/command-not-found/PackageKit.sh.in
index de34fe7..8d8eb38 100644
--- a/contrib/command-not-found/PackageKit.sh.in
+++ b/contrib/command-not-found/PackageKit.sh.in
@@ -14,7 +14,7 @@ command_not_found_handle () {
[ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
# don't run if packagekitd doesn't exist in the _system_ root
- [ ! -x /usr/sbin/packagekitd ] && runcnf=0
+ [ ! -x /usr/libexec/packagekitd ] && runcnf=0
# run the command, or just print a warning
if [ $runcnf -eq 1 ]; then
commit 45d9c73e1bcbe18a731fd93c77637503478a7cf7
Author: Carlo Marcelo Arenas Belon <carenas at sajinet.com.pe>
Date: Mon Jul 12 00:41:39 2010 -0700
web: add 0install to the user list
diff --git a/docs/html/img/users-0install.png b/docs/html/img/users-0install.png
new file mode 100644
index 0000000..f842f8f
Binary files /dev/null and b/docs/html/img/users-0install.png differ
diff --git a/docs/html/pk-users.html b/docs/html/pk-users.html
index fe3c94a..8a7f21f 100644
--- a/docs/html/pk-users.html
+++ b/docs/html/pk-users.html
@@ -264,6 +264,20 @@
</p>
</td>
</tr>
+<tr>
+ <td>
+ <a href="http://www.0install.net/"><img src="img/users-0install.png" alt=""/></a>
+ </td>
+ <td>
+ <h2>Zero Install</h2>
+ <p>
+ Zero Install is a distributed, cross-distribution installation system in which packages are identified by globally unique URIs.
+ </p>
+ <p>
+ Uses PackageKit to install missing dependencies, using the distribution's native package manager through 0launch (version 0.49 or higher)
+ </p>
+ </td>
+</tr>
<!--
<tr>
<td>
commit c727490196126cf878eb9af0f6e2cfd16cd2e224
Author: Carlo Marcelo Arenas Belon <carenas at sajinet.com.pe>
Date: Mon Jul 12 00:40:29 2010 -0700
trivial: update fedora info and image comment
diff --git a/docs/html/pk-users.html b/docs/html/pk-users.html
index 9d04731..fe3c94a 100644
--- a/docs/html/pk-users.html
+++ b/docs/html/pk-users.html
@@ -22,16 +22,16 @@
<table cellpadding="10">
<tr>
<td>
- <a href="http://fedoraproject.org/"><img src="img/users-fedora.png" alt=""/></a><!-- image should be 200px wide -->
+ <a href="http://fedoraproject.org/"><img src="img/users-fedora.png" alt=""/></a><!-- image should be 250px wide -->
</td>
<td>
- <h2>Fedora Project - Fedora 9, 10, 11 and 12</h2>
+ <h2>Fedora Project - Fedora 9, 10, 11, 12 and 13</h2>
<p>
Fedora is a Linux-based operating system that showcases the latest in free and open source software.
Fedora is always free for anyone to use, modify, and distribute.
</p>
<p>
- Uses latest PackageKit version, 0.4.8.
+ Uses latest PackageKit version.
</p>
</td>
</tr>
commit cad86922f41cd07a3e280f4932eda7a59a16af8e
Author: Fabio Erculiani <lxnay at sabayon.org>
Date: Mon Jul 12 03:27:04 2010 +0200
entropy: fix system packages calculation
diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
index cac9a68..5f6d2e0 100755
--- a/backends/entropy/entropyBackend.py
+++ b/backends/entropy/entropyBackend.py
@@ -270,16 +270,14 @@ class PackageKitEntropyMixin(object):
"""
# we have INFO_IMPORTANT, INFO_SECURITY, INFO_NORMAL
new_pkgs = set()
- sys_pkg_map = {}
for repo, pkg_id, c_repo in pkgs:
pkg_type = None
if important_check:
- repo_sys_pkgs = sys_pkg_map.get(repo,
- c_repo.getSystemPackages())
-
- if pkg_id in repo_sys_pkgs:
+ sys_pkg = self._entropy.validate_package_removal(pkg_id,
+ repo_id = repo)
+ if sys_pkg:
pkg_type = INFO_IMPORTANT
else:
pkg_type = INFO_NORMAL
commit 0784442de3e321d33c143e98ab32b96030c69359
Author: Valeriy Lyasotskiy <onestep at ukr.net>
Date: Fri Jul 9 01:27:00 2010 +0300
alpm: fixed compilation with ALPM 5; do not fail on unrecognized config directives
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index ade9c4a..33f111e 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -525,18 +525,14 @@ parse_config (const char *file, const char *givensection, pmdb_t * const givendb
if (ptr == NULL && g_strcmp0 (section, "options") == 0) {
/* directives without settings, all in [options] */
- if (g_strcmp0 (key, "NoPassiveFTP") == 0) {
- alpm_option_set_nopassiveftp (1);
- egg_debug ("config: nopassiveftp");
- } else if (g_strcmp0 (key, "UseSyslog") == 0) {
+ if (g_strcmp0 (key, "UseSyslog") == 0) {
alpm_option_set_usesyslog (1);
egg_debug ("config: usesyslog");
} else if (g_strcmp0 (key, "UseDelta") == 0) {
alpm_option_set_usedelta (1);
egg_debug ("config: usedelta");
- } else if (g_strcmp0 (key, "ILoveCandy") != 0 && g_strcmp0 (key, "ShowSize") != 0 && g_strcmp0 (key, "TotalDownload") != 0) {
- egg_error ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
- return 1;
+ } else if (g_strcmp0 (key, "ILoveCandy") != 0 && g_strcmp0 (key, "ShowSize") != 0 && g_strcmp0 (key, "TotalDownload") != 0 && g_strcmp0 (key, "NoPassiveFTP") != 0) {
+ egg_warning ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
}
} else {
/* directives with settings */
@@ -572,8 +568,7 @@ parse_config (const char *file, const char *givensection, pmdb_t * const givendb
alpm_option_set_logfile (ptr);
egg_debug ("config: logfile: %s", ptr);
} else if (g_strcmp0 (key, "XferCommand") != 0 && g_strcmp0 (key, "CleanMethod") != 0) {
- egg_error ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
- return 1;
+ egg_warning ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
}
} else if (g_strcmp0 (key, "Server") == 0) {
/* let's attempt a replacement for the current repo */
@@ -587,8 +582,7 @@ parse_config (const char *file, const char *givensection, pmdb_t * const givendb
}
free (server);
} else {
- egg_error ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
- return 1;
+ egg_warning ("config file %s, line %d: directive '%s' not recognized.", file, linenum, key);
}
}
}
@@ -755,7 +749,7 @@ backend_download_packages_thread (PkBackend *backend)
alpm_option_add_cachedir (directory);
/* create a new transaction */
- if (alpm_trans_init (PM_TRANS_TYPE_SYNC, PM_TRANS_FLAG_NODEPS | PM_TRANS_FLAG_DOWNLOADONLY, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (PM_TRANS_FLAG_NODEPS | PM_TRANS_FLAG_DOWNLOADONLY, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
@@ -765,7 +759,7 @@ backend_download_packages_thread (PkBackend *backend)
for (iterator = 0; iterator < g_strv_length (package_ids); ++iterator) {
gchar **package_id_data = pk_package_id_split (package_ids[iterator]);
- if (alpm_trans_addtarget (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
+ if (alpm_sync_target (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
alpm_trans_release ();
pk_backend_finished (backend);
@@ -1206,7 +1200,7 @@ backend_install_files_thread (PkBackend *backend)
gchar **full_paths = pk_backend_get_strv (backend, "full_paths");
/* create a new transaction */
- if (alpm_trans_init (PM_TRANS_TYPE_UPGRADE, 0, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (0, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
@@ -1214,7 +1208,7 @@ backend_install_files_thread (PkBackend *backend)
/* add targets to the transaction */
for (iterator = 0; iterator < g_strv_length (full_paths); ++iterator) {
- if (alpm_trans_addtarget (full_paths[iterator]) != 0) {
+ if (alpm_add_target (full_paths[iterator]) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
alpm_trans_release ();
pk_backend_finished (backend);
@@ -1262,7 +1256,7 @@ backend_install_packages_thread (PkBackend *backend)
gchar **package_ids = pk_backend_get_strv (backend, "package_ids");
/* create a new transaction */
- if (alpm_trans_init (PM_TRANS_TYPE_SYNC, 0, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (0, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
@@ -1272,7 +1266,7 @@ backend_install_packages_thread (PkBackend *backend)
for (iterator = 0; iterator < g_strv_length (package_ids); ++iterator) {
gchar **package_id_data = pk_package_id_split (package_ids[iterator]);
- if (alpm_trans_addtarget (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
+ if (alpm_sync_target (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
alpm_trans_release ();
pk_backend_finished (backend);
@@ -1315,7 +1309,7 @@ backend_refresh_cache_thread (PkBackend *backend)
{
alpm_list_t *list_iterator;
- if (alpm_trans_init (PM_TRANS_TYPE_SYNC, PM_TRANS_FLAG_NOSCRIPTLET, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (PM_TRANS_FLAG_NOSCRIPTLET, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
@@ -1376,7 +1370,7 @@ backend_remove_packages_thread (PkBackend *backend)
flags |= PM_TRANS_FLAG_RECURSE;
/* create a new transaction */
- if (alpm_trans_init (PM_TRANS_TYPE_REMOVE, flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
@@ -1386,7 +1380,7 @@ backend_remove_packages_thread (PkBackend *backend)
for (iterator = 0; iterator < g_strv_length (package_ids); ++iterator) {
gchar **package_id_data = pk_package_id_split (package_ids[iterator]);
- if (alpm_trans_addtarget (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
+ if (alpm_remove_target (package_id_data[PK_PACKAGE_ID_NAME]) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
alpm_trans_release ();
pk_backend_finished (backend);
@@ -1405,7 +1399,7 @@ backend_remove_packages_thread (PkBackend *backend)
}
/* search for HoldPkg's in target list */
- for (list_iterator = alpm_trans_get_pkgs (); list_iterator; list_iterator = alpm_list_next (list_iterator)) {
+ for (list_iterator = alpm_trans_get_remove (); list_iterator; list_iterator = alpm_list_next (list_iterator)) {
pmpkg_t *pkg = alpm_list_getdata (list_iterator);
const gchar *pkgname = alpm_pkg_get_name (pkg);
@@ -1612,18 +1606,15 @@ backend_update_system_thread (PkBackend *backend)
/* FIXME: support only_trusted */
- /* don't specify any flags for now */
- pmtransflag_t flags = 0;
-
/* create a new transaction */
- if (alpm_trans_init (PM_TRANS_TYPE_SYNC, flags, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
+ if (alpm_trans_init (0, cb_trans_evt, cb_trans_conv, cb_trans_progress) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
pk_backend_finished (backend);
return FALSE;
}
/* set action, prepare and commit transaction */
- if (alpm_trans_sysupgrade (FALSE) != 0 || alpm_trans_prepare (&data) != 0 || alpm_trans_commit (&data) != 0) {
+ if (alpm_sync_sysupgrade (FALSE) != 0 || alpm_trans_prepare (&data) != 0 || alpm_trans_commit (&data) != 0) {
pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, alpm_strerrorlast ());
alpm_trans_release ();
pk_backend_finished (backend);
More information about the PackageKit-commit
mailing list