Commit e739457c authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Fix to the "hackprefix" ... watch for images in /groups.

parent 072de20d
...@@ -148,6 +148,7 @@ my $BOSSIP = "@BOSSNODE_IP@"; ...@@ -148,6 +148,7 @@ my $BOSSIP = "@BOSSNODE_IP@";
my $CONTROL = "@USERNODE@"; my $CONTROL = "@USERNODE@";
my $NONFS = @NOSHAREDFS@; my $NONFS = @NOSHAREDFS@;
my $PROJROOT = "@PROJROOT_DIR@"; my $PROJROOT = "@PROJROOT_DIR@";
my $GROUPROOT = "@GROUPSROOT_DIR@";
my $WITHPROVENANCE= @IMAGEPROVENANCE@; my $WITHPROVENANCE= @IMAGEPROVENANCE@;
my $WITHDELTAS = @IMAGEDELTAS@; my $WITHDELTAS = @IMAGEDELTAS@;
my $ISFS = ("@BOSSNODE_IP@" eq "@FSNODE_IP@") ? 1 : 0; my $ISFS = ("@BOSSNODE_IP@" eq "@FSNODE_IP@") ? 1 : 0;
...@@ -627,7 +628,10 @@ my $filename = $image->TempImageFile(); ...@@ -627,7 +628,10 @@ my $filename = $image->TempImageFile();
my $isglobal = $image->global(); my $isglobal = $image->global();
my $usepath = 0; my $usepath = 0;
my $isdataset = $image->isdataset(); my $isdataset = $image->isdataset();
my $hackprefix= $PROJROOT . "/" . $image->pid() . "/images/"; my $hackprefix= ($image->pid() eq $image->gid() ?
$PROJROOT . "/" . $image->pid() . "/images/" :
$GROUPROOT . "/" .
$image->pid() . "/" . $image->gid() . "/images/");
if ($image->IsDirPath()) { if ($image->IsDirPath()) {
# Add in the directory. # Add in the directory.
$hackprefix .= basename($image->path()) . "/"; $hackprefix .= basename($image->path()) . "/";
......
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