[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#240686: marked as done (choose-mirror: Strange code to detect country)



Your message dated Thu, 19 Aug 2004 09:32:02 -0400
with message-id <E1Bxn1O-0005RS-00@newraff.debian.org>
and subject line Bug#240686: fixed in choose-mirror 1.01
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 28 Mar 2004 18:40:06 +0000
>From martin@walnut.methody.org Sun Mar 28 10:40:06 2004
Return-path: <martin@walnut.methody.org>
Received: from public2-cosh5-6-cust60933.cosh.broadband.ntl.com (eames.methody.org) [80.4.152.5] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1B7fCX-0002ov-00; Sun, 28 Mar 2004 10:40:05 -0800
Received: from henry.methody.org (henry.methody.org [::ffff:10.10.10.13])
  (IDENT: Error)
  by eames.methody.org with esmtp; Sun, 28 Mar 2004 19:39:32 +0100
Received: from l4545 by henry.methody.org with local (Exim 3.36 #1 (Debian))
	id 1B7fC1-0003Mg-00; Sun, 28 Mar 2004 19:39:33 +0100
Date: Sun, 28 Mar 2004 19:39:33 +0100
From: Martin Orr <martin@walnut.methody.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: choose-mirror: Strange code to detect country
Message-ID: <20040328183926.GA12835@dummy.henry.methody.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Reportbug-Version: 2.55
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Package: choose-mirror
Version: 0.040
Severity: normal
Tags: patch

I'm not quite sure exactly what this code is supposed to do since
debconf_get will always return 0 unless the template doesn't exist:
if (debconf_get(debconf, DEBCONF_BASE "country") == 0)
	// Not set yet. Seed with a default value
	if ((debconf_get(debconf, "debian-installer/country") == 0) &&
	    (debconf->value != NULL) ) {
			country = strdup (debconf->value);
			debconf_set (debconf, DEBCONF_BASE "country", country);
	}
} else {
	country = debconf->value;
}

But according to the comments, I assume that it is supposed to set the value
of mirror/country to that of debian-installer/country iff it has not been set
already (e.g. by pre-seeding), so here is a patch to do that:
--- choose-mirror.c	(revision 12019)
+++ choose-mirror.c	(working copy)
@@ -122,7 +122,8 @@
 	country = NULL;
 
 	/* Pick a default country from elsewhere, eg countrychooser,*/
-	if (debconf_get(debconf, DEBCONF_BASE "country") == 0) {
+	debconf_get(debconf, DEBCONF_BASE "country");
+	if (strcmp(debconf->value, "question will be asked") == 0) {
 		// Not set yet. Seed with a default value
 		if ((debconf_get(debconf, "debian-installer/country") == 0) &&
 		    (debconf->value != NULL) ) {

-- 
Martin Orr
Linux Administrator,
Methodist College Belfast

---------------------------------------
Received: (at 240686-close) by bugs.debian.org; 19 Aug 2004 13:38:05 +0000
>From katie@ftp-master.debian.org Thu Aug 19 06:38:04 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Bxn7E-0006Ox-00; Thu, 19 Aug 2004 06:38:04 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1Bxn1O-0005RS-00; Thu, 19 Aug 2004 09:32:02 -0400
From: Joey Hess <joeyh@debian.org>
To: 240686-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#240686: fixed in choose-mirror 1.01
Message-Id: <E1Bxn1O-0005RS-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Thu, 19 Aug 2004 09:32:02 -0400
Delivered-To: 240686-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Source: choose-mirror
Source-Version: 1.01

We believe that the bug you reported is fixed in the latest version of
choose-mirror, which is due to be installed in the Debian FTP archive:

choose-mirror_1.01.dsc
  to pool/main/c/choose-mirror/choose-mirror_1.01.dsc
choose-mirror_1.01.tar.gz
  to pool/main/c/choose-mirror/choose-mirror_1.01.tar.gz
choose-mirror_1.01_i386.udeb
  to pool/main/c/choose-mirror/choose-mirror_1.01_i386.udeb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 240686@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joey Hess <joeyh@debian.org> (supplier of updated choose-mirror package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 27 Jul 2004 10:59:41 -0400
Source: choose-mirror
Binary: choose-mirror
Architecture: source i386
Version: 1.01
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Joey Hess <joeyh@debian.org>
Description: 
 choose-mirror - Choose mirror to install from (udeb)
Closes: 240686 266647 266758
Changes: 
 choose-mirror (1.01) unstable; urgency=low
 .
   * Joey Hess
     - Fabbione noticed that we forgot to free(command).
     - Only ask what suite to use at medium priority.
     - Clean debian/{ftp,http}list-countries.
     - Allow preseeding of country or forcing of manual mirror entry via
       mirror/country. Closes: #240686, #266647, #266758
Files: 
 99c8fcd50a6ac34739ed3f5335ed536b 720 debian-installer extra choose-mirror_1.01.dsc
 1b9178c4ccced6ca905e658ff4d05826 133559 debian-installer extra choose-mirror_1.01.tar.gz
 de186772825d07d4f776c6afa2974018 84724 debian-installer extra choose-mirror_1.01_i386.udeb
package-type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBJKlM2tp5zXiKP0wRAkNMAJ9sAiuzxSsYmQ1VFGEik1J7QJHoJgCdE4CN
BmvFI6Ys2Cjq+ErwnDWf3jE=
=kyMr
-----END PGP SIGNATURE-----



Reply to: