From 8dcb910a2019518f8c3ec0e31e42d8647514de86 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sat, 2 Dec 2017 18:36:26 -0500
Subject: [PATCH] RepositoryRules: Do not use the downloaded repo.info.

Instead build the one in-tree from src/data/package_infos/. Fixes the
"HaikuPorts repos have wrong URL" problem that has occured since the
switch to buildmaster repos.
---
 build/jam/RepositoryRules | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index ac3ad99586..571d6a4ef2 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -175,13 +175,6 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
 	# Use a locally created dummy repository if downloads have been disabled.
 	# This is useful when trying to build everything locally from source.
 	if $(HAIKU_NO_DOWNLOADS) = 1 {
-		# build the dummy repository info file
-		local repositoryInfoTemplate = <repository-info-template>haikuports ;
-		SEARCH on $(repositoryInfoTemplate)
-			= $(HAIKU_TOP)/src/data/repository_infos ;
-		PreprocessPackageOrRepositoryInfo $(repositoryInfo)
-			: $(repositoryInfoTemplate) : $(architecture) ;
-
 		# build repository file
 		local packageFileNames = [
 			on $(packageListFile) return $(HAIKU_REPOSITORY_PACKAGE_FILE_NAMES)
@@ -195,18 +188,19 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
 		RepositoryCache $(repositoryFile) : $(repositoryInfo)
 			: $(packageFiles) ;
 	} else {
-		# download repository info file
-		local repoUrl = [ on $(repository) return $(HAIKU_REPOSITORY_URL) ] ;
-		DownloadLocatedFile $(repositoryInfo)
-			: "$(repoUrl)/`cat $source`/repo.info"
-			: $(packagesChecksumFile) ;
-
 		# download repository file
 		DownloadLocatedFile $(repositoryFile)
 			: "$(repoUrl)/`cat $source`/repo"
 			: $(packagesChecksumFile) ;
 	}
 
+	# build the repository info file
+	local repositoryInfoTemplate = <repository-info-template>haikuports ;
+	SEARCH on $(repositoryInfoTemplate)
+		= $(HAIKU_TOP)/src/data/repository_infos ;
+	PreprocessPackageOrRepositoryInfo $(repositoryInfo)
+		: $(repositoryInfoTemplate) : $(architecture) ;
+
 	# build repository config file
 	RepositoryConfig $(repositoryConfig) : $(repositoryInfo)
 		: $(packagesChecksumFile) ;