[gnome-software/wip/temp/ubuntu-xenial-rebased-corrected: 289/331] Fix sending the wrong string to aptd InstallFile
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/temp/ubuntu-xenial-rebased-corrected: 289/331] Fix sending the wrong string to aptd InstallFile
- Date: Wed, 4 May 2016 14:22:49 +0000 (UTC)
commit 9471d92585e0c46dc682efb6b71b0c05da631721
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Apr 25 10:49:40 2016 +0200
Fix sending the wrong string to aptd InstallFile
src/plugins/gs-plugin-apt.cc | 2 +-
src/plugins/gs-plugin-dpkg.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/gs-plugin-apt.cc b/src/plugins/gs-plugin-apt.cc
index d1074d4..9c9c805 100644
--- a/src/plugins/gs-plugin-apt.cc
+++ b/src/plugins/gs-plugin-apt.cc
@@ -906,7 +906,7 @@ gs_plugin_app_install (GsPlugin *plugin,
case AS_APP_STATE_AVAILABLE_LOCAL:
gs_app_set_state (app, AS_APP_STATE_INSTALLING);
success = aptd_transaction (plugin, "InstallFile", app, NULL,
- g_variant_new_parsed ("(%s, true)", gs_app_get_origin (app)),
+ g_variant_new_parsed ("(%s, true)", gs_app_get_source_default
(app)),
error);
break;
default:
diff --git a/src/plugins/gs-plugin-dpkg.c b/src/plugins/gs-plugin-dpkg.c
index e3eb2da..c4945af 100644
--- a/src/plugins/gs-plugin-dpkg.c
+++ b/src/plugins/gs-plugin-dpkg.c
@@ -106,7 +106,7 @@ gs_plugin_filename_to_app (GsPlugin *plugin,
/* create app */
app = gs_app_new (NULL);
gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
- gs_app_add_source (app, tokens[0]);
+ gs_app_add_source (app, filename);
gs_app_set_name (app, GS_APP_QUALITY_LOWEST, tokens[0]);
gs_app_set_version (app, tokens[1]);
gs_app_set_size (app, 1024 * atoi (tokens[2]));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]