import: three minor fixes

diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index 05b10621bc243039d208a5cf1b5669645b604715..8f26191c40fd90a9d7e95dd3b9f50a3e9180f275 100644 (file)
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -1131,7 +1131,7 @@ int dkr_import_pull(DkrImport *import, const char *name, const char *tag, const
                 n->force_local = force_local;
         }
 
                 n->force_local = force_local;
         }
 

-        r = hashmap_put(import->names, name, n);
+        r = hashmap_put(import->names, n->name, n);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

diff --git a/src/import/import.c b/src/import/import.c
index 8b9ca4f724044104c430f4833a4adcc44d0e0acd..54f311363a682409a57164727c1631e80d906950 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -73,7 +73,7 @@ static int pull_dkr(int argc, char *argv[], void *userdata) {
                         local = name;
         }
 
                         local = name;
         }
 

-        if (streq(local, "-") || isempty(local))
+        if (isempty(local) || streq(local, "-"))

                 local = NULL;
 
         if (!dkr_name_is_valid(name)) {
                 local = NULL;
 
         if (!dkr_name_is_valid(name)) {


@@ -89,7 +89,7 @@ static int pull_dkr(int argc, char *argv[], void *userdata) {
         if (local) {
                 const char *p;
 
         if (local) {
                 const char *p;
 

-                if (!machine_name_is_valid(tag)) {
+                if (!machine_name_is_valid(local)) {

                         log_error("Local image name '%s' is not valid.", local);
                         return -EINVAL;
                 }
                         log_error("Local image name '%s' is not valid.", local);
                         return -EINVAL;
                 }