diff options
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLTREE.pm | 13 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpsrc2tlpdb | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index b238e4b96df..fa26389a356 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -1,5 +1,5 @@ # $Id$ -# TeXLive::TLTREE.pm - helper module to work with the tree of all files +# TeXLive::TLTREE.pm - work with the tree of all files # Copyright 2007, 2008 Norbert Preining # # This file is licensed under the GNU General Public License version 2 @@ -29,18 +29,16 @@ sub new { sub init_from_svn { my $self = shift; - die "Undefined svn root" if !defined($self->{'svnroot'}); - debug("initializing from svn tree $self->{'svnroot'}\n"); + die "undefined svn root" if !defined($self->{'svnroot'}); my @lines = `cd $self->{'svnroot'} && svn status -v`; - debug("got lines\n"); $self->_initialize_lines(@lines); debug("initialized lines\n"); } sub init_from_statusfile { my $self = shift; - die("Need a filename of svn status file!") if (@_ != 1); - open(TMP,"<$_[0]") || die("Cannot open svn status file: $_[0]"); + die "need a filename of svn status file" if (@_ != 1); + open(TMP,"<$_[0]") || die "open of svn status file($_[0]) failed: $!"; my @lines = <TMP>; close(TMP); $self->_initialize_lines(@lines); @@ -68,7 +66,6 @@ sub _initialize_lines { chomp (my $oldpwd = `pwd 2>&1`); debug("_il: got oldpwd=$oldpwd\n"); chdir($self->svnroot) || die "chdir($self->{svnroot}) failed: $!"; - debug("_il: walking lines\n"); foreach my $l (@lines) { chomp($l); next if ($l =~ /^\?/); # ignore files not under version control @@ -94,12 +91,10 @@ sub _initialize_lines { } } # save list of architectures -debug("_il: architectures tree\n"); $self->architectures(keys(%archs)); # now do some magic # - create list of top level dirs with a list of full path names of # the respective dir attached -debug("_il: walking tree\n"); $self->walk_tree(\&find_alldirs); chdir($oldpwd) || die "chdir($oldpwd) failed: $!"; diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb index a7c24b4a667..fae637efeea 100755 --- a/Master/tlpkg/bin/tlpsrc2tlpdb +++ b/Master/tlpkg/bin/tlpsrc2tlpdb @@ -63,7 +63,6 @@ sub main require TeXLive::TeXCatalogue; # not at compile time, for now anyway. info ("$0: reading TeX Catalogue $opt_catalogue ...\n"); $tlc = TeXLive::TeXCatalogue->new ("location" => $opt_catalogue); -print "after cat\n"; } my $tlpsrc_dir = "$opt_master/tlpkg/tlpsrc"; @@ -75,13 +74,10 @@ print "after cat\n"; info ("$0: reading Master $opt_master ...\n"); my $tltree = TeXLive::TLTREE->new ("svnroot" => $opt_master); -print "after new\n"; if ($opt_fromfiles) { $tltree->init_from_files; -print "after files\n"; } else { $tltree->init_from_svn; -print "after svn\n"; } info ("$0: updating from tlpsrc ...\n"); |