summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPDB.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-12-25 23:45:02 +0000
committerNorbert Preining <preining@logic.at>2008-12-25 23:45:02 +0000
commitd90a3a7b477d786772b04f589b2742f7abcd5333 (patch)
tree7c46cbdbd9e7b5e5c472d512750654d4804f3561 /Master/tlpkg/TeXLive/TLPDB.pm
parent117e69b02577f23fd465af4635215c822abf9ff8 (diff)
rename $ret to $errors since it collects errors in remvoe_symlinks
git-svn-id: svn://tug.org/texlive/trunk@11720 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index ffe004d2053..5b394dfd8d0 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -989,7 +989,7 @@ sub add_symlinks {
sub remove_symlinks {
my $self = shift;
- my $ret = 0;
+ my $errors = 0;
my $Master = $self->{'root'};
my $arch = $self->option_platform;
my $plat_bindir = "$Master/bin/$arch";
@@ -1010,7 +1010,7 @@ sub remove_symlinks {
$plat_bindir = $1;
}
} else {
- $ret++;
+ $errors++;
tlwarn ("$sys_bin/pdftex not present or not a link, not removing any link of binaries!\n");
}
if ($plat_bindir) {
@@ -1022,7 +1022,7 @@ sub remove_symlinks {
(readlink("$sys_bin/$f") =~ m;^$Master/bin/$plat_bindir/;)) {
unlink("$sys_bin/$f");
} else {
- $ret++;
+ $errors++;
tlwarn ("not removing $sys_bin/$f, not a link or wrong destination!\n");
}
}
@@ -1041,13 +1041,13 @@ sub remove_symlinks {
(readlink("$sys_info/$f") =~ m;^$Master/texmf/doc/info/;)) {
unlink("$sys_info/$f");
} else {
- $ret++;
+ $errors++;
tlwarn ("not removing $sys_info/$f, not a link or wrong destination!\n");
}
}
`rmdir "$sys_info" 2>/dev/null`;
} else {
- $ret++;
+ $errors++;
tlwarn ("destination of info symlink $sys_info not writable, no removal of links of info files done!\n");
}
# man files
@@ -1067,7 +1067,7 @@ sub remove_symlinks {
(readlink("$sys_man/$m/$f") =~ m;^$Master/texmf/doc/man/$m/;)) {
unlink("$sys_man/$m/$f");
} else {
- $ret++;
+ $errors++;
tlwarn ("not removing $sys_man/$m/$f, not a link or wrong destination!\n");
}
}
@@ -1076,12 +1076,12 @@ sub remove_symlinks {
}
`rmdir "$sys_man" 2>/dev/null`;
} else {
- $ret++;
+ $errors++;
tlwarn ("destination of man symlink $sys_man not writable, no removal of links of man files done!\n");
}
}
- # we collected errors in $ret, so return the ! of it
- return (!$ret);
+ # we collected errors in $errors, so return the ! of it
+ return (!$errors);
}
=pod