Commit d53b8622 authored by Leigh Stoller's avatar Leigh Stoller

Couple of tweaks for testing dataset transfer/update between clusters.

parent 43c7c976
......@@ -620,10 +620,10 @@ sub GetImageInfo($)
if (!defined($hrn));
return GeniResponse->MalformedArgsResponse("Not an image URN")
if ($hrn->type() ne "image");
if ($hrn->type() !~ /^(image|imdataset)$/);
# The id might be version specific.
my (undef,$pid,$imagename,$version) = $hrn->ParseImage();
my (undef,undef,undef,$version) = $hrn->ParseImage();
if (defined($version)) {
if ($version !~ /^\d+$/) {
......@@ -764,9 +764,9 @@ sub DeleteImageInfo($)
if (!defined($hrn));
return GeniResponse->MalformedArgsResponse("Not an image URN")
if ($hrn->type() ne "image");
if ($hrn->type() !~ /^(image|imdataset)$/);
return GeniResponse->MalformedArgsResponse("Not a UUID")
return GeniResponse->MalformedArgsResponse("Not a UUID")
if ($uuid !~ /^\w+\-\w+\-\w+\-\w+\-\w+$/);
#
......@@ -779,7 +779,7 @@ sub DeleteImageInfo($)
if ($hrn->domain() ne $caller_hrn->domain());
# The id might be version specific.
my (undef,$pid,$imagename,$version) = $hrn->ParseImage();
my (undef,undef,undef,$version) = $hrn->ParseImage();
if (defined($version)) {
return GeniResponse->MalformedArgsResponse("Not allowed to delete ".
......
#!/usr/bin/perl -w
#
# Copyright (c) 2008-2015 University of Utah and the Flux Group.
# Copyright (c) 2008-2016 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -1370,6 +1370,10 @@ sub HandleImageTracking()
print "Would import new version of $image\n";
next;
}
if ($image->isdataset()) {
print "Skipping dataset for now\n";
next;
}
my $output = emutil::ExecQuiet("$IMPORTER -d -g -r -c $imageid");
if ($?) {
print $output;
......
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