Bug#989785: devscripts: wrap-and-sort ignores --trailing-comma on non-sorted fields/Uploaders
On Tue, Jun 15, 2021 at 01:47:11PM +0900, Norbert Preining wrote: > Hi Mattia, > > > Can you describe with an example or something more specific what you are > > observing? > > Ah, it only happens with *one* Uploader: > $ head -6 debian/control > Source: layer-shell-qt > Section: kde > Priority: optional > Maintainer: Debian Qt/KDE Maintainers > Uploaders: Norbert Preining , > Build-Depends: cmake (>= 3.16~), > > $ wrap-and-sort -t > > $ head -6 debian/control > Source: layer-shell-qt > Section: kde > Priority: optional > Maintainer: Debian Qt/KDE Maintainers > Uploaders: Norbert Preining > Build-Depends: cmake (>= 3.16~), > > The final comma after uploaders is gone. Right. That's because the trailing comma is added only in case of wrapping. If you are not wrapping you won't get it. I.e., if you use -at you get it, else you won't. It's not really connected with "1 uploader", rather the lenght of the name of said uploader. > Not that important, but when automatizing tasks with a few hundred > packages of KDE, I would like to see less changes in the actual git > commits. Honestly, I'm a big proponent of -ast - to the point that I entertain making it the default: https://bugs.debian.org/895570 :) -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. More about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature
Bug#989785: devscripts: wrap-and-sort ignores --trailing-comma on non-sorted fields/Uploaders
Hi Mattia, > Can you describe with an example or something more specific what you are > observing? Ah, it only happens with *one* Uploader: $ head -6 debian/control Source: layer-shell-qt Section: kde Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Norbert Preining , Build-Depends: cmake (>= 3.16~), $ wrap-and-sort -t $ head -6 debian/control Source: layer-shell-qt Section: kde Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Norbert Preining Build-Depends: cmake (>= 3.16~), The final comma after uploaders is gone. Not that important, but when automatizing tasks with a few hundred packages of KDE, I would like to see less changes in the actual git commits. Best Norbert -- PREINING Norbert https://www.preining.info Fujitsu Research + IFMGA Guide + TU Wien + TeX Live + Debian Dev GPG: 0x860CDC13 fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13
Bug#989785: devscripts: wrap-and-sort ignores --trailing-comma on non-sorted fields/Uploaders
Control: tag -1 moreinfo unreproducible On Sun, Jun 13, 2021 at 09:44:07AM +0900, Norbert Preining wrote: > wrap-and-sort behaves strangly with some fields like Uploaders, where it > does not honor > --trailing-comma > I guess it comes from the fact that the --trailing-comma applies only to > "sorted fields" and uploaders seems not to fall into that category. > > This is counter-intuitive, and I suggest adding uploaders into the > sorted category, or at least honor --trailing-comma there, too. I'm confued, as here it seems to work just fine. Using a rendom package: mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % head -n 5 debian/control Source: jenkins-job-builder Section: python Priority: optional Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Mattia Rizzolo , Paul Belanger mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % \wrap-and-sort -t mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % head debian/control Source: jenkins-job-builder Section: python Priority: optional Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Mattia Rizzolo , Paul Belanger , Build-Depends: debhelper (>= 12.8~), debhelper-compat (= 13), dh-python, mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % \wrap-and-sort -st mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % head debian/control Source: jenkins-job-builder Section: python Priority: optional Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Mattia Rizzolo , Paul Belanger , Build-Depends: debhelper (>= 12.8~), mattia@warren ..enkins-job-builder/jenkins-job-builder (git)-[debian/unstable] % Can you describe with an example or something more specific what you are observing? -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. More about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature
Bug#989785: devscripts: wrap-and-sort ignores --trailing-comma on non-sorted fields/Uploaders
Package: devscripts Version: 2.21.2 Severity: normal Hi wrap-and-sort behaves strangly with some fields like Uploaders, where it does not honor --trailing-comma I guess it comes from the fact that the --trailing-comma applies only to "sorted fields" and uploaders seems not to fall into that category. This is counter-intuitive, and I suggest adding uploaders into the sorted category, or at least honor --trailing-comma there, too. Thanks -- Package-specific info: --- /etc/devscripts.conf --- Empty. --- ~/.devscripts --- DEVSCRIPTS_CHECK_DIRNAME_LEVEL=0 DEBCHANGE_MULTIMAINT_MERGE=yes DEBCHANGE_MAINTTRAILER=no DEBCHANGE_RELEASE_HEURISTIC=changelog DEBSIGN_KEYID=0x6CACA448860CDC13 -- System Information: Debian Release: 11.0 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.12.10+ (SMP w/8 CPU threads) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages devscripts depends on: ii dpkg-dev 1.20.9 ii fakeroot 1.25.3-1.1 ii file 1:5.39-3 ii gnupg 2.2.27-2 ii gnupg22.2.27-2 ii gpgv 2.2.27-2 ii libc6 2.31-12 ii libfile-dirlist-perl 0.05-2 ii libfile-homedir-perl 1.006-1 ii libfile-touch-perl0.11-1 ii libfile-which-perl1.23-1 ii libipc-run-perl 20200505.0-1 ii libmoo-perl 2.004004-1 ii libwww-perl 6.53-1 ii patchutils0.4.2-1 ii perl 5.32.1-4 ii python3 3.9.2-3 ii sensible-utils0.0.14 ii wdiff 1.2.2-2+b1 Versions of packages devscripts recommends: ii apt 2.2.4 ii curl7.74.0-1.2 ii dctrl-tools 2.24-3+b1 ii debian-keyring 2021.03.24 ii dput-ng [dput] 1.33 ii dupload 2.9.6 ii equivs 2.3.1 ii libdistro-info-perl 1.0 ii libdpkg-perl1.20.9 ii libencode-locale-perl 1.05-1.1 ii libgit-wrapper-perl 0.048-1 ii libgitlab-api-v4-perl 0.26-1 ii liblist-compare-perl0.55-1 ii liblwp-protocol-https-perl 6.10-1 ii libsoap-lite-perl 1.27-1 ii libstring-shellquote-perl 1.04-1 ii libtry-tiny-perl0.30-1 ii liburi-perl 5.08-1 ii licensecheck3.1.1-2 ii lintian 2.104.0 ii man-db 2.9.4-2 ii patch 2.7.6-7 ii pristine-tar1.49 ii python3-apt 2.2.0 ii python3-debian 0.1.39 ii python3-magic 2:0.4.20-3 ii python3-requests2.25.1+dfsg-2 ii python3-unidiff 0.5.5-2 ii python3-xdg 0.27-2 ii strace 5.10-1 ii unzip 6.0-26 ii wget1.21-1+b1 ii xz-utils5.2.5-2 Versions of packages devscripts suggests: pn adequate ii at3.1.23-1.1 ii autopkgtest 5.16 ii bls-standalone0.20151231+b1 ii bsd-mailx [mailx] 8.1.2-0.20180807cvs-2 ii build-essential 12.9 pn check-all-the-things pn cvs-buildpackage ii debhelper 13.3.4 pn devscripts-el pn diffoscope pn disorderfs ii dose-extra6.0.1-2 ii duck 0.13.2 pn faketime ii gnuplot 5.4.1+dfsg1-1 ii gnuplot-qt [gnuplot] 5.4.1+dfsg1-1 pn how-can-i-help ii libauthen-sasl-perl 2.1600-1.1 ii libdbd-pg-perl3.14.2-1+b1 ii libfile-desktopentry-perl 0.22-2 pn libnet-smtps-perl pn libterm-size-perl ii libtimedate-perl 2.3300-2 pn libyaml-syck-perl ii mailutils [mailx] 1:3.11.1-5 ii mmdebstrap0.7.5-2.2 pn mozilla-devscripts ii mutt 2.0.5-4 ii openssh-client [ssh-client] 1:8.4p1-5 pn piuparts ii postgresql-client-13 [postgresql-client] 13.3-1 pn pristine-lfs ii
