Trying to install Tk-Gauge-0.3 with g-cpan, it fails with: root@grizzly:/root(32)# g-cpan -i Tk-Gauge ... Checksum for /tmp/.cpan/sources/authors/id/L/LU/LUSOL/Tk-Gauge-0.3.tar.gz ok CPAN: Archive::Tar loaded ok (v1.60) Tk-Gauge-0.3/ ... CPAN: File::Temp loaded ok (v0.22) /tmp/.cpan/build/Tk-Gauge-0.3-hygm3w does not start with /usr/lib64/perl5/vendor_perl/5.10.1/x86_64-linux-thread-multi i.e. building outside Tk itself * Tk is part of the core perl install * Generating ebuild for Tk::Gauge * Ebuild generated for Tk-Gauge Appending /usr/local/portage/perl-gcpan to PORTDIR_OVERLAY... >>> Creating Manifest for /usr/local/portage/perl-gcpan/perl-gcpan/Tk-Gauge Calculating dependencies... done! emerge: there are no ebuilds to satisfy "Tk-Gauge". root@grizzly:/root(31)# ll /usr/local/portage/perl-gcpan/perl-gcpan/Tk-Gauge total 12 -rw-r--r-- 1 root root 394 Apr 27 07:13 Manifest -rw-r--r-- 1 root root 371 Apr 27 07:13 Tk-Gauge-0.3.ebuild drwxr-xr-x 2 root root 4096 Apr 27 07:13 files/ I think, that the path /usr/local/portage/perl-gcpan/perl-gcpan/Tk-Gauge is wrong. It should be: /usr/local/portage/perl-gcpan/Tk-Gauge I have set GCPAN_OVERLAY in /etc/make.conf: root@grizzly:/root(33)# grep cpan /etc/make.conf GCPAN_OVERLAY="/usr/local/portage/perl-gcpan" Reproducible: Always root@grizzly:/root(34)# qlist -Iv g-cpan app-portage/g-cpan-0.16.2 Trying to do 'g-cpan -u' at an other system, I see the following: ... Tie-Array-Packed-0.10/lib/Tie/Array/ Tie-Array-Packed-0.10/lib/Tie/Array/Packed.pm Tie-Array-Packed-0.10/Changes * Test::More is part of the core perl install * Generating ebuild for Tie::Array::Packed * Ebuild generated for Tie-Array-Packed Appending /usr/local/portage/perl-gcpan to PORTDIR_OVERLAY... >>> Creating Manifest for /usr/local/portage/perl-gcpan/perl-gcpan/Tie-Array-Packed * Ebuild already exists for UNIVERSAL-require (dev-perl/UNIVERSAL-require) * Ebuild already exists for List-MoreUtils (dev-perl/List-MoreUtils) ...
After 'g-cpan -u' all c-pan ebuild are installed under /usr/local/portage/perl-gcpan/perl-gcpan/ , where there are not found by emerge, e.g. root@condor:/root(102)# ll /usr/local/portage/perl-gcpan/perl-gcpan/Statistics-*/*.ebuild -rw-r--r-- 1 root root 399 Apr 27 07:38 /usr/local/portage/perl-gcpan/perl-gcpan/Statistics-Basic/Statistics-Basic-1.6601.ebuild -rw-r--r-- 1 root root 348 Apr 27 07:38 /usr/local/portage/perl-gcpan/perl-gcpan/Statistics-Distributions/Statistics-Distributions-1.02.ebuild -rw-r--r-- 1 root root 445 Apr 27 07:39 /usr/local/portage/perl-gcpan/perl-gcpan/Statistics-TTest/Statistics-TTest-1.1.0.ebuild root@condor:/root(103)# emerge -pvD Statistics-Basic Statistics-Distributions Statistics-TTest These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild R ] perl-gcpan/Statistics-Distributions-1.02 0 kB [?=>1] [ebuild R ] perl-gcpan/Statistics-Basic-1.6601 1 kB [2] [ebuild R ] perl-gcpan/Statistics-TTest-1.1.0 0 kB [2] Total: 3 packages (3 reinstalls), Size of downloads: 1 kB Portage tree and overlays: [0] /usr/portage [1] /usr/local/portage [2] /var/lib/layman/dotnet [?] indicates that the source repository could not be determined root@condor:/root(104)# rm -r /var/lib/layman/dotnet/perl-gcpan/ root@condor:/root(105)# emerge -pvD Statistics-Basic Statistics-Distributions Statistics-TTest These are the packages that would be merged, in order: Calculating dependencies... done! emerge: there are no ebuilds to satisfy "perl-gcpan/Statistics-Basic".
What version of g-cpan are you using? it works perfectly here: # g-cpan -g Statistics-Basic -CPAN: Storable loaded ok Going to read /var/tmp/g-cpan/.cpan/Metadata Database was generated on Tue, 27 Apr 2010 23:27:06 GMT |CPAN: Digest::MD5 loaded ok CPAN: Compress::Zlib loaded ok Checksum for /var/tmp/g-cpan/.cpan/sources/authors/id/J/JE/JETTERO/Statistics-Basic-1.6601.tar.gz ok Scanning cache /var/tmp/g-cpan/.cpan/build for sizes Statistics-Basic-1.6601/ Statistics-Basic-1.6601/lib/ Statistics-Basic-1.6601/lib/Statistics/ Statistics-Basic-1.6601/lib/Statistics/Basic.pod ... Statistics-Basic-1.6601/Makefile.PL Warning: prerequisite Number::Format 1.61 not found. * Scalar::Util is part of the core perl install * Ebuild already exists for Number-Format (dev-perl/Number-Format) * Generating ebuild for Statistics::Basic * Ebuild generated for Statistics-Basic >>> Creating Manifest for /usr/local/portage/perl-gcpan/Statistics-Basic # find /usr/local/portage/ -name 'Statistics-Basic*' /usr/local/portage/perl-gcpan/Statistics-Basic /usr/local/portage/perl-gcpan/Statistics-Basic/Statistics-Basic-1.6601.ebuild
(In reply to comment #0) > I think, that the path /usr/local/portage/perl-gcpan/perl-gcpan/Tk-Gauge is > wrong. It should be: > /usr/local/portage/perl-gcpan/Tk-Gauge If you want /usr/local/portage as overlay, then > I have set GCPAN_OVERLAY in /etc/make.conf: > root@grizzly:/root(33)# grep cpan /etc/make.conf > GCPAN_OVERLAY="/usr/local/portage/perl-gcpan" you should set GCPAN_OVERLAY="/usr/local/portage". You should have add `emerge --info` for your PORTDIR_OVERLAY variable. > root@grizzly:/root(34)# qlist -Iv g-cpan > app-portage/g-cpan-0.16.2
tove: Thanks, I totally missed that. Juergen: > root@grizzly:/root(33)# grep cpan /etc/make.conf > GCPAN_OVERLAY="/usr/local/portage/perl-gcpan" That's what's wrong. Your're saying the BASE of the overlay is at that path. Take out the perl-gcpan.
I understand now, why g-cpan has written to /usr/local/portage/perl-gcpan/perl-gcpan. I had set GCPAN_OVERLAY to /usr/local/portage/perl-gcpan for some months. I think, it should work with every value at least, if the directory exists. I thought also, that it was sometimes working. Not every time, compare Bug 311117. Now I set GCPAN_OVERLAY to /usr/local/portage and I removed all cpan Metadata 'rm -r /root/.cpan /tmp/.cpan', did again 'g-cpan -u', but nevertheless I can not install some cpan packages, e.g.: root@thinkpad:/root(95)# g-cpan -s TK-Gauge * No ebuild exists, pulling up CPAN listings for TK-Gauge /Sorry, we have to rerun the configuration dialog for CPAN.pm due to some missing parameters... Normally CPAN.pm keeps config variables in memory and changes need to be saved in a separate 'o conf commit' command to make them permanent between sessions. If you set the 'auto_commit' option to true, changes to a config variable are always automatically committed to disk. <auto_commit> Always commit changes to config variables to disk? [no] no Please remember to call 'o conf commit' to make the config permanent! CPAN: Storable loaded ok (v2.21) Going to read '/tmp/.cpan/Metadata' Database was generated on Wed, 28 Apr 2010 05:28:44 GMT Module id = Tk::Gauge CPAN_USERID LUSOL (Stephen O. Lidie <sol0@Lehigh.EDU>) CPAN_VERSION 0.3 CPAN_FILE L/LU/LUSOL/Tk-Gauge-0.3.tar.gz INST_FILE (not installed) root@thinkpad:/root(96)# g-cpan -i TK-Gauge -Sorry, we have to rerun the configuration dialog for CPAN.pm due to some missing parameters... Normally CPAN.pm keeps config variables in memory and changes need to be saved in a separate 'o conf commit' command to make them permanent between sessions. If you set the 'auto_commit' option to true, changes to a config variable are always automatically committed to disk. <auto_commit> Always commit changes to config variables to disk? [no] no Please remember to call 'o conf commit' to make the config permanent! CPAN: Storable loaded ok (v2.21) Going to read '/tmp/.cpan/Metadata' Database was generated on Wed, 28 Apr 2010 05:28:44 GMT * TK::Gauge is not a CPAN module! * Nothing to install!!
root@thinkpad:/root(100)# emerge --info Portage 2.1.8.3 (default/linux/x86/10.0/desktop, gcc-4.4.3, glibc-2.11.1-r0, 2.6.32-gentoo-r3 i686) ================================================================= System uname: Linux-2.6.32-gentoo-r3-i686-Intel-R-_Pentium-R-_M_processor_2.00GHz-with-gentoo-2.0.1 Timestamp of tree: Tue, 27 Apr 2010 05:00:01 +0000 distcc 3.1 i686-pc-linux-gnu [disabled] ccache version 2.4 [disabled] app-shells/bash: 4.1_p5 dev-java/java-config: 2.1.10 dev-lang/python: 2.6.5-r1, 3.1.2-r2 dev-python/pycrypto: 2.1.0 dev-util/ccache: 2.4-r8 dev-util/cmake: 2.8.1-r1 sys-apps/baselayout: 2.0.1 sys-apps/openrc: 0.6.1-r1 sys-apps/sandbox: 2.2 sys-devel/autoconf: 2.13, 2.65 sys-devel/automake: 1.4_p6-r1, 1.7.9-r2, 1.8.5-r4, 1.9.6-r3, 1.10.3, 1.11.1 sys-devel/binutils: 2.20.1 sys-devel/gcc: 3.4.6-r2, 4.4.3-r2 sys-devel/gcc-config: 1.4.1 sys-devel/libtool: 2.2.6b virtual/os-headers: 2.6.33 ACCEPT_KEYWORDS="x86 ~x86" ACCEPT_LICENSE="* -@EULA PUEL dlj-1.1 skype-eula" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=pentium-m -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/X11/xkb /usr/share/config /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/eselect/postgresql /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c" CXXFLAGS="-O2 -march=pentium-m -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" FEATURES="assume-digests distlocks fixpackages news parallel-fetch protect-owned sandbox sfperms strict unmerge-logs unmerge-orphans userfetch" FFLAGS="-O2 -march=pentium-m -fomit-frame-pointer" GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror http://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ rsync://ftp.fi.muni.cz/pub/linux/gentoo ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://vlaai.snt.ipv6.utwente.nl/pub/os/linux/gentoo/" LDFLAGS="-Wl,-O1" LINGUAS="de fr" MAKEOPTS="-j1" PKGDIR="/usr/portage/packages/" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/var/lib/layman/dotnet /var/lib/layman/java-overlay /var/lib/layman/lordvan /var/lib/layman/science /var/lib/layman/x11 /var/lib/layman/zugaina /var/lib/layman/sunrise /var/lib/layman/arcon /usr/local/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="X Xaw3d a52 aac abiword acl acpi afs alsa amrr ao apache2 applet archive arpack asf aspell assistant audacious audiofile automap automount bash-completion beagle berkdb blas blast bluetooth boo boost branding bzip2 cairo cardbus cdda cddb cdf cdio cdparanoia cdr cgi chm cli consolekit corba cracklib crypt css cups curl cxx daap db dbase dbi dbm dbus designer devhelp device-mapper dga dia djvu doc dri ds2490 dts dv dvb dvd dvdr dvi eds elf emacs emboss empathy encode epiphany evo examples exif expat extensions extra extras fam fame ffmpeg fftw firefox fits flac fltk foomaticdb fortran fpx fts3 fuse galago garmin gd gdal gdbm gedit geolocation geos gif gimp ginac git glade glib glitz gml gmp gmtsuppl gnokii gnome gnome-keyring gnome-print gnuplot gnutls gphoto2 gpm grammar graphics graphtft graphviz grass gs gsl gsm gstreamer gtk guile hal harness hddtemp hdf hdf5 hdri hlapi http httpd iconv icq icu id3 ide imagemagick imap innodb inotify ipod ipv6 irda ithreads jabber jadetex java java5 java6 jbig john jpeg jpeg2k kdrive kerberos kpathsea ladspa lame lapack laptop latex latex3 lcms ldap lensfun libffi libgda libnotify libsamplerate lirc lua lzo mad madwifi mail maildir mailwrapper mapnik math matroska mikmod mkl mmx mmxext mng modules mono moonlight motif mozdevelop mozilla mp3 mp4 mpeg mpi mplayer mtp mudflap musicbrainz mysql mysqli nautilus ncurses neXt netcdf netpbm network networking networkmanager nfs nls nntp nptl nptlonly nsplugin ntfs ntp numarray numeric obex objc ocaml octave odbc ogdi ogg ole openexr opengl openmp overview pam pango pcre pda pdf perl plotutils plugins png podcast policykit posix postgres postscript ppds pppd preview-latex proj projectx pstricks pulseaudio pymol python python-bindings qemu qhull qt3support qt4 quicktime readline reflection reiserfs rle romio rpc rrdcgi rrdtool samba sasl science sdl secure-delete semantic-desktop server session sip slang slp smbclient sms sndfile snmp soup sox speex spell spl sql sqlite sse sse2 ssl startup-notification stlport subtitles subversion suexec svg swig sysfs szip t1lib tcl tcpd tex tex4ht texmacs theora thinkpad threads thunderbird tidy tiff tk tntc tools truetype udev unicode usb userlocales utempter v4l2 virtualbox vorbis wav webdav webdav-serf webkit wifi win32codecs wmf wxwidgets x264 x86 xattr xcb xemacs xext xine xml xmlreader xmlrpc xorg xpm xulrunner xv xvid xvmc zlib zvbi" ALSA_CARDS="intel8x0 ac97_codec emu10k1 emu10k1x" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic auth_digest authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif so speling status unique_id userdir usertrack vhost_alias" DVB_CARDS="usb-wt220u" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev synaptics " KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="de fr" NETBEANS_MODULES="apisupport cnd dlight enterprise ergonomics groovy gsf harness ide identity j2ee java mobility nb php profiler ruby websvccommon xml" QEMU_SOFTMMU_TARGETS="i386 ppc ppc64 x86_64" QEMU_USER_TARGETS="arm i386 x86_64" RUBY_TARGETS="ruby18 jruby" USERLAND="GNU" VIDEO_CARDS="radeon vesa displaylink" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
(In reply to comment #5) > root@thinkpad:/root(95)# g-cpan -s TK-Gauge > Module id = Tk::Gauge > CPAN_USERID LUSOL (Stephen O. Lidie <sol0@Lehigh.EDU>) > CPAN_VERSION 0.3 > CPAN_FILE L/LU/LUSOL/Tk-Gauge-0.3.tar.gz > INST_FILE (not installed) > > root@thinkpad:/root(96)# g-cpan -i TK-Gauge > * TK::Gauge is not a CPAN module! > * Nothing to install!! g-cpan -i Tk-Gauge # s/TK/Tk/ Still surprising that g-cpan finds it but can't install it.
Thanks, I should see this myself. But I substituted after the succesful search only -s by -i and was wondering about the result.
Sorry, but g-cpan still does not work. I changed GCPAN_OVERLAY to /var/lib/cpan in /etc/make.conf: root@lynx:/root(13)# grep "^GCPAN" /etc/make.conf GCPAN_OVERLAY="/var/lib/cpan" I moved all gcpan ebuilds to /var/lib/cpan: root@lynx:/root(14)# ll /var/lib/cpan/perl-gcpan/ total 176 drwxr-xr-x 3 root root 4096 Mar 9 17:29 AI-Genetic-Pro/ drwxr-xr-x 3 root root 4096 Mar 9 17:29 Algorithm-Cluster/ ... drwxr-xr-x 3 root root 4096 Mar 9 17:28 aliased/ drwxr-xr-x 3 root root 4096 Mar 9 17:29 lib-abs/ I tried to remove all cpan Metadata (rm /root/.cpan /tmp/.cpan), started a new shell and did 'g-cpan -u': root@lynx:/root(15)# g-cpan -u * OVERLAY: /var/lib/layman/dotnet/perl-gcpan * Couldn't open folder /var/lib/layman/dotnet/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/lordvan/perl-gcpan * Couldn't open folder /var/lib/layman/lordvan/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/n4g/perl-gcpan * Couldn't open folder /var/lib/layman/n4g/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/science/perl-gcpan * Couldn't open folder /var/lib/layman/science/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/suka/perl-gcpan * Couldn't open folder /var/lib/layman/suka/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/x11/perl-gcpan * Couldn't open folder /var/lib/layman/x11/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/zugaina/perl-gcpan * Couldn't open folder /var/lib/layman/zugaina/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/java-overlay/perl-gcpan * Couldn't open folder /var/lib/layman/java-overlay/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/sunrise/perl-gcpan * Couldn't open folder /var/lib/layman/sunrise/perl-gcpan: No such file or directory * OVERLAY: /var/lib/layman/arcon/perl-gcpan * Couldn't open folder /var/lib/layman/arcon/perl-gcpan: No such file or directory * OVERLAY: * Couldn't open folder /usr/local/portage/perl-gcpan: No such file or directory * Everything was up to date, nothing to do! Why g-cpan looks at this layman and /usr/local/portage/perl-gcpan directories? It should only look at /var/lib/cpan. Then I tried to install a new package, which fails: root@lynx:/root(17)# g-cpan -s GD::Dashboard * No ebuild exists, pulling up CPAN listings for GD::Dashboard /Sorry, we have to rerun the configuration dialog for CPAN.pm due to some missing parameters... Normally CPAN.pm keeps config variables in memory and changes need to be saved in a separate 'o conf commit' command to make them permanent between sessions. If you set the 'auto_commit' option to true, changes to a config variable are always automatically committed to disk. <auto_commit> Always commit changes to config variables to disk? [no] no Please remember to call 'o conf commit' to make the config permanent! CPAN: Storable loaded ok (v2.21) Going to read '/tmp/.cpan/Metadata' Database was generated on Fri, 30 Apr 2010 09:27:04 GMT Module id = GD::Dashboard CPAN_USERID FERRANCE (David Ferrance <dave@ferrance.com>) CPAN_VERSION 0.04 CPAN_FILE F/FE/FERRANCE/GD-Dashboard-0.04.tar.gz UPLOAD_DATE 2002-01-24 INST_FILE (not installed) root@lynx:/root(18)# g-cpan -i GD::Dashboard -Sorry, we have to rerun the configuration dialog for CPAN.pm due to some missing parameters... Normally CPAN.pm keeps config variables in memory and changes need to be saved in a separate 'o conf commit' command to make them permanent between sessions. If you set the 'auto_commit' option to true, changes to a config variable are always automatically committed to disk. <auto_commit> Always commit changes to config variables to disk? [no] no Please remember to call 'o conf commit' to make the config permanent! CPAN: Storable loaded ok (v2.21) Going to read '/tmp/.cpan/Metadata' Database was generated on Fri, 30 Apr 2010 09:27:04 GMT |CPAN: Digest::SHA loaded ok (v5.48) CPAN: Compress::Zlib loaded ok (v2.027) Checksum for /tmp/.cpan/sources/authors/id/F/FE/FERRANCE/GD-Dashboard-0.04.tar.gz ok CPAN: Archive::Tar loaded ok (v1.60) GD-Dashboard-0.04/ GD-Dashboard-0.04/Dashboard.pm GD-Dashboard-0.04/examples/ GD-Dashboard-0.04/examples/barlight_off.jpg GD-Dashboard-0.04/examples/barlight_on.jpg GD-Dashboard-0.04/examples/ex1.pl GD-Dashboard-0.04/examples/ex2.pl GD-Dashboard-0.04/examples/m1.jpg GD-Dashboard-0.04/examples/m2.jpg GD-Dashboard-0.04/MANIFEST GD-Dashboard-0.04/Makefile.PL GD-Dashboard-0.04/Changes GD-Dashboard-0.04/test.pl GD-Dashboard-0.04/readme CPAN: File::Temp loaded ok (v0.22) Calculating dependencies... done! emerge: there are no ebuilds to satisfy "GD-Dashboard". But there is an ebuild: root@lynx:/root(22)# ll /var/lib/cpan/perl-gcpan/GD-Dashboard/GD-Dashboard-0.04.ebuild -rw-r--r-- 1 root root 363 Apr 30 17:14 /var/lib/cpan/perl-gcpan/GD-Dashboard/GD-Dashboard-0.04.ebuild
Adding GCPAN_OVERLAY to PORTDIR_OVERLAY solved my last problem: root@lynx:/root(14)# grep CPAN /etc/make.conf GCPAN_OVERLAY="/var/lib/cpan" PORTDIR_OVERLAY="/usr/local/portage ${GCPAN_OVERLAY}" But is this not a redundant setting? Can a configuration exists where the CPAN_OVERLAY should not searched by emerge?
Yes. Sometimes I have g-cpan generate packages straight into my main /usr/portage that I then clean up and commit.
