← Back to branch summary

~ubuntu-branches/ubuntu/raring/apt-xapian-index/raring-proposed

« back to all changes in this revision

Viewing changes to debian/applied-patches/0003-fix-argument-append-to-the-cmd-var.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-03-30 14:46:08 UTC
  • Revision ID: james.westby@ubuntu.com-20100330144608-3q3s62uvzbs4uzac
Tags: 0.25ubuntu1
export update-apt-xapian-index as dbus service for integration with
tools like software-center or packagekit (part of the
software-center-non-applications spec)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/applied-patches/0003-fix-argument-append-to-the-cmd-var.patch
 
1
From 8fdedbcf3e046f122eaf0126b2920f9a58b1f317 Mon Sep 17 00:00:00 2001
 
2
From: Michael Vogt <egon@localhost.localdomain>
 
3
Date: Tue, 30 Mar 2010 16:07:38 +0200
 
4
Subject: [PATCH 3/3] * fix argument append to the cmd var
 
5
 
 
6
---
 
7
 tests/dbus-update-apt-xapian-index.py |    1 +
 
8
 update-apt-xapian-index-dbus          |    4 ++--
 
9
 2 files changed, 3 insertions(+), 2 deletions(-)
 
10
 
 
11
diff --git a/tests/dbus-update-apt-xapian-index.py b/tests/dbus-update-apt-xapian-index.py
 
12
index 413601c..63727c9 100644
 
13
--- a/tests/dbus-update-apt-xapian-index.py
 
14
+++ b/tests/dbus-update-apt-xapian-index.py
 
15
@@ -18,6 +18,7 @@ axi = dbus.Interface(system_bus.get_object("org.debian.AptXapianIndex","/"),
 
16
                      "org.debian.AptXapianIndex")
 
17
 axi.connect_to_signal("UpdateFinished", finished)
 
18
 axi.connect_to_signal("UpdateProgress", progress)
 
19
+# force, update_only
 
20
 axi.update_async(True, True)
 
21
 
 
22
 glib.MainLoop().run()
 
23
diff --git a/update-apt-xapian-index-dbus b/update-apt-xapian-index-dbus
 
24
index be90b19..0e1424c 100755
 
25
--- a/update-apt-xapian-index-dbus
 
26
+++ b/update-apt-xapian-index-dbus
 
27
@@ -92,9 +92,9 @@ class AptXapianIndexDBusService(dbus.service.Object):
 
28
             raise PermissionDeniedError, "Permission denied by policy"
 
29
         cmd = ["/usr/sbin/update-apt-xapian-index", "--batch-mode"]
 
30
         if force:
 
31
-            cmd += "--force"
 
32
+            cmd.append("--force")
 
33
         if update_only:
 
34
-            cmd += "--update"
 
35
+            cmd.append("--update")
 
36
         glib.timeout_add(100, self._update_apt_xapian_index, cmd)
 
37
 
 
38
 if __name__ == "__main__":
 
39
-- 
 
40
1.7.0
 
41