[packagekit] packagekit: Branch 'master' - 6 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Wed Aug 29 18:12:29 PDT 2007
TODO | 8 +++-----
helpers/README | 2 +-
libpackagekit/pk-task-list.c | 3 ++-
libpackagekit/pk-task-monitor.c | 6 ++----
libpackagekit/pk-task-monitor.h | 3 +--
src/pk-engine.c | 13 +++++--------
src/pk-engine.h | 1 -
src/pk-interface.xml | 2 --
src/pk-task-common.c | 7 -------
9 files changed, 14 insertions(+), 31 deletions(-)
New commits:
diff-tree 5ad657f34bbc90646a36ad188ab722fe413a2bab (from 15a469f9d76ababb87b6a30ca7917785ff61d1a4)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Aug 30 02:12:16 2007 +0100
add stuff to TODO
diff --git a/TODO b/TODO
index ca35b7d..681b1e6 100644
--- a/TODO
+++ b/TODO
@@ -2,17 +2,15 @@ Order of no particular importance:
Core:
* Add a queing API
-* Add GetStatus and ::StatusChanged to get package data as string for UI
* Add a way to import GPG keys
* Split up PolicyKit install into different types
* Add files in package into Description signal
-* Add size into description signal
+* Add package size into description signal
* Valgrind everything
+* Add GetPercentage and GetSubPercentage for coldplugging
Backends:
* Add conary backend
* Dummy backend should use subpercent and install deps
-* yum-find-name.py has to emit full version and epoch, not just the version
-* Add enough new error enums for the yum backend
-* Install does not work for the yum backend (code error, not backend error)
+* Add enough new error enums for all the backends
diff-tree 15a469f9d76ababb87b6a30ca7917785ff61d1a4 (from parents)
Merge: 8a471dcd1bb192f8bb536f7a01b7c4bbb1b99eb0 416794e081069e7c8c4b8e53b1549cdb3021dec4
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Aug 30 01:29:52 2007 +0100
Merge branch 'master' of ssh://hughsie@hughsient.no-ip.org/srv/git/PackageKit
diff-tree 8a471dcd1bb192f8bb536f7a01b7c4bbb1b99eb0 (from efe69abdd6bbd99c6b125a7624109004825b11c9)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Aug 30 01:29:41 2007 +0100
fix the library too
diff --git a/libpackagekit/pk-task-list.c b/libpackagekit/pk-task-list.c
index bdf9e9b..9e8fd3e 100644
--- a/libpackagekit/pk-task-list.c
+++ b/libpackagekit/pk-task-list.c
@@ -215,7 +215,8 @@ pk_task_list_refresh (PkTaskList *tlist)
g_signal_connect (item->monitor, "error-code",
G_CALLBACK (pk_task_list_error_code_cb), tlist);
pk_task_monitor_set_job (item->monitor, job);
- pk_task_monitor_get_status (item->monitor, &item->status, &item->package);
+ pk_task_monitor_get_status (item->monitor, &item->status);
+ item->package = NULL;
/* add to watched array */
g_ptr_array_add (tlist->priv->task_list, item);
diff --git a/libpackagekit/pk-task-monitor.c b/libpackagekit/pk-task-monitor.c
index 97fdba4..d619e2d 100644
--- a/libpackagekit/pk-task-monitor.c
+++ b/libpackagekit/pk-task-monitor.c
@@ -93,7 +93,7 @@ pk_task_monitor_get_job (PkTaskMonitor *
* pk_task_monitor_get_status:
**/
gboolean
-pk_task_monitor_get_status (PkTaskMonitor *tmonitor, PkTaskStatus *status, gchar **package)
+pk_task_monitor_get_status (PkTaskMonitor *tmonitor, PkTaskStatus *status)
{
gboolean ret;
gchar *status_text;
@@ -108,7 +108,6 @@ pk_task_monitor_get_status (PkTaskMonito
G_TYPE_UINT, tmonitor->priv->job,
G_TYPE_INVALID,
G_TYPE_STRING, &status_text,
- G_TYPE_STRING, package,
G_TYPE_INVALID);
if (error) {
pk_debug ("ERROR: %s", error->message);
@@ -205,7 +204,6 @@ static void
pk_task_monitor_job_status_changed_cb (DBusGProxy *proxy,
guint job,
const gchar *status_text,
- const gchar *package,
PkTaskMonitor *tmonitor)
{
PkTaskStatus status;
@@ -455,7 +453,7 @@ pk_task_monitor_init (PkTaskMonitor *tmo
G_CALLBACK (pk_task_monitor_no_percentage_updates_cb), tmonitor, NULL);
dbus_g_proxy_add_signal (proxy, "JobStatusChanged",
- G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+ G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (proxy, "JobStatusChanged",
G_CALLBACK (pk_task_monitor_job_status_changed_cb), tmonitor, NULL);
diff --git a/libpackagekit/pk-task-monitor.h b/libpackagekit/pk-task-monitor.h
index f2d94e5..aa22439 100644
--- a/libpackagekit/pk-task-monitor.h
+++ b/libpackagekit/pk-task-monitor.h
@@ -54,8 +54,7 @@ gboolean pk_task_monitor_set_job (PkTa
guint job);
guint pk_task_monitor_get_job (PkTaskMonitor *tmonitor);
gboolean pk_task_monitor_get_status (PkTaskMonitor *tmonitor,
- PkTaskStatus *status,
- gchar **package);
+ PkTaskStatus *status);
G_END_DECLS
diff-tree 416794e081069e7c8c4b8e53b1549cdb3021dec4 (from efe69abdd6bbd99c6b125a7624109004825b11c9)
Author: Ken VanDine <ken at vandine.org>
Date: Wed Aug 29 20:26:06 2007 -0400
Typo
diff --git a/helpers/README b/helpers/README
index b591511..3a2be4a 100644
--- a/helpers/README
+++ b/helpers/README
@@ -10,7 +10,7 @@ This means we need a standard for what g
try and maximise the common code between the backends.
Please see the helpers/BACKENDS file for the current status of the existing
-backends. Backend maintainers, please keep this file updates.
+backends. Backend maintainers, please keep this file updated.
Package Id:
diff-tree efe69abdd6bbd99c6b125a7624109004825b11c9 (from 09e3c89571cb672d595890bbc956c976baeed93e)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Aug 30 01:15:07 2007 +0100
streamline the API so that publically we match internally so that JobStatus just returns the job status and not other junk data
diff --git a/src/pk-engine.c b/src/pk-engine.c
index 409a0d0..1aeecc3 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -209,17 +209,15 @@ pk_engine_job_status_changed_cb (PkTask
{
guint job;
const gchar *status_text;
- const gchar *package;
g_return_if_fail (engine != NULL);
g_return_if_fail (PK_IS_ENGINE (engine));
job = pk_task_get_job (task);
status_text = pk_task_status_to_text (status);
- package = pk_task_get_data (task);
- pk_debug ("emitting job-status-changed job:%i, '%s', '%s'", job, status_text, package);
- g_signal_emit (engine, signals [PK_ENGINE_JOB_STATUS_CHANGED], 0, job, status_text, package);
+ pk_debug ("emitting job-status-changed job:%i, '%s'", job, status_text);
+ g_signal_emit (engine, signals [PK_ENGINE_JOB_STATUS_CHANGED], 0, job, status_text);
pk_engine_reset_timer (engine);
}
@@ -970,7 +968,7 @@ pk_engine_get_job_list (PkEngine *engine
**/
gboolean
pk_engine_get_job_status (PkEngine *engine, guint job,
- const gchar **status, const gchar **package, GError **error)
+ const gchar **status, GError **error)
{
PkTask *task;
PkTaskStatus status_enum;
@@ -986,7 +984,6 @@ pk_engine_get_job_status (PkEngine *engi
}
pk_task_get_job_status (task, &status_enum);
*status = g_strdup (pk_task_status_to_text (status_enum));
- *package = pk_task_get_data (task);
return TRUE;
}
@@ -1080,8 +1077,8 @@ pk_engine_class_init (PkEngineClass *kla
signals [PK_ENGINE_JOB_STATUS_CHANGED] =
g_signal_new ("job-status-changed",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
- 0, NULL, NULL, pk_marshal_VOID__UINT_STRING_STRING,
- G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
+ 0, NULL, NULL, pk_marshal_VOID__UINT_STRING,
+ G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
signals [PK_ENGINE_PERCENTAGE_CHANGED] =
g_signal_new ("percentage-changed",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
diff --git a/src/pk-engine.h b/src/pk-engine.h
index dd67fa2..0c6ca3e 100644
--- a/src/pk-engine.h
+++ b/src/pk-engine.h
@@ -125,7 +125,6 @@ gboolean pk_engine_get_job_list (PkEn
gboolean pk_engine_get_job_status (PkEngine *engine,
guint job,
const gchar **status,
- const gchar **package,
GError **error);
gboolean pk_engine_cancel_job_try (PkEngine *engine,
guint job,
diff --git a/src/pk-interface.xml b/src/pk-interface.xml
index 7190b34..1039521 100644
--- a/src/pk-interface.xml
+++ b/src/pk-interface.xml
@@ -65,7 +65,6 @@
<signal name="JobStatusChanged">
<arg type="u" name="job" direction="out"/>
<arg type="s" name="status" direction="out"/> <!-- invalid,setup,download,install,update,exit -->
- <arg type="s" name="package_id" direction="out"/>
</signal>
<signal name="PercentageChanged"> <!-- progress of the whole job -->
<arg type="u" name="job" direction="out"/>
@@ -124,7 +123,6 @@
<method name="GetJobStatus"> <!-- throws NoSuchJob -->
<arg type="u" name="job" direction="in"/>
<arg type="s" name="status" direction="out"/> <!-- query,download,install,exit -->
- <arg type="s" name="package" direction="out"/>
</method>
<method name="CancelJobTry"> <!-- throws NoSuchJob -->
<arg type="u" name="job" direction="in"/>
diff-tree 09e3c89571cb672d595890bbc956c976baeed93e (from 2f016f3ef111d1750b05a55a510d87acfe7346c3)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Aug 30 01:08:24 2007 +0100
data is no longer valid for scripts to emit
diff --git a/src/pk-task-common.c b/src/pk-task-common.c
index e0010ed..b9d7797 100644
--- a/src/pk-task-common.c
+++ b/src/pk-task-common.c
@@ -209,13 +209,6 @@ pk_task_parse_common_error (PkTask *task
}
restart_enum = pk_task_restart_from_text (sections[1]);
pk_task_require_restart (task, restart_enum, sections[2]);
- } else if (strcmp (command, "data") == 0) {
- if (size != 2) {
- g_error ("invalid command '%s'", command);
- ret = FALSE;
- goto out;
- }
- pk_task_set_data (task, sections[1]);
} else if (strcmp (command, "status") == 0) {
if (size != 2) {
g_error ("invalid command '%s'", command);
More information about the PackageKit
mailing list