diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2014-04-09 17:27:16 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-04-09 17:27:16 +0000 |
| commit | b5413916bac067e6db866c0a94b75ce9ad4703c0 (patch) | |
| tree | a92c5f2871190e8f1958d53bf2d2667cee674345 | |
| parent | 3b7b2267fd290cdaf6b5df4749c4e728aea21469 (diff) | |
| parent | a2e942b0ef7efe8558eebf5853497217c0dc44b9 (diff) | |
BamfMatcher: fix prefix regex for pythonX support
Fix preifx regex (used for converting /usr/bin/python[stuff] foo into foo) to work with pythonX as well as python and pythonX.Y (bzr r600)
| -rw-r--r-- | src/bamf-matcher.c | 2 | ||||
| -rw-r--r-- | tests/bamfdaemon/test-matcher.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bamf-matcher.c b/src/bamf-matcher.c index a04feb0b..9a073d23 100644 --- a/src/bamf-matcher.c +++ b/src/bamf-matcher.c @@ -55,7 +55,7 @@ static guint matcher_signals[LAST_SIGNAL] = { 0 }; const gchar* EXEC_BAD_PREFIXES[] = { "^gksu(do)?$", "^sudo$", "^su-to-root$", "^amdxdg-su$", "^java(ws)?$", "^cli$", - "^mono$", "^ruby$", "^padsp$", "^aoss$", "^python(\\d.\\d)?$", "^(ba)?sh$", + "^mono$", "^ruby$", "^padsp$", "^aoss$", "^python(\\d(\\.\\d)?)?$", "^(ba)?sh$", "^perl$", "^env$", "^xdg-open$", "^qmlscene$", "^qmlviewer$", "^unity-webapps-runner$", "^webapp-container$", /* javaws strings: */ "^net\\.sourceforge\\.jnlp\\.runtime\\.Boot$", "^rt\\.jar$", diff --git a/tests/bamfdaemon/test-matcher.c b/tests/bamfdaemon/test-matcher.c index c6f228c2..09877c01 100644 --- a/tests/bamfdaemon/test-matcher.c +++ b/tests/bamfdaemon/test-matcher.c @@ -1040,6 +1040,10 @@ test_trim_exec_string (void) g_assert_cmpstr (trimmed, ==, "bad-prefix-script"); g_free (trimmed); + trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/python3 /usr/bin/gnome-language-selector"); + g_assert_cmpstr (trimmed, ==, "gnome-language-selector"); + g_free (trimmed); + trimmed = bamf_matcher_get_trimmed_exec (matcher, "/usr/bin/python3.1"); g_assert_cmpstr (trimmed, ==, "python3.1"); g_free (trimmed); |