shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Revert "F #1512: Do not overwrite attributes already defined in the image"

Browse Source 
This reverts commit 22e06f49e0af06d9c63f2e515d2e498ee413cb54.
This commit is contained in:
Ruben S. Montero 2017-11-30 16:40:14 +01:00
parent 22e06f49e0
commit cfe3bd141d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/datastore/Datastore.cc
View File

@ -118,14 +118,14 @@ void Datastore::disk_attribute(
get_template_attribute("CLONE_TARGET", st);
if(!st.empty() && disk->vector_value("CLONE_TARGET").empty())
if(!st.empty())
{
disk->replace("CLONE_TARGET", st);
}
get_template_attribute("LN_TARGET", st);
if(!st.empty() && disk->vector_value("LN_TARGET").empty())
if(!st.empty())
{
disk->replace("LN_TARGET", st);
}
@ -135,13 +135,13 @@ void Datastore::disk_attribute(
current_val = disk->vector_value((*it).c_str());
get_template_attribute((*it).c_str(), inherit_val);
if ( current_val.empty() && !inherit_val.empty() && disk->vector_value((*it).c_str()).empty())
if ( current_val.empty() && !inherit_val.empty() )
{
disk->replace(*it, inherit_val);
}
}
if (disk->is_volatile() && disk->vector_value("DISK_TYPE").empty())
if (disk->is_volatile())
{
disk->replace("DISK_TYPE", Image::disk_type_to_str(get_disk_type()));
}
@ -152,7 +152,7 @@ void Datastore::disk_attribute(
{
get_template_attribute("DRIVER", st);
if(!st.empty() && disk->vector_value("DRIVER").empty())
if(!st.empty())
{
disk->replace("DRIVER", st);
}