downloadOnlyServers.patch - Packages - Parabola Issue Tracker

lib/libalpm/alpm.h
998	998	alpm_list_t alpm_db_get_servers(const alpm_db_t db);
999	999	int alpm_db_set_servers(alpm_db_t db, alpm_list_t servers);
1000	1000	int alpm_db_add_server(alpm_db_t db, const char url);
	1001	int alpm_db_add_download_server(alpm_db_t db, const char url);
1001	1002	int alpm_db_remove_server(alpm_db_t db, const char url);
1002	1003	/** @} */
1003	1004

     	return 0;
+    }
     /** Add a download server to a database.
      * @param db database pointer
      * @param url url of the server
      * @return 0 on success, -1 on error (pm_errno is set accordingly)
      */
     int SYMEXPORT alpm_db_add_download_server(alpm_db_t *db, const char *url)
+    {
     	char *newurl;
     	/* Sanity checks */
     	ASSERT(db != NULL, return -1);
     	db->handle->pm_errno = 0;
     	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(db->handle, ALPM_ERR_WRONG_ARGS, -1));
     	newurl = sanitize_url(url);
     	if(!newurl) {
     		return -1;
+    	}
     	db->download_servers = alpm_list_add(db->download_servers, newurl);
     	_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding new download server URL to database '%s': %s\n",
     			db->treename, newurl);
     	return 0;
+    }
     /** Remove a download server from a database.
      * @param db database pointer
      * @param url url of the server

lib/libalpm/db.h
70	70	alpm_pkghash_t *pkgcache;
71	71	alpm_list_t *grpcache;
72	72	alpm_list_t *servers;
	73	alpm_list_t *download_servers;
73	74	struct db_operations *ops;
74	75	/* flags determining validity, local, loaded caches, etc. */
75	76	enum _alpm_dbstatus_t status;

     		if(spkg->origin != ALPM_PKG_FROM_FILE && repo == spkg->origin_data.db) {
     			alpm_list_t *delta_path = spkg->delta_path;
     			if(!repo->servers) {
     			if(!repo->download_servers) {
     				handle->pm_errno = ALPM_ERR_SERVER_NONE;
     				_alpm_log(handle, ALPM_LOG_ERROR, "%s: %s\n",
     						alpm_strerror(handle->pm_errno), repo->treename);
-...
     					alpm_delta_t *delta = dlts->data;
     					if(delta->download_size != 0) {
     						struct dload_payload *payload = build_payload(
     								handle, delta->delta, delta->delta_size, repo->servers);
     								handle, delta->delta, delta->delta_size, repo->download_servers);
     						ASSERT(payload, return -1);
     						*files = alpm_list_add(*files, payload);
+    					}
-...
     			} else if(spkg->download_size != 0) {
     				struct dload_payload *payload;
     				ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1));
     				payload = build_payload(handle, spkg->filename, spkg->size, repo->servers);
     				payload = build_payload(handle, spkg->filename, spkg->size, repo->download_servers);
     				ASSERT(payload, return -1);
     				*files = alpm_list_add(*files, payload);
+    			}

+    	}
     	free(repo->name);
     	FREELIST(repo->servers);
     	FREELIST(repo->download_servers);
     	free(repo);
+    }
-...
     	return 0;
+    }
     static int _add_download_mirror(alpm_db_t *db, char *value)
+    {
     	const char *dbname = alpm_db_get_name(db);
     	/* let's attempt a replacement for the current repo */
     	char *temp = strreplace(value, "$repo", dbname);
     	/* let's attempt a replacement for the arch */
     	const char *arch = config->arch;
     	char *server;
     	if(arch) {
     		server = strreplace(temp, "$arch", arch);
     		free(temp);
     	} else {
     		if(strstr(temp, "$arch")) {
     			free(temp);
     			pm_printf(ALPM_LOG_ERROR,
     					_("download mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"),
     					value, "$arch", "Architecture");
     			return 1;
+    		}
     		server = temp;
+    	}
     	if(alpm_db_add_download_server(db, server) != 0) {
     		/* pm_errno is set by alpm_db_setserver */
     		pm_printf(ALPM_LOG_ERROR, _("could not add download server URL to database '%s': %s (%s)\n"),
     				dbname, server, alpm_strerror(alpm_errno(config->handle)));
     		free(server);
     		return 1;
+    	}
     	free(server);
     	return 0;
+    }
     static int register_repo(config_repo_t *repo)
+    {
     	alpm_list_t *i;
-...
+    		}
+    	}
     	for(i = repo->download_servers; i; i = alpm_list_next(i)) {
     		char *value = i->data;
     		if(_add_download_mirror(db, value) != 0) {
     			pm_printf(ALPM_LOG_ERROR,
     					_("could not add download mirror '%s' to database '%s' (%s)\n"),
     					value, repo->name, alpm_strerror(alpm_errno(config->handle)));
     			return 1;
+    		}
+    	}
     	return 0;
+    }
-...
     			ret = 1;
     		} else {
     			repo->servers = alpm_list_add(repo->servers, strdup(value));
     			repo->download_servers = alpm_list_add(repo->download_servers, strdup(value));
+    		}
     	} else if(strcmp(key, "ServerNoUpdate") == 0) {
     		if(!value) {
     			pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"),
     					file, line, key);
     			ret = 1;
     		} else {
     			repo->download_servers = alpm_list_add(repo->download_servers, strdup(value));
+    		}
     	} else if(strcmp(key, "SigLevel") == 0) {
     		if(!value) {

src/pacman/conf.h
37	37	typedef struct __config_repo_t {
38	38	char *name;
39	39	alpm_list_t *servers;
	40	alpm_list_t *download_servers;
40	41	alpm_db_usage_t usage;
41	42	alpm_siglevel_t siglevel;
42	43	alpm_siglevel_t siglevel_mask;

Parabola GNU/Linux-libre

Project

General

Profile

Packages

Bug #1102 » downloadOnlyServers.patch