Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: ports/pkg/nacl.patch

Issue 1425273003: Always use bzip2 compression for pkg metadata (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/pkg/nacl.patch
diff --git a/ports/pkg/nacl.patch b/ports/pkg/nacl.patch
index f1c7627c6e605315fefb71bb127ed13c7a39a9ec..bd9695960d1d532ff6b9b56d8f768f3d4a582732 100644
--- a/ports/pkg/nacl.patch
+++ b/ports/pkg/nacl.patch
@@ -1191,31 +1191,22 @@ diff --git a/libpkg/pkg_repo.c b/libpkg/pkg_repo.c
*rc = EPKG_OK;
return (res);
}
-@@ -890,9 +1052,21 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
+@@ -890,9 +1052,12 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
dbdir = pkg_object_string(pkg_config_get("PKG_DBDIR"));
+#ifdef __native_client__
+ char* tmp_file;
-+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "txz", t, &rc, &tmp_file);
++ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc, &tmp_file);
+#else
fd = pkg_repo_fetch_remote_tmp(repo, "meta", "txz", t, &rc);
- if (fd == -1)
- return (rc);
+#endif
-+ if (fd == -1) {
-+#ifdef __native_client__
-+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc, &tmp_file);
-+#else
-+ fd = pkg_repo_fetch_remote_tmp(repo, "meta", "tbz", t, &rc);
-+#endif
-+ if (fd == -1)
-+ return (rc);
-+ }
snprintf(filepath, sizeof(filepath), "%s/%s.meta", dbdir, pkg_repo_name(repo));
-@@ -922,12 +1096,18 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
+@@ -922,12 +1087,18 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
}
close(fd);
@@ -1234,7 +1225,7 @@ diff --git a/libpkg/pkg_repo.c b/libpkg/pkg_repo.c
/* Map meta file for extracting pubkeys from it */
if (stat(filepath, &st) == -1) {
pkg_emit_errno("pkg_repo_fetch_meta", "cannot stat meta fetched");
-@@ -947,6 +1127,7 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
+@@ -947,6 +1118,7 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)
rc = EPKG_FATAL;
goto cleanup;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698