diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-05-17 14:09:47 -0700 | 
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-05-17 14:09:47 -0700 | 
| commit | 174bde6cc17c901b116c99fea8f1888c96f7823b (patch) | |
| tree | 5d5df5385ece52acceb9763ae50ebacc57d0d719 /images/uhdimgs.py | |
| parent | 9591c93dd53f95b845ceead39eaaf219dc18659b (diff) | |
| download | uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.tar.gz uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.tar.bz2 uhd-174bde6cc17c901b116c99fea8f1888c96f7823b.zip | |
images: Update scripts for new release model
- populate_images.py: Made Py3k safe
- uhdimgs.py: Make Py3k-safe
- create_imgs_package.py: Rewrote to build release images packages
- make_zip.sh: Skip CMake, just zip up the files
- Updated README to reflect all the changes
Diffstat (limited to 'images/uhdimgs.py')
| -rw-r--r-- | images/uhdimgs.py | 23 | 
1 files changed, 7 insertions, 16 deletions
| diff --git a/images/uhdimgs.py b/images/uhdimgs.py index 77da36c0d..fa0b0ac86 100644 --- a/images/uhdimgs.py +++ b/images/uhdimgs.py @@ -1,24 +1,15 @@  #!/usr/bin/env python  #  # Copyright 2014 Ettus Research LLC +# Copyright 2018 Ettus Research, a National Instruments Company  # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program.  If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-3.0-or-later  #  """  Utility module for packaging and handling UHD binary images.  """ +from __future__ import print_function  import re  import os  import sys @@ -75,12 +66,12 @@ def get_total_md5(img_dir):              for filename in filenames:                  md5_obj.update(open(os.path.join(root, filename), 'rb').read())                  sys.stdout.write('.') -                sys.stdout.flus() +                sys.stdout.flush()              for dirname in dirnames:                  _update_md5_for_dir_recursive(os.path.join(root, dirname), md5_obj)      md5 = hashlib.md5()      _update_md5_for_dir_recursive(img_dir, md5) -    print "" +    print("")      return md5.hexdigest()  def md5_checksum(filePath): @@ -94,6 +85,6 @@ def md5_checksum(filePath):                      break                  m.update(data)              return m.hexdigest() -    except Exception, e: -        print "Failed to calculated MD5 sum of: %s (%s)" % (filePath, e) +    except Exception as e: +        print("Failed to calculated MD5 sum of: %s (%s)" % (filePath, e))          raise e | 
