[packagekit] packagekit: Branch 'master' - 8 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Oct 16 00:03:09 PDT 2007
backends/yum/helpers/Makefile.am | 1 +
backends/yum/helpers/install-file.py | 20 ++++++++++++++++++++
backends/yum/helpers/yumBackend.py | 2 +-
backends/yum/pk-backend-yum.c | 14 ++++++++++++--
client/pk-console.c | 1 +
python/packagekit/backend.py | 1 -
python/packagekit/frontend.py | 1 -
7 files changed, 35 insertions(+), 5 deletions(-)
New commits:
commit b4ce4da32e8a4cbabe5963f36385143c3a2ce5a1
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Oct 16 08:01:15 2007 +0100
link up backend_install_file, in the yum compiled backend
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index 6df2cb7..3b25e0d 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -120,6 +120,16 @@ backend_install_package (PkBackend *backend, const gchar *package_id)
}
/**
+ * backend_install_file:
+ */
+static void
+backend_install_file (PkBackend *backend, const gchar *full_path)
+{
+ g_return_if_fail (backend != NULL);
+ pk_backend_spawn_helper (backend, "install-file.py", full_path, NULL);
+}
+
+/**
* backend_refresh_cache:
*/
static void
@@ -244,7 +254,7 @@ PK_BACKEND_OPTIONS (
NULL, /* get_update_detail */
backend_get_updates, /* get_updates */
backend_install_package, /* install_package */
- NULL, /* install_file */
+ backend_install_file, /* install_file */
backend_refresh_cache, /* refresh_cache */
backend_remove_package, /* remove_package */
backend_resolve, /* resolve */
commit 52a717b380939c513deb233b25b9992a9f7c9ad1
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Oct 16 07:59:06 2007 +0100
Revert "Removed install-file.py from distfiles for the yum backend, it is missing and breaks make dist"
This reverts commit ef0604dc45aef563a97c4c85377c4e4f48dfc6a1.
Tim has added the file :-)
ac_link=
diff --git a/backends/yum/helpers/Makefile.am b/backends/yum/helpers/Makefile.am
index e9bd526..117f242 100644
--- a/backends/yum/helpers/Makefile.am
+++ b/backends/yum/helpers/Makefile.am
@@ -16,6 +16,7 @@ dist_helper_DATA = \
remove.py \
resolve.py \
update.py \
+ install-file.py \
refresh-cache.py \
update-system.py \
yumBackend.py \
commit e270ad87fbbc6f22abb0685554f7a80c4731dea1
Author: Tim Lauridsen <tim at localhost.localdomain>
Date: Tue Oct 16 07:25:20 2007 +0200
yum: add _setup_yum to resolve
diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py
index 59406d2..9641816 100644
--- a/backends/yum/helpers/yumBackend.py
+++ b/backends/yum/helpers/yumBackend.py
@@ -386,7 +386,7 @@ class PackageKitYumBackend(PackageKitBaseBackend):
self.allow_interrupt(True);
self.percentage(None)
- # !!! Shouldn't we self._setup_yum() here?
+ self._setup_yum()
# Get installed packages
installedByKey = self.yumbase.rpmdb.searchNevra(name=name)
commit 2be29413da1c4a3618e8f88ca8214a8ad06559c1
Author: Tim Lauridsen <tim at localhost.localdomain>
Date: Tue Oct 16 07:00:41 2007 +0200
yum: Added missing install-file.py :)
diff --git a/backends/yum/helpers/install-file.py b/backends/yum/helpers/install-file.py
new file mode 100755
index 0000000..6c25fc3
--- /dev/null
+++ b/backends/yum/helpers/install-file.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007 Richard Hughes <richard at hughsie.com>
+# Copyright (C) 2007 Red Hat Inc, Seth Vidal <skvidal at fedoraproject.org>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+import sys
+
+from yumBackend import PackageKitYumBackend
+
+file_to_inst = sys.argv[1]
+backend = PackageKitYumBackend(sys.argv[1:])
+backend.install_file(file_to_inst)
+sys.exit(0)
\ No newline at end of file
commit 9767194ff24686f56ea6819c165540d021cdb1c0
Author: James Bowes <jbowes at dangerouslyinc.com>
Date: Mon Oct 15 23:37:54 2007 -0400
yum: Pass package_id to resolve.py
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index cbbeeff..6df2cb7 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -226,7 +226,7 @@ static void
backend_resolve (PkBackend *backend, const gchar *package_id)
{
g_return_if_fail (backend != NULL);
- pk_backend_spawn_helper (backend, "resolve.py", NULL);
+ pk_backend_spawn_helper (backend, "resolve.py", package_id, NULL);
}
PK_BACKEND_OPTIONS (
commit f9a1afb269a4601c4d7daa7b3e2f30fdd521ea4a
Author: James Bowes <jbowes at dangerouslyinc.com>
Date: Mon Oct 15 23:08:06 2007 -0400
pkcon: Break from subcommand parsing as soon as we encounter an error.
diff --git a/client/pk-console.c b/client/pk-console.c
index 6b1495d..6bc6e82 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -565,6 +565,7 @@ main (int argc, char *argv[])
g_print ("Error:\n %s\n\n", error->message);
g_error_free (error);
g_print (options_help);
+ break;
}
}
commit 7333b31f7aeedf17e36e0cd5cb72fbc887b4566f
Author: Robin Norwood <rnorwood at redhat.com>
Date: Mon Oct 15 22:44:42 2007 -0400
Another non-script that's executable
diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py
index 92ab711..7c6d4c6 100644
--- a/python/packagekit/backend.py
+++ b/python/packagekit/backend.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python -tt
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
commit 97b7c6c4d51c814a4bfeb42dfb45ee4042b72fc9
Author: Robin Norwood <rnorwood at redhat.com>
Date: Mon Oct 15 22:21:32 2007 -0400
This file should not be executible - no shebang.
diff --git a/python/packagekit/frontend.py b/python/packagekit/frontend.py
index 861e5be..a1bc3e6 100644
--- a/python/packagekit/frontend.py
+++ b/python/packagekit/frontend.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python -tt
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
More information about the PackageKit
mailing list