All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit e5b70aa4 authored by Leigh B Stoller's avatar Leigh B Stoller

Ah, the shared/global naming inconsistency bit me in the ass. Which

means I bit myself on the ass.
parent 68c0d202
......@@ -347,7 +347,21 @@ sub versname($)
sub urn($)
{
return $_[0]->image()->urn();
}
}
#
# Global is odd. If an image, we use that slot. If just an OSinfo, we
# use shared.
#
sub global($)
{
my ($self) = @_;
return $self->image()->global()
if (defined($self->image()));
return $self->osinfo()->shared();
}
#
# Return a list of all images of the given format for the given pid.
......@@ -1106,9 +1120,7 @@ sub MapToImage($$)
if ($self->architecture() && $type->architecture());
# This returns an OSimage.
my $image = $self->osinfo()->MapToImage($type);
return undef
if (!defined($image));
return $self->osinfo()->MapToImage($type);
}
#
......
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