Fix client handling of service removal

3 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ba53ff8db60..1a9186525a31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Mar  1 15:44:56 UTC 2018
+# Thu Mar  1 16:11:48 UTC 2018
 pkgbase = pkgdistcache
 	pkgdesc = A distributed local-network cache for pacman packages
 	pkgver = 0.5.0
@@ -19,7 +19,7 @@ pkgbase = pkgdistcache
 	source = pkgdistcache-daemon
 	source = pkgdistcache.conf
 	source = pkgdistcached.service
-	sha256sums = bef0809d86e151a4551a122b29f4c90d2f06ab34459a8ff91a37a29a6fd2a3f7
+	sha256sums = eac5e8c4afebdbb3b93d9d50d10abdaa3cdbd9da796d969f2cd9db2064a69d8d
 	sha256sums = 10379b95265e7aa3c6334197ef255327281e35b958c3c062ae893dd3a646a66e
 	sha256sums = 5628cf4d81adaf7a3dd7243f51af1a30fff73a31b421615a7c0051280618f457
 	sha256sums = b98bccb089bc0025b0f9b4b949b691e5564b0e40778a263a5bb6ffa5f01d04a2
diff --git a/PKGBUILD b/PKGBUILD
index f4ff2ca82c3b..ea27d36cd5db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ source=('pkgdistcache-client'
         'pkgdistcache-daemon'
         'pkgdistcache.conf'
         'pkgdistcached.service')
-sha256sums=('bef0809d86e151a4551a122b29f4c90d2f06ab34459a8ff91a37a29a6fd2a3f7'
+sha256sums=('eac5e8c4afebdbb3b93d9d50d10abdaa3cdbd9da796d969f2cd9db2064a69d8d'
             '10379b95265e7aa3c6334197ef255327281e35b958c3c062ae893dd3a646a66e'
             '5628cf4d81adaf7a3dd7243f51af1a30fff73a31b421615a7c0051280618f457'
             'b98bccb089bc0025b0f9b4b949b691e5564b0e40778a263a5bb6ffa5f01d04a2')
diff --git a/pkgdistcache-client b/pkgdistcache-client
index d23177f6f09b..dec92223daa2 100755
--- a/pkgdistcache-client
+++ b/pkgdistcache-client
@@ -155,7 +155,8 @@ class AvahiBrowser(object):
             printwarn(ex)
 
     def _item_remove(self, *args):
-        self.services.remove(AvahiService(*args))
+        # The key will be missing if ResolveService raised an exception
+        self.services.pop(AvahiService(*args), None)
 
     def _failure(self, error):
         printwarn(error)