[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /lonnet/perl lonnet.pm
raeburn
raeburn@source.lon-capa.org
Thu, 11 Nov 2010 21:57:35 -0000
raeburn Thu Nov 11 21:57:35 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/lonnet/perl lonnet.pm
Log:
- Backport 1.1093.
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1056.4.13 loncom/lonnet/perl/lonnet.pm:1.1056.4.14
--- loncom/lonnet/perl/lonnet.pm:1.1056.4.13 Tue Nov 9 20:55:34 2010
+++ loncom/lonnet/perl/lonnet.pm Thu Nov 11 21:57:35 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1056.4.13 2010/11/09 20:55:34 raeburn Exp $
+# $Id: lonnet.pm,v 1.1056.4.14 2010/11/11 21:57:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2466,7 +2466,7 @@
}
if ($subdir eq 'scantron') {
$fname = 'scantron_orig_'.$fname;
- } else {
+ } else {
$fname="$subdir/$fname";
}
if ($context eq 'coursedoc') {
@@ -7397,7 +7397,7 @@
my ($file_name, $domain, $user) = @_;
my @check;
my $is_locked;
- push @check, $file_name;
+ push(@check,$file_name);
my %locked = &get('file_permissions',\@check,
$env{'user.domain'},$env{'user.name'});
my ($tmp)=keys(%locked);
@@ -7414,6 +7414,7 @@
} else {
$is_locked = 'false';
}
+ return $is_locked;
}
sub declutter_portfile {