[cowdancer] 01/01: cowbuilder: Always pass --mirror and --distribution to pbuilder

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27 pushed a commit to branch master
in repository cowdancer.

commit 2c85435670ceab31c0303a3429679aed93c9addf
Author: James Clarke <jrtc27 at debian.org>
Date:   Wed Oct 18 16:33:22 2017 +0100

    cowbuilder: Always pass --mirror and --distribution to pbuilder
    
    These have a (currently undocumented) effect for login and execute, and
    have a documented effect for build. Additionally, rather than filtering
    them out based on --override-config, by always passing them on pbuilder
    will give a warning if --override-config was not given and sources.list
    will be stale.
---
 cowbuilder.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/cowbuilder.c b/cowbuilder.c
index f6b0b5c..0427805 100644
--- a/cowbuilder.c
+++ b/cowbuilder.c
@@ -341,10 +341,16 @@ int cpbuilder_build(const struct pbuilderconfig *pc, const char *dscfile_) {
 		PBUILDER_ADD_PARAM("--buildresult");
 		PBUILDER_ADD_PARAM(pc->buildresult);
 	}
+	if (pc->mirror) {
+		PBUILDER_ADD_PARAM("--mirror");
+		PBUILDER_ADD_PARAM(pc->mirror);
+	}
 	if (pc->arch) {
 		PBUILDER_ADD_PARAM("--architecture");
 		PBUILDER_ADD_PARAM(pc->arch);
 	}
+	PBUILDER_ADD_PARAM("--distribution");
+	PBUILDER_ADD_PARAM(pc->distribution);
 	if (pc->extrapackages) {
 		PBUILDER_ADD_PARAM("--extrapackages");
 		PBUILDER_ADD_PARAM(pc->extrapackages);
@@ -476,6 +482,12 @@ int cpbuilder_login(const struct pbuilderconfig *pc) {
 	pbuildercommandline[1] = "login";
 	PBUILDER_ADD_PARAM("--buildplace");
 	PBUILDER_ADD_PARAM(pc->buildplace);
+	if (pc->mirror) {
+		PBUILDER_ADD_PARAM("--mirror");
+		PBUILDER_ADD_PARAM(pc->mirror);
+	}
+	PBUILDER_ADD_PARAM("--distribution");
+	PBUILDER_ADD_PARAM(pc->distribution);
 	PBUILDER_ADD_PARAM("--no-targz");
 	PBUILDER_ADD_PARAM("--internal-chrootexec");
 	PBUILDER_ADD_PARAM(buf_chroot);
@@ -528,6 +540,12 @@ int cpbuilder_execute(const struct pbuilderconfig *pc, char **av) {
 	pbuildercommandline[1] = "execute";
 	PBUILDER_ADD_PARAM("--buildplace");
 	PBUILDER_ADD_PARAM(pc->buildplace);
+	if (pc->mirror) {
+		PBUILDER_ADD_PARAM("--mirror");
+		PBUILDER_ADD_PARAM(pc->mirror);
+	}
+	PBUILDER_ADD_PARAM("--distribution");
+	PBUILDER_ADD_PARAM(pc->distribution);
 	PBUILDER_ADD_PARAM("--no-targz");
 	PBUILDER_ADD_PARAM("--internal-chrootexec");
 	PBUILDER_ADD_PARAM(buf_chroot);
@@ -625,14 +643,12 @@ int cpbuilder_update(const struct pbuilderconfig *pc) {
 	pbuildercommandline[1] = "update";
 	PBUILDER_ADD_PARAM("--buildplace");
 	PBUILDER_ADD_PARAM(pc->buildplace);
-	if (find_matching_param("--override-config")) {
-		if (pc->mirror) {
-			PBUILDER_ADD_PARAM("--mirror");
-			PBUILDER_ADD_PARAM(pc->mirror);
-		}
-		PBUILDER_ADD_PARAM("--distribution");
-		PBUILDER_ADD_PARAM(pc->distribution);
+	if (pc->mirror) {
+		PBUILDER_ADD_PARAM("--mirror");
+		PBUILDER_ADD_PARAM(pc->mirror);
 	}
+	PBUILDER_ADD_PARAM("--distribution");
+	PBUILDER_ADD_PARAM(pc->distribution);
 	if (pc->extrapackages) {
 		PBUILDER_ADD_PARAM("--extrapackages");
 		PBUILDER_ADD_PARAM(pc->extrapackages);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git