shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

import: three minor fixes

Browse Source
This commit is contained in:
Lennart Poettering 2014-12-24 16:43:46 +01:00
parent a36544cd45
commit 0c7bf33a98
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/import/import-dkr.c
View File

@ -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) if (r < 0)
return r; return r;

4
src/import/import.c
View File

@ -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; local = NULL;
if (!dkr_name_is_valid(name)) { if (!dkr_name_is_valid(name)) {
@ -89,7 +89,7 @@ static int pull_dkr(int argc, char *argv[], void *userdata) {
if (local) { if (local) {
const char *p; 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); log_error("Local image name '%s' is not valid.", local);
return -EINVAL; return -EINVAL;
} }