Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PyI40AAS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lehrstuhl für Informations- und Automatisierungssysteme
PyI40AAS
Merge requests
!70
model: Fix recursive update_from: Don't mess up NamespaceSet references
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
model: Fix recursive update_from: Don't mess up NamespaceSet references
fix/recursive_update_from
into
master
Overview
0
Commits
3
Pipelines
5
Changes
2
Merged
Michael Thies
requested to merge
fix/recursive_update_from
into
master
4 years ago
Overview
0
Commits
3
Pipelines
5
Changes
2
Expand
Fixes
#127 (closed)
Edited
4 years ago
by
Michael Thies
0
0
Merge request reports
Compare
master
version 1
079047f8
4 years ago
master (base)
and
latest version
latest version
0e33ff9a
3 commits,
4 years ago
version 1
079047f8
2 commits,
4 years ago
2 files
+
15
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
aas/model/base.py
+
4
−
3
Options
@@ -553,13 +553,14 @@ class Referable(metaclass=abc.ABCMeta):
recursively
"""
for
name
,
var
in
vars
(
other
).
items
():
# do not update the parent or source (depending on update_source parameter)
if
name
==
"
parent
"
or
name
==
"
source
"
and
not
update_source
:
# do not update the parent
, namespace_element_sets
or source (depending on update_source parameter)
if
name
in
(
"
parent
"
,
"
namespace_element_sets
"
)
or
name
==
"
source
"
and
not
update_source
:
continue
if
isinstance
(
var
,
NamespaceSet
):
# update the elements of the NameSpaceSet
vars
(
self
)[
name
].
update_nss_from
(
var
)
vars
(
self
)[
name
]
=
var
# that variable is not a NameSpaceSet, so it isn't Referable
else
:
vars
(
self
)[
name
]
=
var
# that variable is not a NameSpaceSet, so it isn't Referable
def
commit
(
self
)
->
None
:
"""
Loading