trivial perl var warnings

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

4 files changed, 9 insertions, 35 deletions

diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 9c200de0990..b83c0d541d2 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -1,13 +1,13 @@
 # $Id$
 # TeXLive::TLPSRC.pm - module for handling tlpsrc files
-# Copyright 2007-2013 Norbert Preining
+# Copyright 2007-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLPSRC;
 
 use FileHandle;
-use TeXLive::TLConfig qw($CategoriesRegexp);
+use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory);
 use TeXLive::TLUtils;
 use TeXLive::TLPOBJ;
 use TeXLive::TLTREE;
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index e206b7de681..d2d05294405 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -1,6 +1,6 @@
 # $Id$
 # TeXLive::TLPaper.pm - query/modify paper sizes for our various programs
-# Copyright 2008-2012 Norbert Preining
+# Copyright 2008-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -737,7 +737,7 @@ sub paper_do_simple {
           return;
         }
         for (@newlines) { print TMP; }
-        close(TMP) || warn "$0: close(>$outfile) failed: $!";
+        close(TMP) || warn "$0: close(>$outp) failed: $!";
         TeXLive::TLUtils::announce_execute_actions("regenerate-formats")
           if ($prog eq "context");
       } else {
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index a922fca9c16..ccf82542717 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -336,11 +336,7 @@ from C<%ENV>.
 
 =cut
 
-if ($is_win) {
-  $global_tmp = expand_string(get_system_env()->{'TEMP'}) if $is_win;
-}
-
-my $global_tmp = "/tmp";
+my $global_tmp = $is_win ? expand_string(get_system_env()->{'TEMP'}) : "/tmp";
 
 sub global_tmpdir { return $global_tmp; }
 
diff --git a/TODO b/TODO
index 719b66ba02a..54db7363bfd 100644
--- a/TODO
+++ b/TODO
@@ -30,32 +30,6 @@ Make initialization of those options from the tlpdb using
 	$tlpdb->option('-installer' => 1)
 not complain on the tlpsrc-set (installer only option) not complain
 
-0.5 Mails from Karl
-===========================================
-perl -cw has the following minor complaints about the *.pm files.
-(They were all clean at one point.)  I guess I should run this regularly ...
-
-Name "TeXLive::TLMedia::nopostinstall" used only once: possible typo at
-TLMedia.pm line 527.
-
-Name "main::tlpsrc_pattern_no_warn_negative" used only once: possible typo at
-TLPSRC.pm line 426.
-Name "TeXLive::TLPSRC::DefaultCategory" used only once: possible typo at
-TLPSRC.pm line 35.
-
-Name "TeXLive::TLPaper::outfile" used only once: possible typo at TLPaper.pm
-line 661.
-
-Name "TeXLive::TLWinGoo::global_tmp" used only once: possible typo at
-TLWinGoo.pm line 325.
----------------
-Would you have any time/interest in hacking place to discover and svn rm
-empty dirs?  I think it would have to be done after the other svn
-operations are done, since before the dirs with removed things won't be
-empty.
-
-It works ok to rm them the next day, but it is an extra update and seems
-generally less than ideal.
 
 1a. fix ctan2tds et al.
 -----------------------
@@ -64,6 +38,10 @@ rewriting from scratch.)
 
 tlprm and place do not know how to delete all emptied parent directories.
 
+csplain cstex cs cslatex (and others) -- tlpkginfo should create the
+directories, so that tlpkg-ctan-check can check them, instead of doing
+some of the weird unpacking in ctan2tds.pl.
+
 if ask for susy and have Susy, or reverse, complain.
 In general, the package name field should match the directory.