die() called in pkg_pretend() only aborts the install task when --pretend'ing.

[ingmar]

paludis --install --pretend works as I expect it to:

indigo ~ # paludis -ip nvidia-drivers
Building target list...
Building dependency list...

These packages will be installed:

* x11-drivers/nvidia-drivers::x11 [N 173.08] <target>
    "NVIDIA X11 driver and GLX libraries"
    -acpi platform: amd64

Total: 1 package (1 new)
nvidia-drivers-173.08>
nvidia-drivers-173.08> !!! ERROR in x11-drivers/nvidia-drivers-173.08:
nvidia-drivers-173.08> !!! In require_configured_kernel at line 15
nvidia-drivers-173.08> !!! Kernel not configured, no .config found in /usr/src/linux
nvidia-drivers-173.08>
nvidia-drivers-173.08> !!! Call stack:
nvidia-drivers-173.08> !!!    * require_configured_kernel (/var/repositories/arbor.git/exlibs/linux-info.exlib:15)
nvidia-drivers-173.08> !!!    * pkg_pretend (/var/repositories/x11.git/packages/x11-drivers/nvidia-drivers/nvidia-drivers-173.08.exheres-0:34)
nvidia-drivers-173.08> !!!    * exheres_internal_pretend (/usr/libexec/paludis/exheres-0/pkg_pretend.bash:35)
nvidia-drivers-173.08> !!!    * ebuild_main (/usr/libexec/paludis/ebuild.bash:460)
nvidia-drivers-173.08> !!!    * main (/usr/libexec/paludis/ebuild.bash:479)
nvidia-drivers-173.08>
nvidia-drivers-173.08> diefunc: making ebuild PID 3558 exit with error
nvidia-drivers-173.08> die trap: exiting with error.

 * No unread news items found

--

paludis --install doesn't (Added a die call in pkg_pretend...):

indigo ~ # paludis -i nvidia-drivers
Building target list...             
Building dependency list...         

These packages will be installed:

* x11-drivers/nvidia-drivers::x11 [N 173.08] <target>
    "NVIDIA X11 driver and GLX libraries"            
    -acpi platform: amd64                            

Total: 1 package (1 new)
nvidia-drivers-173.08>  
nvidia-drivers-173.08> !!! ERROR in x11-drivers/nvidia-drivers-173.08:
nvidia-drivers-173.08> !!! In require_configured_kernel at line 15    
nvidia-drivers-173.08> !!! Kernel not configured, no .config found in /usr/src/linux
nvidia-drivers-173.08>                                                              
nvidia-drivers-173.08> !!! Call stack:                                              
nvidia-drivers-173.08> !!!    * require_configured_kernel (/var/repositories/arbor.git/exlibs/linux-info.exlib:15)
nvidia-drivers-173.08> !!!    * pkg_pretend (/var/repositories/x11.git/packages/x11-drivers/nvidia-drivers/nvidia-drivers-173.08.exheres-0:34)
nvidia-drivers-173.08> !!!    * exheres_internal_pretend (/usr/libexec/paludis/exheres-0/pkg_pretend.bash:35)                                 
nvidia-drivers-173.08> !!!    * ebuild_main (/usr/libexec/paludis/ebuild.bash:460)                                                            
nvidia-drivers-173.08> !!!    * main (/usr/libexec/paludis/ebuild.bash:479)                                                                   
nvidia-drivers-173.08>                                                                                                                        
nvidia-drivers-173.08> diefunc: making ebuild PID 4207 exit with error                                                                        
nvidia-drivers-173.08> die trap: exiting with error.                                                                                          

(1 of 1) Installing x11-drivers/nvidia-drivers-173.08:0::x11

Checking 'NVIDIA-Linux-x86_64-173.08-pkg2.run'... ok
=== Running ebuild phase killold as root:root...    
=== Starting builtin_killold                        
=== Done builtin_killold                            
=== Completed ebuild phase killold                  
=== Running ebuild phases init saveenv as paludisbuild:paludisbuild...
=== Starting builtin_init                                             
=== Done builtin_init                                                 
=== Starting builtin_saveenv                                          
=== Done builtin_saveenv                                              
=== Completed ebuild phases init saveenv                              
=== Running ebuild phases loadenv setup saveenv as root:root...       
=== Starting builtin_loadenv                                          
=== Done builtin_loadenv                                              
=== Starting pkg_setup                                                

!!! ERROR in x11-drivers/nvidia-drivers-173.08:
!!! In pkg_setup at line 1342                  
!!! (no message provided)                      

!!! Call stack:
!!!    * pkg_setup (/var/tmp/paludis/build/x11-drivers-nvidia-drivers-173.08/temp/loadsaveenv:1342)
!!!    * exheres_internal_setup (/usr/libexec/paludis/exheres-0/pkg_setup.bash:42)
!!!    * ebuild_main (/usr/libexec/paludis/ebuild.bash:460)
!!!    * main (/usr/libexec/paludis/ebuild.bash:479)

diefunc: making ebuild PID 4412 exit with error
die trap: exiting with error.

Install error:
  * In program paludis (--show-use-descriptions none --show-reasons none --log-level warning) -i nvidia-drivers:
  * When performing install action from command line:
  * When executing install task:
  * When installing 'x11-drivers/nvidia-drivers-173.08:0::x11':
  * Install error: Install failed for 'x11-drivers/nvidia-drivers-173.08:0::x11'



Summary of failures:

* x11-drivers/nvidia-drivers-173.08:0::x11: failure

Total: 1 package, 0 successes, 0 skipped, 1 failure, 0 unreached

I'd expect a die in pkg_pretend to abort the install in both cases.

[ciaranm]

r4669