Skip to content

properly quote GCC version string in archived easyconfig#1028

Merged
boegel merged 6 commits intoeasybuilders:developfrom
boegel:fix_archived_ecs
Sep 5, 2014
Merged

properly quote GCC version string in archived easyconfig#1028
boegel merged 6 commits intoeasybuilders:developfrom
boegel:fix_archived_ecs

Conversation

@boegel
Copy link
Copy Markdown
Member

@boegel boegel commented Sep 3, 2014

I'm also renaming the archived easyconfigs here, to include the software name in the filename too (i.e. use <repositorypath>/GCC/GCC-4.8.3.eb rather than <repositorypath>/GCC/4.8.3.eb

@geimer: this should fix #961, please verify?

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 3, 2014

@stdweird: please review?

@geimer
Copy link
Copy Markdown
Contributor

geimer commented Sep 3, 2014

@boegel: Hmm... I'm still getting a parse error when trying to use the archived easyconfig for building (it says line 43, but it seems to be off by one, i.e., still in the gcc_version).

@geimer
Copy link
Copy Markdown
Contributor

geimer commented Sep 3, 2014

I believe the quoting used by this PR is incorrect:

 'gcc_version': '"Using built-in specs.; COLLECT_GCC=gcc; COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.7/lto-wrapper; Target: x86_64-linux-gnu; Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.2-5' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu; Thread model: posix; gcc version 4.7.2 (Debian 4.7.2-5) ; "',

But you know Python much better than I do...

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 3, 2014

@geimer: hmm, damn... Seems like the quote_str function isn't doing what it should be doing... Weird.

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 3, 2014

@geimer: the issues indeed was't fixed properly, as also indicated by Jenkins (which is also running Debian), see https://jenkins1.ugent.be/job/easybuild-framework-pr-builder/917/console

Last commit should now fix the problem properly (and also involves some code cleanup, hooray!)... Please check again?

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 3, 2014

@geimer: make that the last two commits, a typo slipped in...

@geimer
Copy link
Copy Markdown
Contributor

geimer commented Sep 3, 2014

@boegel: Not sure whether it will now work for all possible corner cases, but it works like a charm for my test case :-) Thanks!

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 4, 2014

I've split off the fixes w.r.t. --repositorypath and --prefix in #1031, as requested by @stdweird.

@boegel boegel changed the title properly quote GCC version string in archived easyconfig, fix issue with --repositorypath not honoring --prefix properly quote GCC version string in archived easyconfig Sep 4, 2014
@stdweird
Copy link
Copy Markdown
Contributor

stdweird commented Sep 5, 2014

@boegel ok to me

@boegel
Copy link
Copy Markdown
Member Author

boegel commented Sep 5, 2014

Going in, thanks for the review @wpoely86 & @stdweird, and @geimer for verifying the fix.

boegel added a commit that referenced this pull request Sep 5, 2014
properly quote GCC version string in archived easyconfig
@boegel boegel merged commit c110fed into easybuilders:develop Sep 5, 2014
@boegel boegel deleted the fix_archived_ecs branch September 5, 2014 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants