ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare non-secure image name without extension 

- For cases where non-secure image is HEX and secure image is BIN
pull/9894/head
Michael Schwarcz 2019-03-06 16:24:12 +02:00
parent f15505714a
commit 1f7a829e62
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/psa/__init__.py
View File

@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from os.path import basename from os.path import basename, splitext
from tools.resources import FileType from tools.resources import FileType
@ -29,7 +29,10 @@ def find_secure_image(notify, resources, ns_image_path, configured_s_image_filen
assert image_files, 'No image files found for this target' assert image_files, 'No image files found for this target'
secure_image = next((f for f in image_files if basename(f) == configured_s_image_filename), None) secure_image = next((f for f in image_files if basename(f) == configured_s_image_filename), None)
secure_image = next((f for f in image_files if basename(f) == basename(ns_image_path)), secure_image) secure_image = next(
(f for f in image_files if splitext(basename(f))[0] == splitext(basename(ns_image_path))[0]),
secure_image
)
if secure_image: if secure_image:
notify.debug("Secure image file found: %s." % secure_image) notify.debug("Secure image file found: %s." % secure_image)