Project

General

Profile

Bug #1497

Missing TVHeadend version information

Added by virtual dj almost 12 years ago. Updated almost 12 years ago.

Status:
Fixed
Priority:
Normal
Assignee:
-
Category:
General
Target version:
-
Start date:
2013-01-04
Due date:
% Done:

100%

Estimated time:
Found in version:
5d2197c30f
Affected Versions:

Description

On some systems the --dirty switch of git-describe is not available, so the instruction on the support/version Bash script:

# Calculate version
if [ -d ".git" ]; then
   VER=$(cd $(dirname $0); git describe --dirty --match "v*" 2> /dev/null

fails because:

debian-x86:~/tvheadend/tvheadend# git-describe --dirty --match "v*"; echo $?
error: unknown option `dirty'
usage: git-describe [options] <committish>*

    --contains            find the tag that comes after the commit
    --debug               debug search strategy on stderr
    --all                 use any ref in .git/refs
    --tags                use any tag in .git/refs/tags
    --long                always use long format
    --abbrev[=<n>]        use <n> digits to display SHA-1s
    --exact-match         only output exact matches
    --candidates <n>      consider <n> most recent tags (default: 10)
    --match <pattern>     only consider tags matching <pattern>
    --always              show abbreviated commit object as fallback

129

debian-x86:~/tvheadend/tvheadend# git-describe --match "v*"; echo $?        
v3.3-183-g5d2197c
0

and the resulting version on TVHeadend Web UI is empty because:

debian-x86:~/tvheadend/tvheadend# cat src/version.c 
const char *tvheadend_version = "";

Please add error checking so that this specific case is provided.
Thanks.


Files

Version.patch (1.17 KB) Version.patch Patch for support/version file virtual dj, 2013-01-05 16:42

History

#1

Updated by virtual dj almost 12 years ago

It's the first time that I use git, so I don't know if I've done the things correctly.
However I've tried to attach a patch for support/version file that works on my system.

Bye.

#2

Updated by Adam Sutton almost 12 years ago

  • Category changed from 11 to General
  • Status changed from New to Accepted

Can you provide me your real name and email address, or something I can put against the commit. Just so it can be properly accredited.

Ta
Adam

#3

Updated by virtual dj almost 12 years ago

  • Status changed from Accepted to Fixed
  • % Done changed from 0 to 100

Applied in changeset commit:196780df42317682ea3fe3ff172e6039157a643d.

Also available in: Atom PDF