summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 23:03:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 23:03:26 -0600
commit0cc58e60f4c91b755030d43e20469d2a7251dfc4 (patch)
tree7e3a8b3d90b2ecaa2565f92b3d7155627bc09e0b
parent11f6735335bc9e5529f7ba214dbe138cb57a9127 (diff)
parentac1f639daf758675f0a324b197da71850f56aed2 (diff)
downloadtdesdk-0cc58e60f4c91b755030d43e20469d2a7251dfc4.tar.gz
tdesdk-0cc58e60f4c91b755030d43e20469d2a7251dfc4.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdesdk
-rwxr-xr-xscripts/tdesvn-build14
1 files 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;
}