From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] bash-completion: complete tar with xbps files
Date: Mon, 24 Jan 2022 17:50:41 +0100 [thread overview]
Message-ID: <20220124165041.oSpw58w489xH3-qhPA7csrAj7XHMG4e64d9eipwgTlY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35201@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages complete-xbps
https://github.com/void-linux/void-packages/pull/35201
bash-completion: complete tar with xbps files
Backported from upstream https://github.com/scop/bash-completion/pull/688
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35201.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-complete-xbps-35201.patch --]
[-- Type: text/x-diff, Size: 4276 bytes --]
From 7c2d138f56aaea80625a11d2e88310f79e42a240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 23 Jan 2022 11:50:34 -0300
Subject: [PATCH] bash-completion: complete tar with xbps files
Backported from upstream https://github.com/scop/bash-completion/pull/688
Fix checkdepends so tests run, deselect 26 tests that fail atm,
with the goal of fixing this for next release 2.12.
Also conditionally deselect a couple of tests that fail only on CI.
---
.../patches/complete-xbps.patch | 24 +++++++++
srcpkgs/bash-completion/template | 51 ++++++++++++++++++-
2 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch
diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch
new file mode 100644
index 000000000000..3e34ef1d78da
--- /dev/null
+++ b/srcpkgs/bash-completion/patches/complete-xbps.patch
@@ -0,0 +1,24 @@
+Complete tar with .xbps files.
+
+Backported from upstream https://github.com/scop/bash-completion/pull/688
+
+--- a/completions/tar
++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300
+@@ -422,7 +422,7 @@
+
+ __tar_detect_ext()
+ {
+- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))'
++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)'
+ ext="$tars"
+
+ case "$tar_mode_arg" in
+@@ -430,7 +430,7 @@
+ # Should never happen?
+ ;;
+ ?(-)*[cr]*f)
+- ext='@(tar|gem|spkg)'
++ ext='@(tar|gem|spkg|xbps)'
+ case ${words[1]} in
+ *a*) ext="$tars" ;;
+ *z*) ext='t?(ar.)gz' ;;
diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index 8f20e4e7acd7..8908de525e82 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,13 +1,62 @@
# Template file for 'bash-completion'
pkgname=bash-completion
version=2.11
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="profiledir=/etc/bash/bashrc.d"
depends="bash"
+checkdepends="python3-pytest python3-pexpect"
short_desc="Programmable completion for the GNU Bash shell"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/scop/bash-completion"
distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"
checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac
+
+# Summary of tests:
+# = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) =
+
+# FIXME: 26 tests listed below fail, see #35201
+_test_deselect="
+ test_aclocal.py::TestAclocal::test_1
+ test_chsh.py::TestChsh::test_2
+ test_ether_wake.py::TestEtherWake::test_1
+ test_gdb.py::TestGdb::test_2
+ test_ifdown.py::TestIfdown::test_1
+ test_ifstat.py::TestIfstat::test_2
+ test_ifup.py::TestIfup::test_1
+ test_iperf.py::TestIperf::test_2
+ test_killall.py::TestKillall::test_1
+ test_nethogs.py::TestNethogs::test_1
+ test_perldoc.py::TestPerldoc::test_1
+ test_perldoc.py::TestPerldoc::test_3
+ test_pgrep.py::TestPgrep::test_1
+ test_pidof.py::TestPidof::test_1
+ test_pkill.py::TestPkill::test_1
+ test_pwdx.py::TestPwdx::test_1
+ test_renice.py::TestRenice::test_1
+ test_renice.py::TestRenice::test_2
+ test_reptyr.py::TestReptyr::test_1
+ test_service.py::TestService::test_1
+ test_tar.py::TestTar::test_4
+ test_tar.py::TestTar::test_22
+ unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_1
+ unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_2
+ unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_3
+ unit/test_unit_ip_addresses.py::TestUnitIpAddresses::test_4
+"
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # these fail on CI because of some confusion with the homedir
+ _test_deselect+="
+ unit/test_unit_expand.py::TestUnitExpand::test_user_home
+ unit/test_unit_expand_tilde_by_ref.py::TestUnitExpandTildeByRef::test_expand
+ "
+fi
+
+pre_check() {
+ for t in $_test_deselect; do
+ PYTEST_ADDOPTS+=" --deselect=t/$t"
+ done
+ export PYTEST_ADDOPTS
+}
next prev parent reply other threads:[~2022-01-24 16:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 14:52 [PR PATCH] " tornaria
2022-01-23 15:17 ` [PR PATCH] [Updated] " tornaria
2022-01-23 22:34 ` tornaria
2022-01-23 22:43 ` paper42
2022-01-23 22:57 ` [PR PATCH] [Updated] " tornaria
2022-01-23 23:03 ` tornaria
2022-01-23 23:08 ` [PR REVIEW] " paper42
2022-01-23 23:08 ` paper42
2022-01-24 13:02 ` [PR PATCH] [Updated] " tornaria
2022-01-24 13:02 ` [PR REVIEW] " tornaria
2022-01-24 16:50 ` tornaria [this message]
2022-01-24 23:39 ` tornaria
2022-01-24 23:57 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220124165041.oSpw58w489xH3-qhPA7csrAj7XHMG4e64d9eipwgTlY@z \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).