diff options
| author | Jose <jose@zeroc.com> | 2015-01-20 17:31:03 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-20 17:31:03 +0100 |
| commit | 7a49b8830a3f91c57b92b10bb1b5d206693bda2f (patch) | |
| tree | 95cbee6f99cec4a12b200dedc94237db341a2d85 /cpp/allDemos.py | |
| parent | Updated the Objective-C to generate Slice local interfaces and classes (diff) | |
| download | ice-7a49b8830a3f91c57b92b10bb1b5d206693bda2f.tar.bz2 ice-7a49b8830a3f91c57b92b10bb1b5d206693bda2f.tar.xz ice-7a49b8830a3f91c57b92b10bb1b5d206693bda2f.zip | |
Fixed (ICE-5957) - Freeze/backup demo doesn't work with multiarch dists
Diffstat (limited to 'cpp/allDemos.py')
| -rwxr-xr-x | cpp/allDemos.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/allDemos.py b/cpp/allDemos.py index e45bb73e37a..69dcd963bb6 100755 --- a/cpp/allDemos.py +++ b/cpp/allDemos.py @@ -72,11 +72,11 @@ demos = [ "Manual/lifecycle"] # -# Freeze backup doesn't work on x86 multiarch because it require to -# use x86 db tools that are currently not available for x64 -# distributions. +# Freeze backup doesn't work on x86 multiarch because it require to use x86 db tools that are +# currently not available for x64 distributions. # -if not "--x86" in sys.argv: +if not (Util.isLinux64() and + Util.isLinux32BitExe(os.path.join(os.path.dirname(os.path.abspath(__file__)), "demo/Freeze/backup/client"))): demos += ["Freeze/backup"] if not "--c++11" in sys.argv and not "--x86" in sys.argv: |