(action_option): use info instead of print, make

messages more consistent.


git-svn-id: svn://tug.org/texlive/trunk@11897 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 29 insertions, 29 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index 6aedbc04fb2..02266898dfa 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -1931,89 +1931,89 @@ sub action_option {
       $localtlpdb->option_location($loc);
       $localtlpdb->save;
     } else {
-      info("Default installation location: "
-           . $localtlpdb->option_location . "\n");
+      info("Default installation location: ",
+           $localtlpdb->option_location, "\n");
     }
   } elsif ($what =~ m/^docfiles$/i) {
     # changes the default docfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"),
-            " installing documentation files.\n";
+      info("tlmgr: defaulting to", ($loc ? "" : " not"),
+           " installing documentation files.\n");
       $localtlpdb->option_install_docfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install documentation files: ",
-            $localtlpdb->option_install_docfiles, "\n";
+      info("Install documentation files: ",
+           $localtlpdb->option_install_docfiles, "\n");
     }
   } elsif ($what =~ m/^srcfiles$/i) {
     # changes the default srcfiles
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"),
-            " installing source files.\n";
+      info("tlmgr: defaulting to", ($loc ? "" : " not"),
+           " installing source files.\n");
       $localtlpdb->option_install_srcfiles($loc);
       $localtlpdb->save;
     } else {
-      print "Install source files: ",
-            $localtlpdb->option_install_srcfiles, "\n";
+      info("Install source files: ",
+           $localtlpdb->option_install_srcfiles, "\n");
     }
   } elsif ($what =~ m/^formats$/i) {
     # changes the default formats
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      print "Defaulting to", ($loc ? "" : " not"),
-            " generating format files on installation.\n";
+      info("tlmgr: defaulting to", ($loc ? "" : " not"),
+           " generating format files on installation.\n");
       $localtlpdb->option_create_formats($loc);
       $localtlpdb->save;
     } else {
-      print "Create formats on installation: ",
-            $localtlpdb->option_create_formats, "\n";
+      info("Create formats on installation: ",
+            $localtlpdb->option_create_formats, "\n");
     }
   } elsif ($what =~ m/^sys_man$/i) {
     # changes the default sys_man
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      info ( "Setting default destination for symlinks to man pages to $loc\n");
+      info("tlmgr: setting destination for symlinks to man pages to $loc\n");
       $localtlpdb->option_sys_man ($loc);
       $localtlpdb->save;
     } else {
-      print "Default destination for symlinks to man pages: ",
-        $localtlpdb->option_sys_man, "\n";
+      info("Destination for symlinks to man pages: ",
+           $localtlpdb->option_sys_man, "\n");
     }
   } elsif ($what =~ m/^sys_info$/i) {
     # changes the default sys_info
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      info ( "Setting default destination for symlinks to info pages to $loc\n");
+      info("tlmgr: setting destination for symlinks to info pages to $loc\n");
       $localtlpdb->option_sys_info ($loc);
       $localtlpdb->save;
     } else {
-      print "Default destination for symlinks to info pages: ",
-        $localtlpdb->option_sys_info, "\n";
+      info("Default destination for symlinks to info pages: ",
+           $localtlpdb->option_sys_info, "\n");
     }
   } elsif ($what =~ m/^sys_bin$/i) {
     # changes the default sys_bin
     my $loc = shift @ARGV;
     if (defined($loc)) {
-      info ( "Setting default destination for symlinks to binaries to $loc\n");
+      info("tlmgr: setting destination for symlinks to binaries to $loc\n");
       $localtlpdb->option_sys_bin ($loc);
       $localtlpdb->save;
     } else {
-      print "Default destination for symlinks to binaries: ",
-        $localtlpdb->option_sys_bin, "\n";
+      info("Default destination for symlinks to binaries: ",
+           $localtlpdb->option_sys_bin, "\n");
     }
   } elsif (member($what, @AllowedConfigOptions)) {
-    # for all further options not handled till now we check that they
-    # appear in the list of allowed options and if they do, we set/read
-    # the values, otherwise we warn
+    # for all further options not handled above, we check whether they
+    # appear in the list of allowed options; if they do, we set/read
+    # the values, otherwise we warn.
     my $val = shift @ARGV;
     if (defined($val)) {
-      print "Setting option $what to $val.\n";
+      info("tlmgr: setting option $what to $val.\n");
       $localtlpdb->option($what,$val);
       $localtlpdb->save;
     } else {
-      print "Option $what = ", $localtlpdb->option($what), "\n";;
+      info("Option $what = ", $localtlpdb->option($what), "\n");
     }
   } else {
     tlwarn "Option $what is currently not supported.\n";
@@ -3243,7 +3243,7 @@ output file, we recommend invoking C<tlmgr> twice.)
 =item B<--localcfg> I<local conf file>
 
 specifies the (optional) local additions (defaults to the respective
-location in C<TEXMFSYSVAR>).
+location in C<TEXMFLOCAL>).
 
 =back