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

Bug#1090054: marked as done (dh_qmldeps: multiple issues with architecture handling)

Your message dated Mon, 16 Dec 2024 08:49:04 +0000
with message-id <E1tN6mm-00H8PJ-Q5@fasolo.debian.org>
and subject line Bug#1090054: fixed in pkg-kde-tools 0.18.11
has caused the Debian Bug report #1090054,
regarding dh_qmldeps: multiple issues with architecture handling
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1090054: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1090054
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: pkg-kde-tools
Filename: /usr/bin/dh_qmldeps
Version: 0.18.10
Tags: patch

Hi Sandro,

here goes my promised patch for improving the architecture handling in
dh_qmldeps. Let me know if you have any questions.

Helmut

diff --minimal -Nru pkg-kde-tools-0.18.10/debian/changelog pkg-kde-tools-0.18.10+nmu1/debian/changelog
--- pkg-kde-tools-0.18.10/debian/changelog	2024-12-11 00:12:23.000000000 +0100
+++ pkg-kde-tools-0.18.10+nmu1/debian/changelog	2024-12-15 19:29:55.000000000 +0100
@@ -1,3 +1,13 @@
+pkg-kde-tools (0.18.10+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve architecture handling in dh_qmldeps:
+    + Fix build vs host confusion.
+    + Speed up architecture detection using environment
+    + Correctly match architecture patterns
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 15 Dec 2024 19:29:55 +0100
+
 pkg-kde-tools (0.18.10) unstable; urgency=medium
 
   * dh_qmldeps:
diff --minimal -Nru pkg-kde-tools-0.18.10/dh_qmldeps pkg-kde-tools-0.18.10+nmu1/dh_qmldeps
--- pkg-kde-tools-0.18.10/dh_qmldeps	2024-12-11 00:11:54.000000000 +0100
+++ pkg-kde-tools-0.18.10+nmu1/dh_qmldeps	2024-12-15 19:29:55.000000000 +0100
@@ -17,6 +17,8 @@
     sys.path.insert(0, str(parent_path))
     PKGKDE_GETQMLDEPENDS = parent_path/"pkgkde-getqmldepends"
 
+from debian.debian_support import DpkgArchTable
+
 from pythonlib import qmldeps
 
 logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: %(message)s')
@@ -65,7 +67,12 @@
 arch_any = "-a" in getqmldepends_glob_args
 arch_all = "-i" in getqmldepends_glob_args
 
-target_arch = subprocess.check_output(["dpkg-architecture", "-qDEB_TARGET_ARCH"]).strip().decode()
+try:
+    host_arch = os.environ["DEB_HOST_ARCH"]
+except KeyError:
+    host_arch = subprocess.check_output(["dpkg-architecture", "-qDEB_HOST_ARCH"]).strip().decode()
+
+archtable = DpkgArchTable.load_arch_table()
 
 if not arch_any and not arch_all:
     arch_any = True
@@ -79,13 +86,8 @@
         skip = False
     elif arch_all and "all" in archs:
         skip = False
-    elif arch_any:
-        if "any" in archs:
-            skip = False
-        elif target_arch in archs:
-            skip = False
-        elif archs != ["all"] and not target_arch:
-            log.warning(f"{pkg_name}: SKIP - set DEB_TARGET_ARCH environment variable.")
+    elif arch_any and any(archtable.matches_architecture(host_arch, arch) for arch in archs):
+        skip = False
 
     if skip:
         continue

--- End Message ---
--- Begin Message --- 
Source: pkg-kde-tools
Source-Version: 0.18.11
Done: Sandro Knauß <hefee@debian.org>

We believe that the bug you reported is fixed in the latest version of
pkg-kde-tools, which is due to be installed in the Debian FTP archive.

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 1090054@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sandro Knauß <hefee@debian.org> (supplier of updated pkg-kde-tools 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@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 16 Dec 2024 09:33:29 +0100
Source: pkg-kde-tools
Architecture: source
Version: 0.18.11
Distribution: unstable
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Sandro Knauß <hefee@debian.org>
Closes: 1090054
Changes:
 pkg-kde-tools (0.18.11) unstable; urgency=medium
 .
   [ Helmut Grohne ]
   * Improve architecture handling in dh_qmldeps (Closes: #1090054):
     + Fix build vs host confusion.
     + Speed up architecture detection using environment.
     + Correctly match architecture patterns.
Checksums-Sha1:
 f1d7b11b60d20998f45ec0053295436a39479b28 2024 pkg-kde-tools_0.18.11.dsc
 dda9f82cd96b0eacc4ed65a73e193347ae0d2f5b 110340 pkg-kde-tools_0.18.11.tar.xz
 f5c94b92c9ca373870a4d7af709da8153829850e 8842 pkg-kde-tools_0.18.11_source.buildinfo
Checksums-Sha256:
 a58fe47214b95c34e9ca50cb146db2803cef281e39504080da43a58d9acf020c 2024 pkg-kde-tools_0.18.11.dsc
 cb4e619d2bdd9aadc06875bf0897f013ea844c9f85780d340c84f56f37aa8a8e 110340 pkg-kde-tools_0.18.11.tar.xz
 ea0058399aa4011fd54781036c059a2b60ee95416dedf492e02c2c981391796f 8842 pkg-kde-tools_0.18.11_source.buildinfo
Files:
 c4b48196807d5b018d72ecbd607a1b0f 2024 devel optional pkg-kde-tools_0.18.11.dsc
 74f773ed42e00ca5bc34a47ed7ec2258 110340 devel optional pkg-kde-tools_0.18.11.tar.xz
 8a58b52cd8f70ebec6041dff6953a0c1 8842 devel optional pkg-kde-tools_0.18.11_source.buildinfo

-----BEGIN PGP SIGNATURE-----

wsG7BAEBCgBvBYJnX+YvCRDjrbAIUGBWNkcUAAAAAAAeACBzYWx0QG5vdGF0aW9u
cy5zZXF1b2lhLXBncC5vcmeLEXahm8+LYtE1dNHBDCCCs/EpejBiBpGD2eDi4hYr
CRYhBDnsEaAgFrcpJkkaBuOtsAhQYFY2AABY3Q//U0bYh7UaMRTgasXyoVUNku08
f2lxOaXWf4pMDIk85inifCetFyrFjxNcxkhzy/G+yGDKk8fq5tIL3BMCV33W6wnN
RSKekWzjBKEzbiree2VuGSlEe/+m+BitUF+nDfZ5xCBbdeemLm1OPIEKWdNOiPbK
ZTYDb5PmItW9BBoGwrZgsbRHHL8d33ldbNDgua85K+yrhwBI3pZZ0QesolhKmleK
gIORylhy79XvB6lVeFdzvsEjhOCYaXkUalkNYuDO4+DEZotN99HcR94GZf2g/rfN
gHE2ElW66ty1iXfIQBzAG4Z9kQmA2a9tF1G4TDyGLqkd8ekxaZvBjGvRGQzBGew3
B2uuW/uV1wPqoEfFlqVR8hjrgjjpaJ3q2U+Bj6CkE59kPoA64zyszg8nP5Mfd33j
7qyxsv6vt91E271gz9zP5j7oAjlCd7GvmOEv1NSTPe29pw6bHk16dOACjlmWEDT4
WhWna+GnsW7l9cM6jBoJLsPgHNLVaWqjwgfMh59wjYZC2X4r4Mqgbz9DU2QCjYJ7
xxTwc7RrENBmh9NRUPnwGHbGPXlpXk5SjyXItMyR03zHvN2YKFu5j5f6vxOSF8q7
BoMoRXcDdhzdiF5uyoKZxdYSTsCXXj/K0YC5rSmfH36tfLTZtcVWtzI5DdQOwwVP
Rn4X9M7IVbNi79wFPg4=
=zeaa
-----END PGP SIGNATURE-----

Attachment: pgp78oIcf14V3.pgp
Description: PGP signature


--- End Message ---
Reply to: