Hi Adam,

thanks for yor answer.

On Sun, 2020-04-26 at 15:34 +0100, Adam D. Barratt wrote:
(...)

> We'd need to see diffs for a proposed upload before OKing anything
> here.

Sure; just was somewhat confused how to proceed in the 1st place ;).

I have now (correctly) flagged the bug as fixed in 1.0.37.

The proposed update will only address this

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951641

very bug (see attached diff). 

Fwiw, there is also more verbose description of the problem in this

https://salsa.debian.org/debian/mini-buildd/-/commit/3e267eafd66f70deedd9b90c4752130cdac0c8f7

commit message.

I hope I may proceed uploading this to buster?

Thx!

Stephan
diff -Nru mini-buildd-1.0.36/debian/changelog mini-buildd-1.0.36+deb10u1/debian/changelog
--- mini-buildd-1.0.36/debian/changelog	2018-06-22 16:30:15.000000000 +0200
+++ mini-buildd-1.0.36+deb10u1/debian/changelog	2020-04-28 08:18:54.000000000 +0200
@@ -1,3 +1,12 @@
+mini-buildd (1.0.36+deb10u1) buster; urgency=medium
+
+  * [36d75e1] debian/gbp.conf: Update debian branch.
+  * [85bd4e0] builder.py: sbuild call: set '--no-arch-all' explicitly
+    (Fixes "false" reprepro errors after successful builds w/ sbuild >=
+    0.77) (Fixes: #951641)
+
+ -- Stephan Sürken <abs...@debian.org>  Tue, 28 Apr 2020 08:18:54 +0200
+
 mini-buildd (1.0.36) unstable; urgency=medium
 
   * [9a29242] source.py: wizards: Update signing keys for unstable +
diff -Nru mini-buildd-1.0.36/debian/gbp.conf mini-buildd-1.0.36+deb10u1/debian/gbp.conf
--- mini-buildd-1.0.36/debian/gbp.conf	2018-06-22 14:51:53.000000000 +0200
+++ mini-buildd-1.0.36+deb10u1/debian/gbp.conf	2020-04-28 08:18:25.000000000 +0200
@@ -1,3 +1,3 @@
 [DEFAULT]
-debian-branch = 1.0.x
+debian-branch = buster-proposed-updates
 snapshot-number = os.popen("date --utc +'%Y%m%d%H%M%S'").readlines()[0]
diff -Nru mini-buildd-1.0.36/src/mini_buildd/builder.py mini-buildd-1.0.36+deb10u1/src/mini_buildd/builder.py
--- mini-buildd-1.0.36/src/mini_buildd/builder.py	2018-06-22 14:51:53.000000000 +0200
+++ mini-buildd-1.0.36+deb10u1/src/mini_buildd/builder.py	2020-04-28 08:18:25.000000000 +0200
@@ -213,6 +213,8 @@
 
         if "Arch-All" in self._breq:
             sbuild_cmd += ["--arch-all"]
+        else:
+            sbuild_cmd += ["--no-arch-all"]  # Be sure to set explicitly: sbuild >= 0.77 does not seem to use this as default any more?
 
         if "Run-Lintian" in self._breq:
             sbuild_cmd += ["--run-lintian"]
diff -Nru mini-buildd-1.0.36/src/mini_buildd/__init__.py mini-buildd-1.0.36+deb10u1/src/mini_buildd/__init__.py
--- mini-buildd-1.0.36/src/mini_buildd/__init__.py	2018-06-22 16:30:15.000000000 +0200
+++ mini-buildd-1.0.36+deb10u1/src/mini_buildd/__init__.py	2020-04-28 08:18:54.000000000 +0200
@@ -2,4 +2,4 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 
-__version__ = "1.0.36"
+__version__ = "1.0.36+deb10u1"

Reply via email to