[jhbuild] triggers: patch regexp matches
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] triggers: patch regexp matches
- Date: Thu, 12 Feb 2015 14:41:24 +0000 (UTC)
commit ceaa03131d0ccdf80797228dd901a0af82bd12f8
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Feb 11 15:43:21 2015 -0500
triggers: patch regexp matches
A few triggers (most noticeably pango) had their triggers defined as a
filename containing "/lib/" appearing in the manifest. Now that the
manifest contains relative paths, this was failing to match the "lib/"
that is now at the start of the line.
Change the expression to use ^ instead of /.
https://bugzilla.gnome.org/show_bug.cgi?id=709746
triggers/desktop-database.trigger | 2 +-
triggers/glib.trigger | 2 +-
triggers/gtk+.trigger | 2 +-
triggers/immodules.trigger | 2 +-
triggers/pango.trigger | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger
index 198ff50..ebe7606 100644
--- a/triggers/desktop-database.trigger
+++ b/triggers/desktop-database.trigger
@@ -17,6 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# IfExecutable: update-desktop-database
-# REMatch: /share/applications/.*\.desktop
+# REMatch: ^share/applications/.*\.desktop
update-desktop-database -q
diff --git a/triggers/glib.trigger b/triggers/glib.trigger
index f9f08e7..dc51038 100644
--- a/triggers/glib.trigger
+++ b/triggers/glib.trigger
@@ -17,6 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# IfExecutable: glib-compile-schemas
-# LiteralMatch: /share/glib-2.0/schemas/
+# LiteralMatch: ^share/glib-2.0/schemas/
glib-compile-schemas $JHBUILD_PREFIX/share/glib-2.0/schemas
diff --git a/triggers/gtk+.trigger b/triggers/gtk+.trigger
index 2e598fb..d15827d 100644
--- a/triggers/gtk+.trigger
+++ b/triggers/gtk+.trigger
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# IfExecutable: gtk-update-icon-cache
-# LiteralMatch: /share/icons/
+# LiteralMatch: ^share/icons/
for dir in $JHBUILD_PREFIX/share/icons/*; do
if test -f $dir/index.theme; then
diff --git a/triggers/immodules.trigger b/triggers/immodules.trigger
index 1248c1e..2ad09cd 100644
--- a/triggers/immodules.trigger
+++ b/triggers/immodules.trigger
@@ -17,6 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# IfExecutable: gtk-query-immodules-3.0
-# REMatch: /lib.*/gtk-3\.0/3\.0\.0/immodules/.*\.so
+# REMatch: ^lib.*/gtk-3\.0/3\.0\.0/immodules/.*\.so
gtk-query-immodules-3.0 --update-cache
diff --git a/triggers/pango.trigger b/triggers/pango.trigger
index 65a4990..415eb8d 100644
--- a/triggers/pango.trigger
+++ b/triggers/pango.trigger
@@ -18,6 +18,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# IfExecutable: pango-querymodules
-# REMatch: /lib.*/pango/.*/modules/.*\.so
+# REMatch: ^lib.*/pango/.*/modules/.*\.so
pango-querymodules --update-cache
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]