1 |
Author: mcummings |
2 |
Date: 2005-05-15 19:47:18 +0200 (Sun, 15 May 2005) |
3 |
New Revision: 30 |
4 |
|
5 |
Modified: |
6 |
trunk/bin/g-cpan.pl |
7 |
trunk/extra-docs/Changes |
8 |
Log: |
9 |
Testing colors, fixing an annoying bug on an empty emerge list :) |
10 |
|
11 |
Modified: trunk/bin/g-cpan.pl |
12 |
=================================================================== |
13 |
--- trunk/bin/g-cpan.pl 2005-05-15 16:44:07 UTC (rev 29) |
14 |
+++ trunk/bin/g-cpan.pl 2005-05-15 17:47:18 UTC (rev 30) |
15 |
@@ -81,7 +81,7 @@ |
16 |
# Output error if more than one switch is activated |
17 |
if ( $search + $list + $install + $upgrade > 1 ) { |
18 |
print_err( |
19 |
-"You can't combine search, list, install or upgrade with each other. Pick up one !\n"); |
20 |
+"You can't combine search, list, install or upgrade with each other. Please choose only one\n"); |
21 |
exit_usage(); |
22 |
} |
23 |
|
24 |
@@ -615,7 +615,12 @@ |
25 |
print_info ("Calling: emerge --oneshot --digest @ebuild_list") if ($verbose); |
26 |
# FIXME Sniper |
27 |
# check return values |
28 |
- system( "emerge", @flags, "--oneshot", "--digest", @ebuild_list ); |
29 |
+ if (@ebuild_list) { |
30 |
+ system( "emerge", @flags, "--oneshot", "--digest", @ebuild_list ) |
31 |
+ or die "Emerge failed: $!"; |
32 |
+ } else { |
33 |
+ print_err ("No ebuilds generated for emerge."); |
34 |
+ } |
35 |
} |
36 |
|
37 |
sub get_globals { |
38 |
|
39 |
Modified: trunk/extra-docs/Changes |
40 |
=================================================================== |
41 |
--- trunk/extra-docs/Changes 2005-05-15 16:44:07 UTC (rev 29) |
42 |
+++ trunk/extra-docs/Changes 2005-05-15 17:47:18 UTC (rev 30) |
43 |
@@ -1,3 +1,8 @@ |
44 |
+15/05/2005 - mcummings |
45 |
+ |
46 |
+- Added check to make sure @ebuild_list had contents before trying to run emerge - less chance of emerge just junking out on us. |
47 |
+- Added "or die" to system call - at least its a start at handling an error return from the call to portage |
48 |
+ |
49 |
15/05/2005 - cab in wonderland |
50 |
|
51 |
- Lots of colours everywhere ! |
52 |
|
53 |
|
54 |
-- |
55 |
gentoo-perl@g.o mailing list |