Skip to content

Commit

Permalink
triggers: patch regexp matches
Browse files Browse the repository at this point in the history
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
  • Loading branch information
allisonkarlitskaya committed Feb 12, 2015
1 parent 12a5394 commit ceaa031
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion triggers/desktop-database.trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion triggers/glib.trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion triggers/gtk+.trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion triggers/immodules.trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion triggers/pango.trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ceaa031

Please sign in to comment.