From ac1f639daf758675f0a324b197da71850f56aed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 17 Feb 2013 12:01:55 +0100 Subject: [PATCH] Fix unintended rename of LOCKFILE --- scripts/tdesvn-build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build index ac998f28..657b0390 100755 --- a/scripts/tdesvn-build +++ b/scripts/tdesvn-build @@ -2231,7 +2231,7 @@ DONE sub get_lock { my $lockfile = "$ENV{HOME}/.tdesvn-lock"; - sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL; + sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL; my $errorCode = $!; # Save for later testing. # Install signal handlers to ensure that the lockfile gets closed. @@ -2298,16 +2298,16 @@ sub get_lock # twice. warning " y[WARNING]: stale tdesvn-build lockfile found, deleting."; unlink $lockfile; - sysopen LOCTDEFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do + sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do { - print LOCTDEFILE "$$\n"; - close LOCTDEFILE; + print LOCKFILE "$$\n"; + close LOCKFILE; }; return 1; # Hope the sysopen worked. } - print LOCTDEFILE "$$\n"; - close LOCTDEFILE; + print LOCKFILE "$$\n"; + close LOCKFILE; # Even if we fail it's generally better to allow the script to proceed # without being a jerk about things, especially as more non-CLI-skilled @@ -2320,7 +2320,7 @@ sub close_lock { my $lockfile = "$ENV{HOME}/.tdesvn-lock"; - close LOCTDEFILE; + close LOCKFILE; unlink $lockfile; }