Revision 3cac836b
b/lib/client/gnt_cluster.py | ||
---|---|---|
1786 | 1786 |
|
1787 | 1787 |
contentstring = utils.ReadFile(pathutils.INTENT_TO_UPGRADE) |
1788 | 1788 |
contents = utils.UnescapeAndSplit(contentstring) |
1789 |
if len(contents) != 2:
|
|
1789 |
if len(contents) != 3:
|
|
1790 | 1790 |
# file syntactically mal-formed |
1791 | 1791 |
return None |
1792 |
return contents[0]
|
|
1792 |
return contents[1]
|
|
1793 | 1793 |
|
1794 | 1794 |
|
1795 | 1795 |
def _WriteIntentToUpgrade(version): |
... | ... | |
1800 | 1800 |
|
1801 | 1801 |
""" |
1802 | 1802 |
utils.WriteFile(pathutils.INTENT_TO_UPGRADE, |
1803 |
data=utils.EscapeAndJoin([version, "%d" % os.getpid()])) |
|
1803 |
data=utils.EscapeAndJoin([constants.RELEASE_VERSION, version, |
|
1804 |
"%d" % os.getpid()])) |
|
1804 | 1805 |
|
1805 | 1806 |
|
1806 | 1807 |
def _UpgradeBeforeConfigurationChange(versionstring): |
Also available in: Unified diff