diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-11 13:04:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-11 13:04:27 +0000 |
| commit | c522504578e642f961ed29fb035e9e5da8f70521 (patch) | |
| tree | d31aba77f24629dfef165088c9195b004bfcc84a | |
| parent | f259e13c6765add90189919e5efdf9cb29753fed (diff) | |
| download | drakx-backup-do-not-use-c522504578e642f961ed29fb035e9e5da8f70521.tar drakx-backup-do-not-use-c522504578e642f961ed29fb035e9e5da8f70521.tar.gz drakx-backup-do-not-use-c522504578e642f961ed29fb035e9e5da8f70521.tar.bz2 drakx-backup-do-not-use-c522504578e642f961ed29fb035e9e5da8f70521.tar.xz drakx-backup-do-not-use-c522504578e642f961ed29fb035e9e5da8f70521.zip | |
- better error message for bad modules in modules.pl
- handle the exit code of modules.pl
(so that .mar files not generated is more understandable)
| -rw-r--r-- | kernel/modules.pl | 4 | ||||
| -rwxr-xr-x | kernel/update_kernel | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl index 82577b09b..64049b25d 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -75,9 +75,9 @@ sub flatten_and_check { if (my @bad = difference2(\@l, [ category2modules($category) ])) { foreach (@bad) { if (my $cat = module2category($_)) { - warn "module $_ is in category $cat, not in $category\n"; + warn "ERROR in modules.pl: module $_ is in category $cat, not in $category\n"; } else { - warn "unknown module $_\n"; + warn "ERROR in modules.pl: unknown module $_\n"; } } exit 1; diff --git a/kernel/update_kernel b/kernel/update_kernel index bbfa405c3..4ed1ff246 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -93,7 +93,8 @@ for i in $ALL_KERNELS/*; do done cp -f all.modules/$main/modules.description . -eval `perl modules.pl images` +l=`perl modules.pl images` || exit 1 +eval $l for i in $ALL_KERNELS/*; do kern=`basename $i` |