After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 796989 - gst-uninstalled: Add current branch in shell prompt
gst-uninstalled: Add current branch in shell prompt
Status: RESOLVED FIXED
Product: GStreamer
Classification: Platform
Component: gst-build
git master
Other Linux
: Normal normal
: 1.15.1
Assigned To: GStreamer Maintainers
GStreamer Maintainers
Depends on:
Blocks:
 
 
Reported: 2018-08-17 14:32 UTC by Philippe Normand
Modified: 2018-08-31 12:19 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
patch (3.32 KB, patch)
2018-08-17 14:37 UTC, Philippe Normand 		none Details | Review
updated patch (3.82 KB, patch)
2018-08-17 14:55 UTC, Philippe Normand 		committed Details | Review
follow-up (1.01 KB, patch)
2018-08-31 10:46 UTC, Philippe Normand 		committed Details | Review
meson: strip branch name when uninstalled (1.01 KB, patch)
2018-08-31 11:32 UTC, Víctor Manuel Jáquez Leal 		committed Details | Review

Description Philippe Normand 2018-08-17 14:32:34 UTC 
It can be retrieved using git, there's no need for a --gst-version command-line switch.
Comment 1 Philippe Normand 2018-08-17 14:37:20 UTC 
Created attachment 373397 [details] [review]
patch
Comment 2 Philippe Normand 2018-08-17 14:55:11 UTC 
Created attachment 373398 [details] [review]
updated patch
Comment 3 Thibault Saunier 2018-08-30 18:09:19 UTC 
Review of attachment 373398 [details] [review]:

lgtm
Comment 4 Philippe Normand 2018-08-31 10:05:17 UTC 
Comment on attachment 373398 [details] [review]
updated patch

commit c78f0ef2229925f48b0ffabc410c2ca35dcb0df9 (HEAD -> master)
Author: Philippe Normand <philn@igalia.com>
Date:   Fri Aug 17 15:33:09 2018 +0100

    gst-uninstalled: Display current git branch name in the shell prompt
    
    This is really useful when using multiple git worktrees.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796989
Comment 5 Víctor Manuel Jáquez Leal 2018-08-31 10:43:29 UTC 
I got a regression since I couldn't run an uninstalled shell because of this patch:

vjaquez@miau:~/gst/gst-build/gstreamer-vaapi (797039)$ ninja -C  ~/gst/gst-build/build uninstalled
ninja: Entering directory `/home/vjaquez/gst/gst-build/build'
[0/1] Running external command uninstalled.
Traceback (most recent call last):

+ Trace 238683

  • File "/opt/gst/gst-build/gst-uninstalled.py", line 249 in <module> 
    env=get_subprocess_env(options, gst_version)))
  • File "/usr/lib/python3.6/subprocess.py", line 267 in call 
    with Popen(*popenargs, **kwargs) as p:
  • File "/usr/lib/python3.6/subprocess.py", line 709 in __init__ 
    restore_signals, start_new_session)
  • File "/usr/lib/python3.6/subprocess.py", line 1344 in _execute_child 
    raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: '--gst-version=master': '--gst-version=master' 
FAILED: meson-uninstalled                                        
/usr/bin/python3 /usr/bin/meson --internal commandrunner /opt/gst/gst-build /opt/gst/gst-build/build '' /usr/bin/python3 /usr/bin/meson /opt/gst/gst-build/gst-uninstalled.py --builddir=/opt/gst/gst-build/build -
-srcdir=/opt/gst/gst-build --gst-version=master             
ninja: build stopped: subcommand failed.


meson 0.47.2
Comment 6 Philippe Normand 2018-08-31 10:46:18 UTC 
Created attachment 373513 [details] [review]
follow-up
Comment 7 Víctor Manuel Jáquez Leal 2018-08-31 11:32:42 UTC 
Created attachment 373514 [details] [review]
meson: strip branch name when uninstalled

Remove ending newlines characters on branch's name.
Comment 8 Thibault Saunier 2018-08-31 12:12:23 UTC 
Review of attachment 373514 [details] [review]:

OK
Comment 9 Thibault Saunier 2018-08-31 12:12:29 UTC 
Review of attachment 373513 [details] [review]:

OK
Comment 10 Philippe Normand 2018-08-31 12:18:38 UTC 
commit 13131122b7d2de1e55d305bbc494874a564dbc48 (HEAD -> master)
Author: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date:   Fri Aug 31 13:31:24 2018 +0200

    meson: strip branch name when uninstalled
    
    Remove ending newlines characters on branch's name.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796989

commit 51759df370a608c795d8277ec69bfadfae623992
Author: Philippe Normand <philn@igalia.com>
Date:   Fri Aug 31 11:44:17 2018 +0100

    meson: Follow-up fix for ninja uninstalled
    
    The --gst-version was removed in c78f0ef2229925f48b0ffabc410c2ca35dcb0df9 so
    remove it from the meson.build file as well.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796989