Merge branch 'master' into debian/master

1 files changed, 2 insertions, 2 deletions

diff --git a/whatmaps b/whatmaps
index 379fc61..6991088 100755
--- a/whatmaps
+++ b/whatmaps
@@ -142,7 +142,7 @@ class Pkg(object):
     type = None
     services = None
     shared_objects = None
-    _so_regex = re.compile(r'(?P<so>/.*\.so(\.[^/])*$)')
+    _so_regex = re.compile(r'(?P<so>/.*\.so(\.[^/]*)$)')
     _list_contents = None
 
     def __init__(self, name):
@@ -544,7 +544,7 @@ def main(argv):
                 logging.warning("No service script found in '%s' for '%s' "
                                 "- restart manually" % (pkg.name, pkg.procs))
             else:
-                all_services = all_services.union(services)
+                all_services.update(services)
     except NotImplementedError:
         if level > logging.INFO:
             logging.error("Getting Service listing not implemented "