Commit 30880bd3 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' into snmpit-mle

parents 27d82cbf ad6a8888
...@@ -17,8 +17,6 @@ use vars qw(@ISA @EXPORT); ...@@ -17,8 +17,6 @@ use vars qw(@ISA @EXPORT);
@ISA = "Exporter"; @ISA = "Exporter";
@EXPORT = qw ( ); @EXPORT = qw ( );
# Must come after package declaration!
use lib '@prefix@/lib';
use GeniCMV2; use GeniCMV2;
use GeniResponse; use GeniResponse;
use GeniCredential; use GeniCredential;
......
...@@ -17,8 +17,6 @@ use vars qw(@ISA @EXPORT); ...@@ -17,8 +17,6 @@ use vars qw(@ISA @EXPORT);
@ISA = "Exporter"; @ISA = "Exporter";
@EXPORT = qw ( ); @EXPORT = qw ( );
# Must come after package declaration!
use lib '@prefix@/lib';
use GeniDB; use GeniDB;
use Genixmlrpc; use Genixmlrpc;
use GeniResponse; use GeniResponse;
......
...@@ -18,7 +18,6 @@ use vars qw(@ISA @EXPORT); ...@@ -18,7 +18,6 @@ use vars qw(@ISA @EXPORT);
@EXPORT = qw ( ); @EXPORT = qw ( );
# Must come after package declaration! # Must come after package declaration!
use lib '@prefix@/lib';
use GeniDB; use GeniDB;
use GeniResponse; use GeniResponse;
use GeniTicket; use GeniTicket;
......
...@@ -17,7 +17,6 @@ use vars qw(@ISA @EXPORT); ...@@ -17,7 +17,6 @@ use vars qw(@ISA @EXPORT);
@EXPORT = qw ( ); @EXPORT = qw ( );
# Must come after package declaration! # Must come after package declaration!
use lib '@prefix@/lib';
use GeniDB; use GeniDB;
use Genixmlrpc; use Genixmlrpc;
use GeniResponse; use GeniResponse;
......
#!/usr/bin/perl -wT #!/usr/bin/perl -wT
# #
# GENIPUBLIC-COPYRIGHT # GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group. # Copyright (c) 2008-2011 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
package GeniSES; package GeniSES;
...@@ -18,7 +18,6 @@ use vars qw(@ISA @EXPORT); ...@@ -18,7 +18,6 @@ use vars qw(@ISA @EXPORT);
@EXPORT = qw ( ); @EXPORT = qw ( );
# Must come after package declaration! # Must come after package declaration!
use lib '@prefix@/lib';
use GeniDB; use GeniDB;
use User; use User;
use Genixmlrpc; use Genixmlrpc;
......
...@@ -274,7 +274,7 @@ else { ...@@ -274,7 +274,7 @@ else {
$errors["Max. Duration"] = "No or invalid time provided"; $errors["Max. Duration"] = "No or invalid time provided";
} }
# The user can override autoswap timeout, but limit unless an admin. # The user can override autoswap timeout, but limit unless an admin.
if ($formfields["exp_idleswap_timeout"] > 24 * 5 && !ISADMIN()) { if ($formfields["exp_autoswap_timeout"] > 24 * 5 && !ISADMIN()) {
$errors["Max. Duration"] = "5 days maximum - ". $errors["Max. Duration"] = "5 days maximum - ".
"you must ask testbed operations for more"; "you must ask testbed operations for more";
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment