From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Dec 2014 15:43:46 +0000 (+0100)
Subject: import: three minor fixes
X-Git-Tag: v219~848
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0c7bf33a989a58922b3eb9aaa96abd773c8754c4;p=elogind.git

import: three minor fixes
---

diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index 05b10621b..8f26191c4 100644
--- 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;
         }
 
-        r = hashmap_put(import->names, name, n);
+        r = hashmap_put(import->names, n->name, n);
         if (r < 0)
                 return r;
 
diff --git a/src/import/import.c b/src/import/import.c
index 8b9ca4f72..54f311363 100644
--- 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;
         }
 
-        if (streq(local, "-") || isempty(local))
+        if (isempty(local) || streq(local, "-"))
                 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 (!machine_name_is_valid(tag)) {
+                if (!machine_name_is_valid(local)) {
                         log_error("Local image name '%s' is not valid.", local);
                         return -EINVAL;
                 }