diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-23 11:10:57 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-23 11:10:57 -0700 |
| commit | ae40e8f5cc10288391961f48c5e55a719f2f80d7 (patch) | |
| tree | 29bb888674bc186ee8bebac0b50d5c82313b135f | |
| parent | 4378ad458441e1431ea3bdaafd8d663d3061f6f3 (diff) | |
| parent | 8088926c086d7ac75cdbc7a83ceaa4d47aab0bb7 (diff) | |
| download | uhd-ae40e8f5cc10288391961f48c5e55a719f2f80d7.tar.gz uhd-ae40e8f5cc10288391961f48c5e55a719f2f80d7.tar.bz2 uhd-ae40e8f5cc10288391961f48c5e55a719f2f80d7.zip | |
Merge branch 'master' into next
| -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 |