On Thu, May 12, 2011 at 02:43:34PM +0100, Roger Leigh wrote: > On Thu, May 12, 2011 at 02:12:09PM +0100, Roger Leigh wrote: > > On Thu, May 12, 2011 at 02:09:10PM +0100, Roger Leigh wrote: > > > Hi, > > > > > > I was informed today that dchroot-dsa was non-functional in stable, > > > and the same bug is also present in unstable. I filed this as > > > #626503. The patch is a one-liner to fix a regression in the > > > dchroot.conf conffile loading (the interface changed incompatibly > > > prior to squeeze being released, and this code is still using the > > > older interface, which results in a fatal exception being thrown). > > > > > > dchroot-dsa can load both dchroot.conf for compatibility, and > > > schroot.conf; presumably testing was with schroot.conf only which > > > is why this was not picked up prior to release. > > > > > > Would it be OK to upload a fixed version of the schroot package > > > to stable-proposed-updated containing just this one line fix? Attached is a debdiff of the build in a squeeze chroot; packages available at http://www.codelibre.net/~rleigh/schroot-squeeze/ Regards, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
diff -Nru schroot-1.4.19/debian/changelog schroot-1.4.19/debian/changelog
--- schroot-1.4.19/debian/changelog 2011-01-11 00:13:00.000000000 +0000
+++ schroot-1.4.19/debian/changelog 2011-05-13 22:09:28.000000000 +0100
@@ -1,3 +1,11 @@
+schroot (1.4.19-1+squeeze1) stable-proposed-updates; urgency=low
+
+ * dchroot-dsa: Use current interface for loading dchroot.conf,
+ rather than the old, which caused a fatal exception
+ (Closes: #626503).
+
+ -- Roger Leigh <rleigh@debian.org> Thu, 12 May 2011 14:31:01 +0100
+
schroot (1.4.19-1) unstable; urgency=low
* New upstream stable release.
diff -Nru schroot-1.4.19/debian/patches/debian-changes-1.4.19-1+squeeze1 schroot-1.4.19/debian/patches/debian-changes-1.4.19-1+squeeze1
--- schroot-1.4.19/debian/patches/debian-changes-1.4.19-1+squeeze1 1970-01-01 01:00:00.000000000 +0100
+++ schroot-1.4.19/debian/patches/debian-changes-1.4.19-1+squeeze1 2011-05-13 22:56:15.000000000 +0100
@@ -0,0 +1,39 @@
+Description: Upstream changes introduced in version 1.4.19-1+squeeze1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ schroot (1.4.19-1+squeeze1) stable-proposed-updates; urgency=low
+ .
+ * dchroot-dsa: Use current interface for loading dchroot.conf,
+ rather than the old, which caused a fatal exception
+ (Closes: #626503).
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Roger Leigh <rleigh@debian.org>
+Bug-Debian: http://bugs.debian.org/626503
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- schroot-1.4.19.orig/bin/dchroot-dsa/dchroot-dsa-main.cc
++++ schroot-1.4.19/bin/dchroot-dsa/dchroot-dsa-main.cc
+@@ -61,7 +61,7 @@ main::load_config ()
+ this->config =
+ sbuild::chroot_config::ptr(new dchroot_dsa::chroot_config);
+ if (this->options->load_chroots == true)
+- this->config->add(DCHROOT_CONF, false);
++ this->config->add("chroot", DCHROOT_CONF);
+ }
+ else
+ {
diff -Nru schroot-1.4.19/debian/patches/series schroot-1.4.19/debian/patches/series
--- schroot-1.4.19/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ schroot-1.4.19/debian/patches/series 2011-05-13 22:44:01.000000000 +0100
@@ -0,0 +1 @@
+debian-changes-1.4.19-1+squeeze1
Attachment:
signature.asc
Description: Digital signature