if I: root@pandora:~ # emerge --ask --verbose --update --deep --fetchonly world emerge mis-speaks. There is a fix (diff file) in the additional info section: Reproducible: Always Steps to Reproduce: 1. 2. 3. Actual Results: These are the packages that I would merge, in order: Expected Results: These are the packages that I would fetch, in order: I don't think the "emerge --info" matters but it is below the diff file fix: This is my first foray into the patching world so please be kind: the fix is trivial -- I'm more interested to know if I followed the correct procedure for finding and fixing a bug. Thanks for any feedback. Sorry for the web form's forced linefeeds but here is the diff: ============================================================================= tres@pandora:/usr/lib/portage/bin $ diff emerge-working emerge-the-original 2868,2875c2868,2872 < # Simple grammer fix here. Are we fetching or merging? < if (("--ask" in myopts) or (("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) ): < print < if (("--ask" in myopts) and ( "--fetchonly" in myopts )): < if "--tree" in myopts: < print darkgreen("These are the packages that I would fetch, in reverse order:") < else: < print darkgreen("These are the packages that I would fetch, in order:") --- > if (("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) or ("--ask" in myopts): > if "--tree" in myopts: > print > print darkgreen("These are the packages that I would merge, in reverse order:") > print 2877,2881c2874,2877 < if "--tree" in myopts: < print darkgreen("These are the packages that I would merge, in reverse order:") < else: < print darkgreen("These are the packages that I would merge, in order:") < print --- > print > print darkgreen("These are the packages that I would merge, in order:") > print > tres@pandora:/usr/lib/portage/bin $ ============================================================================= tres@pandora:~ $ emerge --info Portage 2.0.51-r3 (default-x86-2004.2, gcc-3.3.4, glibc-2.3.4.20040808-r1, 2.4.27 i686) ================================================================= System uname: 2.4.27 i686 Pentium II (Deschutes) Gentoo Base System version 1.4.16 distcc 2.16 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [disabled] ccache version 2.3 [enabled] Autoconf: sys-devel/autoconf-2.59-r5 Automake: sys-devel/automake-1.8.5-r1 Binutils: sys-devel/binutils-2.14.90.0.8-r1 Headers: sys-kernel/linux-headers-2.4.21-r1 Libtools: sys-devel/libtool-1.5.2-r5 ACCEPT_KEYWORDS="x86" AUTOCLEAN="no" CFLAGS="-O2 -march=i686 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" COMPILER="" CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/config /var/bind /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-O2 -march=i686 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoaddcvs candy ccache distlocks noclean sandbox" GENTOO_MIRRORS="http://gentoo.chem.wisc.edu/gentoo/ ftp://gentoo.chem.wisc.edu/gentoo/ http://mirror.datapipe.net/gentoo http://gentoo.cs.lewisu.edu/gentoo/ ftp://linux.cs.lewisu.edu/gentoo/" MAKEOPTS="-j4" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="/ X Xaw3d aalib acl alsa apache2 apm arts audiofile avi berkdb bitmap-fonts bonobo bzlib cdb cdr crypt cscope ctype cups dba dbase dbm dga dio directfb divx4linux doc encode esd ethereal evo exif f77 fastcgi fbcon fftw firebird flac flatfile foomaticdb fortran ftp gb gd gdbm ggi gif gimpprint ginac gmp gnome gnutls gphoto2 gpm gstreamer gtk gtk2 gtkhtml guile icq imagemagick imap imlib inifile innodb jabber jack java jpeg kde kerberos ladcca lcms ldap lesstif libedit libg++ libgda libwww lirc mad maildir mailwrapper matrox mcal memlimit mhash mikmod mime mmap mmx motif mozilla mpeg mpi msession msql mysql mysqli nas ncurses nls nocardbus nocd odbc offensive oggvorbis openal opengl oscar oss pam pcntl pcre pdflib perl php plotutils png posix postgres ppds prelude python qdbm qt quicktime readline recode ruby samba sasl sdl session shared sharedmem simplexml slang slp snmp soap sockets spell spl sqlite ssl svg svga sysvipc szip tcltk tcpd tidy tiff tokenizer truetype usb vhosts videos wxwindows x86 xine xinerama xml xml2 xmlrpc xmms xosd xpm xsl xv xvid yahoo zeo zlib" ==============================================================================
Is this cleaner?: ------------------------------------------------------------------------------- tres@pandora:/usr/lib/portage/bin $ diff emerge-working emerge-the-original 2868,2875c2868,2872 < # Simple grammer fix here. Are we fetching or merging? And are we pretending? < if (("--ask" in myopts) or ("--pretend" in myopts)): < print < if (("--fetchonly" in myopts) or ("--fetch-all-uri" in myopts)): < if "--tree" in myopts: < print darkgreen("These are the packages that I would fetch, in reverse order:") < else: < print darkgreen("These are the packages that I would fetch, in order:") --- > if (("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) or ("--ask" in myopts): > if "--tree" in myopts: > print > print darkgreen("These are the packages that I would merge, in reverse order:") > print 2877,2881c2874,2877 < if "--tree" in myopts: < print darkgreen("These are the packages that I would merge, in reverse order:") < else: < print darkgreen("These are the packages that I would merge, in order:") < print --- > print > print darkgreen("These are the packages that I would merge, in order:") > print > tres@pandora:/usr/lib/portage/bin $
a diff in the unified format (-u) would be cleanest and post it as an attachment please, not as a comment (bugzilla mangles whitespace)
Created attachment 43640 [details, diff] A "diff -u emerge emerge-working" A slight change in logic. I assume that if the user enters either --ask or --pretend that they want feedback and then I tell then that we are going to fetch/merge based upon the --fetchonly or --fetch-all-uri options. The old way basically said are we asking or are we pretending to merge. It kinda lets pretending to fetch fall through the cracks. This all started when I wanted to fetch some packages and it told me it was going to merge them.
Old as hell RiverRat bug, heh ;)
Fixed in trunk
Apparently fixed in r2644 for release in 2.1_pre5.
Released in 2.1_pre5.
