[pitivi] Prevent translation files in gst-plugins-base from blocking the build script
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Prevent translation files in gst-plugins-base from blocking the build script
- Date: Fri, 25 Jan 2013 20:37:44 +0000 (UTC)
commit ba4d63ed115aa0f260c1e156dfa907646ca0ec36
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date: Tue Jan 22 14:13:52 2013 -0500
Prevent translation files in gst-plugins-base from blocking the build script
bin/pitivi-git-environment.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 1cb7d82..2342e6b 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -313,9 +313,9 @@ if [ "$ready_to_run" != "1" ]; then
fi
fi
# Silly hack for the fact that the version-controlled po/ files are
- # changed during compilation of the "gstreamer" module, which prevents
- # git pull --rebase from working
- if [ $m == "gstreamer" ]; then
+ # changed during compilation of the "gstreamer" and "gst-plugins-base"
+ # modules, which prevents git pull --rebase from working
+ if [ $m == "gstreamer" ] || [ $m == "gst-plugins-base" ]; then
git checkout -- po
fi
if [ $GST_RELEASE_TAG == "master" ]; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]