diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-13 07:49:50 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-13 07:49:50 -0700 |
| commit | af9db955eded5fc65ef1655f2404941f58b2612b (patch) | |
| tree | 74981acc96d09405827a537dbfe11c71fa879166 | |
| parent | 93d4a16f3b0b5f7ae20fa8852b2d659d0f8d0091 (diff) | |
| parent | 44b68ee80adbfc70869a5fc20ec93c4843f039e0 (diff) | |
| download | uhd-af9db955eded5fc65ef1655f2404941f58b2612b.tar.gz uhd-af9db955eded5fc65ef1655f2404941f58b2612b.tar.bz2 uhd-af9db955eded5fc65ef1655f2404941f58b2612b.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 6 | ||||
| -rwxr-xr-x | host/utils/usrp2_card_burner.py | 2 | ||||
| -rwxr-xr-x | host/utils/usrp_n2xx_net_burner.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 734ef97e6..13d952353 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -68,4 +68,8 @@ IF(UHD_RELEASE_MODE) ENDIF() ######################################################################## -SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") +IF(UHD_RELEASE_MODE STREQUAL "release") + SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}") +ELSE() + SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") +ENDIF() diff --git a/host/utils/usrp2_card_burner.py b/host/utils/usrp2_card_burner.py index 34c40d5a0..02d5c4b18 100755 --- a/host/utils/usrp2_card_burner.py +++ b/host/utils/usrp2_card_burner.py @@ -50,7 +50,7 @@ def command(*args): stderr=subprocess.STDOUT, ) ret = p.wait() - verbose = p.stdout.read().decode() + verbose = p.stdout.read().decode('utf-8', errors='ignore') if ret != 0: raise Exception(verbose) return verbose diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py index 31c94405b..ae6219524 100755 --- a/host/utils/usrp_n2xx_net_burner.py +++ b/host/utils/usrp_n2xx_net_burner.py @@ -134,7 +134,7 @@ def command(*args): stderr=subprocess.STDOUT, ) ret = p.wait() - verbose = p.stdout.read().decode() + verbose = p.stdout.read().decode('utf-8', errors='ignore') if ret != 0: raise Exception(verbose) return verbose |