diff options
author | Josh Blum <josh@joshknows.com> | 2012-04-22 16:27:26 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-22 16:27:26 -0700 |
commit | 8088926c086d7ac75cdbc7a83ceaa4d47aab0bb7 (patch) | |
tree | a9f33866a58d80f18a5d20d3bfeac4a65729e0d3 | |
parent | 81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff) | |
parent | 4286d07d7a31812ba16d67d3c7e0c05a27e444cb (diff) | |
download | uhd-8088926c086d7ac75cdbc7a83ceaa4d47aab0bb7.tar.gz uhd-8088926c086d7ac75cdbc7a83ceaa4d47aab0bb7.tar.bz2 uhd-8088926c086d7ac75cdbc7a83ceaa4d47aab0bb7.zip |
Merge branch 'maint'
-rwxr-xr-x | host/utils/usrp2_card_burner.py | 2 | ||||
-rwxr-xr-x | host/utils/usrp_n2xx_net_burner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/utils/usrp2_card_burner.py b/host/utils/usrp2_card_burner.py index 02d5c4b18..8e4a4f224 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('utf-8', errors='ignore') + verbose = p.stdout.read().decode('utf-8') 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 6d1c02712..835ab696f 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('utf-8', errors='ignore') + verbose = p.stdout.read().decode('utf-8') if ret != 0: raise Exception(verbose) return verbose |