fix sha lookup

eth-cscs · Mar 16, 2024 · 6f18654 · 6f18654
1 parent a762e25
commit 6f18654
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/activate b/activate
@@ -30,31 +30,30 @@ function uenv {
 
     if [ "$1" = "--version" ]; then
         echo "@@version@@";
-        break
-    fi
-
-    flags=""
-    while [[ $# -gt 0 ]]; do
-        case $1 in
-            -?*|--*)
-                flags="$flags $1"
-                shift
-                ;;
-            *)
-                break
-                ;;
-        esac
-    done
-
-    if [[ $# -eq 0 ]]; then
-        uenv_usage;
-    elif [ "$1" = "image" ]; then
-        shift;
-        $UENV_IMG_CMD $flags "$@"
-    elif [[ " $* " =~ [[:space:]](-h|--help)[[:space:]] ]]; then
-        echo "$($UENV_CMD $flags "$@")"
     else
-        eval "$($UENV_CMD $flags "$@")"
+        flags=""
+        while [[ $# -gt 0 ]]; do
+            case $1 in
+                -?*|--*)
+                    flags="$flags $1"
+                    shift
+                    ;;
+                *)
+                    break
+                    ;;
+            esac
+        done
+
+        if [[ $# -eq 0 ]]; then
+            uenv_usage;
+        elif [ "$1" = "image" ]; then
+            shift;
+            $UENV_IMG_CMD $flags "$@"
+        elif [[ " $* " =~ [[:space:]](-h|--help)[[:space:]] ]]; then
+            echo "$($UENV_CMD $flags "$@")"
+        else
+            eval "$($UENV_CMD $flags "$@")"
+        fi
     fi
 
     unset -f uenv_usage

diff --git a/lib/datastore.py b/lib/datastore.py
@@ -73,9 +73,9 @@ def images(self):
 
     # return a list of records that match a sha
     def get_record(self, sha: str) -> Record:
-        if is_full_sha256(sha):
+        if names.is_full_sha256(sha):
             return self._images.get(sha, [])
-        elif is_short_sha256(sha):
+        elif names.is_short_sha256(sha):
             return self._images.get(self._short_sha[sha], [])
         raise ValueError(f"{sha} is not a valid sha256 or short (16 character) sha")