| 1 |
Author: ulm |
| 2 |
Date: 2009-04-19 20:42:09 +0000 (Sun, 19 Apr 2009) |
| 3 |
New Revision: 470 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/NEWS |
| 8 |
trunk/modules/rc.eselect |
| 9 |
Log: |
| 10 |
Handle missing scripts and fix describe_*_parameters in rc module. |
| 11 |
|
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2009-04-19 11:41:43 UTC (rev 469) |
| 16 |
+++ trunk/ChangeLog 2009-04-19 20:42:09 UTC (rev 470) |
| 17 |
@@ -1,5 +1,10 @@ |
| 18 |
2009-04-18 Ulrich Mueller <ulm@g.o> |
| 19 |
|
| 20 |
+ * modules/rc.eselect (do_delete): Don't die if the script is no |
| 21 |
+ longer in /etc/init.d/. Fixes bug 156866. |
| 22 |
+ (describe_add_parameters, describe_delete_parameters): Suppress |
| 23 |
+ newlines. |
| 24 |
+ |
| 25 |
* AUTHORS: Add fauli and myself for the ctags and emacs modules. |
| 26 |
|
| 27 |
* NEWS: Merge NEWS from branch-1.0.x. Add current changes. |
| 28 |
|
| 29 |
Modified: trunk/NEWS |
| 30 |
=================================================================== |
| 31 |
--- trunk/NEWS 2009-04-19 11:41:43 UTC (rev 469) |
| 32 |
+++ trunk/NEWS 2009-04-19 20:42:09 UTC (rev 470) |
| 33 |
@@ -4,6 +4,7 @@ |
| 34 |
trunk: |
| 35 |
Bug fixes: |
| 36 |
- Fixed bug #155814: Clear aliases and shell functions. |
| 37 |
+ - Fixed bug #156886: Handle missing scripts in rc module. |
| 38 |
- Various improvements in opengl module. |
| 39 |
|
| 40 |
New features: |
| 41 |
|
| 42 |
Modified: trunk/modules/rc.eselect |
| 43 |
=================================================================== |
| 44 |
--- trunk/modules/rc.eselect 2009-04-19 11:41:43 UTC (rev 469) |
| 45 |
+++ trunk/modules/rc.eselect 2009-04-19 20:42:09 UTC (rev 470) |
| 46 |
@@ -77,8 +77,7 @@ |
| 47 |
} |
| 48 |
|
| 49 |
describe_add_parameters() { |
| 50 |
- echo "<script>" |
| 51 |
- echo "<runlevels>" |
| 52 |
+ echo "<script> <runlevels>" |
| 53 |
} |
| 54 |
|
| 55 |
describe_add_options() { |
| 56 |
@@ -120,8 +119,7 @@ |
| 57 |
} |
| 58 |
|
| 59 |
describe_delete_parameters() { |
| 60 |
- echo "<script>" |
| 61 |
- echo "<runlevels>" |
| 62 |
+ echo "<script> <runlevels>" |
| 63 |
} |
| 64 |
|
| 65 |
describe_delete_options() { |
| 66 |
@@ -133,9 +131,9 @@ |
| 67 |
[[ ${#@} -gt 0 ]] \ |
| 68 |
|| die -q "Please specify the init script to be deleted!" |
| 69 |
local script=${1##*/} |
| 70 |
- [[ -e ${ROOT}/etc/init.d/${script} ]] \ |
| 71 |
- || die -q "Please specify a valid init script!" |
| 72 |
shift 1 |
| 73 |
+ [[ -e ${ROOT}/etc/init.d/${script} ]] || write_warning_msg \ |
| 74 |
+ "Init script not found in /etc/init.d/. Continuing anyway." |
| 75 |
local runlevels=${@:-default} |
| 76 |
write_list_start "Deleting $(highlight ${script}) from following runlevels" |
| 77 |
for runlevel in ${runlevels} ; do |
Archives