Merge lp:~3v1n0/bamf/libbamf-dont-duplicate-apps into lp:bamf/0.4

[Marco Trevisan (Treviño)]

libbamf, BamfMatcher: avoid to return the same app twice in bamf_matcher_get_applications

When bamfdaemon is under high stress it could return different paths for the same application, so libbamf can be confused and returning the same application twice in bamf_matcher_get_applications.

Fixes failures in lp:~3v1n0/unity/launcher-controller-tests-fix/+merge/134202

[Łukasz Zemczak (sil2100)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/18/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

There are two different failures here. amd64 failed while running tests.

The i386 failed due to the addition of bamf_view_is_user_visible in revision 496. It is failing now because DPKG_GENSYMBOLS_CHECK_LEVEL=4 has just been enforced by the autolanding job:

dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
dpkg-gensymbols: warning: debian/libbamf0/DEBIAN/symbols doesn't match completely debian/libbamf0.symbols
--- debian/libbamf0.symbols (libbamf0_0.3.4bzr498pkg0quantal18_i386)
+++ dpkg-gensymbols7h07HF 2012-11-14 10:34:42.000000000 +0000
@@ -63,6 +63,7 @@
  bamf_view_is_running@Base 0.2.20
  bamf_view_is_sticky@Base 0.2.60
  bamf_view_is_urgent@Base 0.2.20
+ bamf_view_is_user_visible@Base 0.3.4bzr498pkg0quantal18
...

I'm going to disable DPKG_GENSYMBOLS_CHECK_LEVEL=4 for this job and re-approve this MP to make sure this extra check is not preventing merge of this MP.

[Francis Ginther (fginther)]

Update... The gensymbols issue should be resolved after https://code.launchpad.net/~mterry/bamf/c4/+merge/134313 lands. So, I will approve this MP after the c4 change has merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/22/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/22/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The c4 merge has landed, re-approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/26/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/26/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

This is a new failure (see amd64 log):
make test;
make[6]: Entering directory `/tmp/buildd/bamf-0.4.0bzr501pkg0quantal26/build/gtk2/tests/bamfdaemon'
TEST: ./test-bamf... (pid=11693)

(test-bamf:11693): Gtk-WARNING **: cannot open display: :101
FAIL: ./test-bamf
make[6]: *** [test] Error 1

I'm going to approve again to try and land this MP.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/27/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/27/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The latest failure is once again:
PASS: ./test-bamf
make[6]: Leaving directory `/tmp/buildd/bamf-0.4.0bzr501pkg0quantal27/build/gtk2/tests/bamfdaemon'
/bin/bash: line 1: kill: (6197) - No such process

Filed https://bugs.launchpad.net/bamf/+bug/1079329

[Marco Trevisan (Treviño) (3v1n0)]

Isn't this merged now?

the problem here is that I can't reproduce the failure locally...

=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2012-10-12 10:30:22 +0000
+++ lib/libbamf/bamf-matcher.c	2012-11-13 21:02:20 +0000
@@ -613,9 +613,12 @@
       view = _bamf_factory_view_for_path_type (factory, array[i], BAMF_FACTORY_APPLICATION);
 
       if (BAMF_IS_APPLICATION (view))
-        result = g_list_prepend (result, view);
+        {
+          if (!g_list_find (result, view))
+            result = g_list_prepend (result, view);
+        }
     }
-  
+
   g_strfreev (array);
   return result;
 }