This seems to be a better patch, as it also catches if the user
specified --update-script '' on the CLI:
Index: sbin/si_getimage
===================================================================
--- sbin/si_getimage (revision 4539)
+++ sbin/si_getimage (working copy)
@@ -197,10 +197,12 @@
}
# be sure $update_script was passed a proper option
-unless(
- ($update_script eq "yes")
- or ($update_script eq "no" )
-) { die "\n$program_name: --update-script must be yes or no.\n$get_help\n\n"; }
+if (defined $update_script) {
+ unless(
+ ($update_script eq "yes")
+ or ($update_script eq "no" )
+ ) { die "\n$program_name: --update-script must be yes or
no.\n$get_help\n\n"; }
+}
SystemImager::Server->validate_ip_assignment_option($ip_assignment_method);
SystemImager::Server->validate_post_install_option($post_install);
Cheers,
Bernard
On Thu, Apr 7, 2011 at 2:55 PM, Bernard Li <bern...@vanhpc.org> wrote:
> Hi Thomas:
>
> On Thu, Apr 7, 2011 at 2:30 PM, Thomas Zeiser
> <thomas.zei...@rrze.uni-erlangen.de> wrote:
>
>> However, I'm not (yet) really happy that the argument "--update-script
>> yes|no" now is mandatory for si_getimage. (If no --update-script
>> argument is given, you get an warning/error in line 200).
>> But that's not really a show stopper and I'll adapt my workflow.
>
> That's probably because I took out the unless clause for empty string.
> Try this patch and see if it works:
>
> Index: sbin/si_getimage
> ===================================================================
> --- sbin/si_getimage (revision 4539)
> +++ sbin/si_getimage (working copy)
> @@ -197,10 +197,12 @@
> }
>
> # be sure $update_script was passed a proper option
> -unless(
> - ($update_script eq "yes")
> - or ($update_script eq "no" )
> -) { die "\n$program_name: --update-script must be yes or
> no.\n$get_help\n\n"; }
> +if ($update_script) {
> + unless(
> + ($update_script eq "yes")
> + or ($update_script eq "no" )
> + ) { die "\n$program_name: --update-script must be yes or
> no.\n$get_help\n\n"; }
> +}
>
> SystemImager::Server->validate_ip_assignment_option($ip_assignment_method);
> SystemImager::Server->validate_post_install_option($post_install);
>
> Cheers,
>
> Bernard
>
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
sisuite-users mailing list
sisuite-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sisuite-users
