LGTM. Thanks, Jose
On Wed, Oct 02, 2013 at 02:33:07PM +0200, Klaus Aehlig wrote: > Depending on configure options, the version string used in the name > of the version specific directory differs. Provide this string also > as a constant, as it is needed for the upgrade procedure, in order to > be able to roll back. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > Makefile.am | 1 + > lib/constants.py | 2 ++ > src/AutoConf.hs.in | 3 +++ > src/Ganeti/HsConstants.hs | 3 +++ > 4 files changed, 9 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index 120245c..bd6872e 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1786,6 +1786,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | > stamp-directories > -DVERSION_REVISION="$(VERSION_REVISION)" \ > -DVERSION_SUFFIX="$(VERSION_SUFFIX)" \ > -DVERSION_FULL="$(VERSION_FULL)" \ > + -DDIRVERSION="$(DIRVERSION)" \ > -DLOCALSTATEDIR="$(localstatedir)" \ > -DSYSCONFDIR="$(sysconfdir)" \ > -DSSH_CONFIG_DIR="$(SSH_CONFIG_DIR)" \ > diff --git a/lib/constants.py b/lib/constants.py > index fe25cb0..568f827 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -48,6 +48,8 @@ VERSION_MAJOR = _constants.VERSION_MAJOR > VERSION_MINOR = _constants.VERSION_MINOR > VERSION_REVISION = _constants.VERSION_REVISION > > +DIR_VERSION = _constants.DIR_VERSION > + > CONFIG_MAJOR = _constants.CONFIG_MAJOR > CONFIG_MINOR = _constants.CONFIG_MINOR > CONFIG_REVISION = _constants.CONFIG_REVISION > diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in > index 415bdfe..b7aaee2 100644 > --- a/src/AutoConf.hs.in > +++ b/src/AutoConf.hs.in > @@ -46,6 +46,9 @@ versionSuffix = "VERSION_SUFFIX" > versionFull :: String > versionFull = "VERSION_FULL" > > +dirVersion :: String > +dirVersion = "DIRVERSION" > + > localstatedir :: String > localstatedir = "LOCALSTATEDIR" > > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index c22e055..d1b6d1b 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -131,6 +131,9 @@ versionMinor = AutoConf.versionMinor > versionRevision :: Int > versionRevision = AutoConf.versionRevision > > +dirVersion :: String > +dirVersion = AutoConf.dirVersion > + > configMajor :: Int > configMajor = AutoConf.versionMajor > > -- > 1.8.4 > -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
