Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 787089 - app-portage/portage-utils - qwhich: does not include revision
Summary: app-portage/portage-utils - qwhich: does not include revision
Status: RESOLVED FIXED
Alias: None
Product: Portage Development
Classification: Unclassified
Component: Unclassified (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Fabian Groffen
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-04-30 12:11 UTC by Marien Zwart
Modified: 2021-07-06 07:03 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Marien Zwart 2021-04-30 12:11:52 UTC
Both qwhich --tree and qwhich --vdb do not include the revision when generating the path to the .ebuild, resulting in a path that does not exist for ebuilds with a non-zero revision.

Changing both uses of tmcw->atom->P in qwhich.c to tmcw->atom->PF looks like it fixes it.

Reproducible: Always

Steps to Reproduce:
1. Install a package with a revision component.
2. qwhich --vdb $package
3. qwhich --tree $package
Actual Results:  
% qlist -Iv libpcre2
dev-libs/libpcre2-10.36-r1
% qwhich --vdb libpcre2
/home/marienz/gentoo/var/db/pkg/dev-libs/libpcre2-10.36-r1/libpcre2-10.36.ebuild
% qwhich --tree libpcre2
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.35.ebuild
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.36.ebuild
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.36.ebuild

Expected Results:  
% ./q which --vdb libpcre2
/home/marienz/gentoo/var/db/pkg/dev-libs/libpcre2-10.36-r1/libpcre2-10.36-r1.ebuild
% ./q which --tree libpcre2
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.35.ebuild
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.36.ebuild
/home/marienz/gentoo/var/db/repos/gentoo/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild


Portage 3.0.18 (python 3.9.4-final-0, default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+, gcc-11.1.0, glibc-2.33, 5.11.16-300.fc34.x86_64 x86_64)
=================================================================
System uname: Linux-5.11.16-300.fc34.x86_64-x86_64-AMD_Ryzen_9_3900XT_12-Core_Processor-with-glibc2.33
KiB Mem:    65856560 total,  53783728 free
KiB Swap:    8388604 total,   8388604 free
Timestamp of repository gentoo: Fri, 30 Apr 2021 07:45:01 +0000
Head commit of repository gentoo: 6979c5cf4ae346658471e80af4b4a379748887ba
sh bash 5.1_p4
ld GNU gold (Gentoo 2.36.1 p3 2.36.1) 1.16
ccache version 4.2 [disabled]
app-shells/bash:          5.1_p4::gentoo
dev-lang/perl:            5.32.1::gentoo
dev-lang/python:          3.9.4::gentoo
dev-util/cmake:           3.20.1::gentoo
sys-apps/baselayout:      2.7-r2::gentoo
sys-apps/sandbox:         2.23::gentoo
sys-devel/autoconf:       2.69-r5::gentoo
sys-devel/automake:       1.16.3-r1::gentoo
sys-devel/binutils:       2.36.1-r1::gentoo
sys-devel/gcc:            10.3.0::gentoo, 11.1.0::gentoo
sys-devel/gcc-config:     2.4::gentoo
sys-devel/libtool:        2.4.6-r6::gentoo
sys-devel/make:           4.3::gentoo
sys-kernel/linux-headers: 5.12::gentoo (virtual/os-headers)
sys-libs/glibc:           2.33::gentoo
Repositories:

gentoo
    location: /home/marienz/gentoo/var/db/repos/gentoo
    sync-type: rsync
    sync-uri: rsync://minotaur/gentoo-portage
    priority: -1000
    sync-rsync-verify-metamanifest: yes
    sync-rsync-verify-jobs: 1
    sync-rsync-extra-opts:
    sync-rsync-verify-max-age: 24

marienz
    location: /home/marienz/portage
    masters: gentoo

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -ggdb -O2 -pipe -march=native"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /home/marienz/gentoo/etc /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /home/marienz/gentoo/etc/env.d /home/marienz/gentoo/etc/gentoo-release"
CXXFLAGS="-O2 -pipe -ggdb -O2 -pipe -march=native"
DISTDIR="/home/marienz/gentoo/var/cache/distfiles"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance collision-protect compressdebug config-protect-if-modified distlocks ebuild-locks fixlafiles force-prefix ipc-sandbox merge-sync multilib-strict net
work-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans unprivileged xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://mirror.internode.on.net/pub/gentoo/"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j22"
PKGDIR="/home/marienz/gentoo/var/cache/binpkgs"
PORTAGE_CONFIGROOT="/home/marienz/gentoo/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/home/marienz/gentoo/var/tmp"
USE="acl adns amd64 avahi btrfs bzip2 canberra caps cargo cdio chromecast clang cli clippy clutter corefonts crypt dav1d dbus default-gold device-mapper distinct-l dos dot dri dri3 drm dvi efi egl expat ffmpeg fontconfig fuse g3dvl gbm geck
odriver gegl gflags ghcbootstrap gles2 gmp gnuefi go gold google gpg hostonly http http2 iconv icu idn imap inotify ipv6 irc json lame libass libdrm libffi libglvnd libidn2 libinput libkms libtirpc libvisual libxml2 llvm llvm-shared-libs lm
-sensors lto lua lzma maildir mtp multimedia ncurses nfsidmap nls nptl numpy openmp opus pch pcre32 pgo playlist postscript prefix prelink preview-latex projectm python python3 qml readline realtime rls rustfmt s3tc seccomp semantic-desktop
 sip smtp speex spice split-usr sqlite ssl svc system-bootstrap system-harfbuzz system-icu system-jflex system-jpeg system-jsoncpp system-llvm sysv-utils theora toolkit-scroll-bars udisks2 uefi unicode unicode3 unwind urwid usbredir user-se
ssion vaapi vala vpx vulkan wasm wayland webkit webp widevine widgets xattr xcomposite xetex xft xinerama xml xmp xwayland zlib zsh-completion zstd" ABI_X86="64" ADA_TARGET="gnat_2018" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x c
a0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias
authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers inc
lude info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap sy
slog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301
 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-GB en-US nl fy" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44
780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="ARM WebAssembly BPF NVPTX" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="
php7-3 php7-4" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="pypy3 python3_9" QEMU_SOFTMMU_TARGETS="x86_64" RUBY_TARGETS="ruby26" USERLAND="GNU" VIDEO_CARDS="amdgpu fbdev intel nouveau radeon rade
onsi vesa dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RUSTFLAGS
Comment 1 Fabian Groffen gentoo-dev 2021-04-30 19:58:34 UTC
nice catch, thanks!
Comment 2 Fabian Groffen gentoo-dev 2021-05-01 08:41:00 UTC
Thanks this is in 2ec2e13
Comment 3 Larry the Git Cow gentoo-dev 2021-07-06 07:03:20 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b5ac4b8140f7ff1ab5c27af5c690288ec1419b

commit 65b5ac4b8140f7ff1ab5c27af5c690288ec1419b
Author:     Fabian Groffen <grobian@gentoo.org>
AuthorDate: 2021-07-06 07:03:02 +0000
Commit:     Fabian Groffen <grobian@gentoo.org>
CommitDate: 2021-07-06 07:03:15 +0000

    app-portage/portage-utils-0.92: version bump + cleanup
    
    Closes: https://bugs.gentoo.org/792273
    Closes: https://bugs.gentoo.org/791571
    Closes: https://bugs.gentoo.org/787089
    Closes: https://bugs.gentoo.org/769929
    Closes: https://bugs.gentoo.org/757540
    Package-Manager: Portage-3.0.20, Repoman-3.0.2
    Signed-off-by: Fabian Groffen <grobian@gentoo.org>

 app-portage/portage-utils/Manifest                 |  3 +-
 .../portage-utils/portage-utils-0.90.1.ebuild      | 67 ----------------------
 ...utils-0.91.ebuild => portage-utils-0.92.ebuild} |  0
 3 files changed, 1 insertion(+), 69 deletions(-)