Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d84ec774230
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7d9bb7edd9f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 28, 2015

  1. language/environment: fix set_* with parent

    @sbourdeauducq
    sbourdeauducq committed Aug 28, 2015

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CEF2BBFE18BD0E67
    Learn about vigilant mode
    Copy the full SHA
    ebfd8c9 View commit details

  2. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Aug 28, 2015
    Copy the full SHA
    c7d9bb7 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 artiq/language/environment.py
2 changes: 2 additions & 0 deletions artiq/language/environment.py
View file
Original file line number Diff line number Diff line change
@@ -220,6 +220,7 @@ def set_parameter(self, key, value):
"""Writes the value of a parameter into the parameter database."""
if self.__parent is not None:
self.__parent.set_parameter(key, value)
return
if self.__pdb is None:
raise ValueError("Parameter database not present")
self.__pdb.set(key, value)
@@ -236,6 +237,7 @@ def set_result(self, key, value, realtime=False, store=True):
"""
if self.__parent is not None:
self.__parent.set_result(key, value, realtime, store)
return
if self.__rdb is None:
raise ValueError("Result database not present")
if realtime: