import: don't log "fake" errno values

keszybz · keszybz · commit 92dfd88bc919 · 2016-07-22T21:25:09.000-04:00
diff --git a/src/import/import.c b/src/import/import.c
@@ -90,7 +90,7 @@ static int import_tar(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
                         else if (r > 0) {
-                                log_error_errno(EEXIST, "Image '%s' already exists.", local);
+                                log_error("Image '%s' already exists.", local);
                                 return -EEXIST;
                         }
                 }
@@ -185,7 +185,7 @@ static int import_raw(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
                         else if (r > 0) {
-                                log_error_errno(EEXIST, "Image '%s' already exists.", local);
+                                log_error("Image '%s' already exists.", local);
                                 return -EEXIST;
                         }
                 }
diff --git a/src/import/pull.c b/src/import/pull.c
@@ -97,7 +97,7 @@ static int pull_tar(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
                         else if (r > 0) {
-                                log_error_errno(EEXIST, "Image '%s' already exists.", local);
+                                log_error("Image '%s' already exists.", local);
                                 return -EEXIST;
                         }
                 }
@@ -183,7 +183,7 @@ static int pull_raw(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
                         else if (r > 0) {
-                                log_error_errno(EEXIST, "Image '%s' already exists.", local);
+                                log_error("Image '%s' already exists.", local);
                                 return -EEXIST;
                         }
                 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static int import_tar(int argc, char argv[], void userdata) {`
`90`	`90`	`if (r < 0)`
`91`	`91`	`return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);`
`92`	`92`	`else if (r > 0) {`
`93`		`- log_error_errno(EEXIST, "Image '%s' already exists.", local);`
	`93`	`+ log_error("Image '%s' already exists.", local);`
`94`	`94`	`return -EEXIST;`
`95`	`95`	`}`
`96`	`96`	`}`
`@@ -185,7 +185,7 @@ static int import_raw(int argc, char argv[], void userdata) {`
`185`	`185`	`if (r < 0)`
`186`	`186`	`return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);`
`187`	`187`	`else if (r > 0) {`
`188`		`- log_error_errno(EEXIST, "Image '%s' already exists.", local);`
	`188`	`+ log_error("Image '%s' already exists.", local);`
`189`	`189`	`return -EEXIST;`
`190`	`190`	`}`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ static int pull_tar(int argc, char argv[], void userdata) {`
`97`	`97`	`if (r < 0)`
`98`	`98`	`return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);`
`99`	`99`	`else if (r > 0) {`
`100`		`- log_error_errno(EEXIST, "Image '%s' already exists.", local);`
	`100`	`+ log_error("Image '%s' already exists.", local);`
`101`	`101`	`return -EEXIST;`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -183,7 +183,7 @@ static int pull_raw(int argc, char argv[], void userdata) {`
`183`	`183`	`if (r < 0)`
`184`	`184`	`return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);`
`185`	`185`	`else if (r > 0) {`
`186`		`- log_error_errno(EEXIST, "Image '%s' already exists.", local);`
	`186`	`+ log_error("Image '%s' already exists.", local);`
`187`	`187`	`return -EEXIST;`
`188`	`188`	`}`
`189`	`189`	`}`