fcd3ca3 Do not warn twice (and incorrectly so) about the same issue in do_extract. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Do not warn twice (and incorrectly so) about the same issue in do_extract.

Gerald Pfeifer committed 12 years ago

commit fcd3ca370674f77026c3d8881ad6b8e75bca78a9
parent b000ac0

1 file changed +3 -2

modified libpkg/pkg_add.c

@@ -66,7 +66,7 @@ do_extract(struct archive *a, struct archive_entry *ae)

 				pkg_emit_error("archive_read_extract(): %s",
 				    archive_error_string(a));
 				retcode = EPKG_FATAL;
 				break;
 				goto cleanup;
 			}
 		}

@@ -86,7 +86,7 @@ do_extract(struct archive *a, struct archive_entry *ae)

 				pkg_emit_error("archive_read_extract(): %s",
 				    archive_error_string(a));
 				retcode = EPKG_FATAL;
 				break;
 				goto cleanup;
 			}
 		}
 	} while ((ret = archive_read_next_header(a, &ae)) == ARCHIVE_OK);

@@ -97,6 +97,7 @@ do_extract(struct archive *a, struct archive_entry *ae)

 		retcode = EPKG_FATAL;
 	}
 cleanup:
 	return (retcode);
 }