watch out "sdiff: subsidiary program `/usr/bin/nano' failed" mymachine root # etc-update Scanning Configuration files... The following is the list of files which need updating, each configuration file is followed by a list of possible replacement files. 1) /etc/make.conf /etc/._cfg0000_make.conf Please select a file to edit by entering the corresponding number (-1 to exit): Showing differences between /etc/make.conf and /etc/._cfg0000_make.conf --- /etc/make.conf 2002-11-07 19:12:19.000000000 +0100 +++ /etc/._cfg0000_make.conf 2002-11-18 10:50:12.000000000 +0100 @@ -16,8 +16,6 @@ # Example: #USE="X gtk gnome -alsa" -GENTOO_MIRRORS="http://192.168.10.1/gentoo/" - # Host Setting # ============ # @@ -42,8 +40,8 @@ # # CPU types supported in gcc-3.2 and higher: athlon-xp, athlon-mp, athlon-4, # athlon-tbird, athlon, duron, k6, k6-2, k6-3, i386, i486, i586 (Pentium), i686 -# (Pentium Pro), pentium, pentium-mmx, pentiumpro, pentium2, pentium3, and -# pentium4. Note that Gentoo Linux 1.4 and higher include at least gcc-3.2. +# (Pentium Pro), pentium, pentium-mmx, pentiumpro, pentium2 (Celeron), pentium3, +# and pentium4. Note that Gentoo Linux 1.4 and higher include at least gcc-3.2. # # CPU types supported in gcc-2.95*: k6, i386, i486, i586 (Pentium), i686 # (Pentium Pro), pentium, pentiumpro Gentoo Linux 1.2 and below use gcc-2.95* @@ -51,7 +49,7 @@ # Decent examples: # #CFLAGS="-mcpu=athlon-xp -O3 -pipe" -CFLAGS="-march=i686 -O3 -pipe" +#CFLAGS="-march=pentium3 -O3 -pipe" # If you set a CFLAGS above, then this line will set your default C++ flags to # the same settings. If you don't set CFLAGS above, then comment this line out. @@ -145,3 +143,8 @@ # flag of the same name. It causes binary packages to be created of all # packages that are merged. #FEATURES="sandbox ccache buildpkg" +# +# RSYNC_RETRIES sets the number of times portage will attempt to retrieve +# a current portage tree before it exits with an error. This allows +# for a more successful retrieval without user intervention most times. +#RSYNC_RETRIES="3" 1) Replace original with update 2) Delete update, keeping original as is 3) Interactively merge original with update 4) Show differences again Please select from the menu above (-1 to ignore this update): 3 /etc/._cfg0000_make.conf /etc/make.conf /etc/make.conf.merged A previous version of the merged file exists, cleaning... rm: remove regular file `/etc/make.conf.merged'? y Merging /etc/._cfg0000_make.conf and /etc/make.conf GENTOO_MIRRORS="http://192.168.10.1/gentoo/" < < %l # (Pentium Pro), pentium, pentium-mmx, pentiumpro, pentium2, | # (Pentium Pro), pentium, pentium-mmx, pentiumpro, pentium2 ( # pentium4. Note that Gentoo Linux 1.4 and higher include at | # and pentium4. Note that Gentoo Linux 1.4 and higher include %l CFLAGS="-march=i686 -O3 -pipe" | #CFLAGS="- march=pentium3 -O3 -pipe" %l > # > # RSYNC_RETRIES sets the number of times portage will attempt > # a current portage tree before it exits with an error. T > # for a more successful retrieval without user interventi > #RSYNC_RETRIES="3" %r sdiff: subsidiary program `/usr/bin/nano' failed 1) Replace /etc/make.conf with merged file 2) Show differences between merged file and original 3) Remerge original with update 4) Return to the previous menu Please select from the menu above (-1 to exit, losing this merge): 1 Replacing /etc/make.conf with /etc/make.conf.merged mv: overwrite `/etc/make.conf'? y rm: remove regular file `/etc/._cfg0000_make.conf'? y Exiting: No files to work on! mymachine root #
it still works though... the error message is simply because nano returns a non- zero code on successful edit. I'll look into silencing it.
*** Bug 10949 has been marked as a duplicate of this bug. ***
In my case it was not possible to edit the changes when doing an interactive merge. etc-update always gave an error that nano could not be started. I then noticed that etc-update was searching nano in /usr/bin, but actually nano is in /bin. I made ln -s /bin/nano /usr/bin/nano and etc-update is now working without error.
so the *fix* here is to either update the nano ebuild to put a symlink in /usr/bin/ or to fix EDITOR in 00basic ...
fixed in cvs http://cvs.gentoo.org/cgi-bin/viewcvs.cgi/gentoo-x86/app-editors/nano/nano-1.0.9-r2.ebuild?rev=1.1&content-type=text/vnd.viewcvs-markup
Updated 00basic on CVS.
