From b82a929a868a43f68b5850dda74978eea8614b28 Mon Sep 17 00:00:00 2001
From: handsome-feng <jianfengli@ubuntukylin.com>
Date: Mon, 12 Aug 2019 19:08:45 +0800
Subject: [PATCH] Fix some lintian warnings

---
 .../aptdaemon/conf/com.ubuntukylin.softwarecenter.conf |  7 ++++---
 .../apt_dbus_service.py                                | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/aptdaemon/conf/com.ubuntukylin.softwarecenter.conf b/backend/aptdaemon/conf/com.ubuntukylin.softwarecenter.conf
index c8219076..43aa35c2 100644
--- a/backend/aptdaemon/conf/com.ubuntukylin.softwarecenter.conf
+++ b/backend/aptdaemon/conf/com.ubuntukylin.softwarecenter.conf
@@ -12,10 +12,11 @@
     
     <!-- Allow anyone to invoke methods on the interfaces -->
     <policy context="default">
-        <allow send_interface="com.ubuntukylin.softwarecenter"/>
         <allow send_destination="com.ubuntukylin.softwarecenter"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
+               send_interface="com.ubuntukylin.softwarecenter"/>
+        <allow send_destination="com.ubuntukylin.softwarecenter"
+               send_interface="org.freedesktop.DBus.Introspectable"/>
         <allow send_destination="com.ubuntukylin.softwarecenter"
-           send_interface="org.freedesktop.DBus.Properties"/>
+               send_interface="org.freedesktop.DBus.Properties"/>
     </policy>
 </busconfig>
diff --git a/ubuntu_kylin_software_center_daemon/apt_dbus_service.py b/ubuntu_kylin_software_center_daemon/apt_dbus_service.py
index 95a4c18e..c0a69093 100644
--- a/ubuntu_kylin_software_center_daemon/apt_dbus_service.py
+++ b/ubuntu_kylin_software_center_daemon/apt_dbus_service.py
@@ -59,7 +59,8 @@
 HTTP_SOURCE_UBUNTUKYLIN = "http://archive.ubuntukylin.com:10006/ubuntukylin" 
 DEB_SOURCE_UBUNTUKYLIN = "deb " + HTTP_SOURCE_UBUNTUKYLIN
 UBUNTUKYLIN_SOFTWARECENTER_ACTION = 'com.ubuntukylin.softwarecenter.action'
-
+LIB_PATH = "/var/lib/"
+DPKG_PATH = LIB_PATH + "dpkg/lock"
 
 class WorkItem:
      def __init__(self, pkgname, action, kwargs):
@@ -87,7 +88,7 @@ def run(self):
                 time.sleep(0.5)
                 continue
 
-            if is_file_locked("/var/lib/dpkg/lock") is True or 1 == self.uksc_is_working:
+            if is_file_locked(DPKG_PATH) is True or 1 == self.uksc_is_working:
                 time.sleep(0.5)
                 continue
 
@@ -128,7 +129,8 @@ def is_file_locked(lockfile):
     """
     Check whether ``apt-get`` or ``dpkg`` is currently active by check the lock file.
 
-    This works by checking whether the lock file like ``/var/lib/dpkg/lock``
+    This works by checking whether the lock file like ``/var/lib/
+    dpkg/lock``
     ``/var/lib/apt/lists/lock`` is locked by an ``apt-get`` or ``dpkg`` process,
     which in turn is done by momentarily trying to acquire the lock.
      This means that the current process needs to have sufficient privileges.
@@ -590,7 +592,7 @@ def check_work_item(self):
         if len(self.worklist) != 0:
             workitemcount = len(self.worklist)
         self.mutex.release()
-        dpkg_is_running = is_file_locked("/var/lib/dpkg/lock")
+        dpkg_is_running = is_file_locked(DPKG_PATH)
         if dpkg_is_running is True:
             dpkg_is_running = 1
         else: