Snapcraft

Merge lp://qastaging/~sergiusens/snapcraft/1496381 into lp://qastaging/~snappy-dev/snapcraft/core

1496381
Merge into core

Proposed by Sergio Schvezov on 2015-09-16

Status:

Merged

Approved by:

John Lenton on 2015-09-17

Approved revision:

168

Merged at revision:

170

Proposed branch:

lp://qastaging/~sergiusens/snapcraft/1496381

Merge into:

lp://qastaging/~snappy-dev/snapcraft/core

Diff against target:

87 lines (+26/-19)

3 files modified

snapcraft/cmds.py (+9/-1)
snapcraft/tests/test_wiki.py (+3/-3)
snapcraft/wiki.py (+14/-15)

To merge this branch:

bzr merge lp://qastaging/~sergiusens/snapcraft/1496381

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
John Lenton (community)	2015-09-16	Approve on 2015-09-17
Daniel Holbach (community)		Approve on 2015-09-17
Review via email: mp+271299@code.qastaging.launchpad.net

Commit message

Fetch from the wiki only once

Description of the change

Based on Chipaca's example code

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2015-09-16:

I'm just noticing this is a useless branch :-)

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2015-09-16:

there we go

Revision history for this message

Daniel Holbach (dholbach) wrote on 2015-09-16:

gcc -Wall -Wextra -Werror -pedantic -o test ./test.c -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include/x86_64-linux-gnu -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include/x86_64-linux-gnu -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib/x86_64-linux-gnu -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib/x86_64-linux-gnu -lcurl -lssl -lcrypto -lssl -lcrypto -lz
make install DESTDIR=/tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install
install -d -m755 /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/
install -m755 ./test /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/test
Staging main
Snapping main
Traceback (most recent call last):
  File "../../bin/snapcraft", line 33, in <module>
    snapcraft.main.main()
  File "/tmp/1496381/snapcraft/main.py", line 77, in main
    args.func(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 94, in assemble
    snap(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 82, in snap
    config = _load_config()
  File "/tmp/1496381/snapcraft/cmds.py", line 299, in _load_config
    return snapcraft.yaml.Config()
  File "/tmp/1496381/snapcraft/yaml.py", line 99, in __init__
    self._compute_part_dependencies(after_requests)
  File "/tmp/1496381/snapcraft/yaml.py", line 130, in _compute_part_dependencies
    wiki_part = w.get_part(dep)
  File "/tmp/1496381/snapcraft/wiki.py", line 59, in get_part
    return self.wiki_parts[name]
AttributeError: 'Wiki' object has no attribute 'wiki_parts'
daniel@daydream:/tmp/1496381/examples/downloader-with-wiki-parts$

gcc -Wall -Wextra -Werror -pedantic -o test ./test.c -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include/x86_64-linux-gnu -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include/x86_64-linux-gnu  -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib/x86_64-linux-gnu -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib/x86_64-linux-gnu  -lcurl -lssl -lcrypto -lssl -lcrypto -lz
make install DESTDIR=/tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install
install -d -m755  /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/
install -m755 ./test /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/test
Staging main
Snapping main
Traceback (most recent call last):
  File "../../bin/snapcraft", line 33, in <module>
    snapcraft.main.main()
  File "/tmp/1496381/snapcraft/main.py", line 77, in main
    args.func(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 94, in assemble
    snap(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 82, in snap
    config = _load_config()
  File "/tmp/1496381/snapcraft/cmds.py", line 299, in _load_config
    return snapcraft.yaml.Config()
  File "/tmp/1496381/snapcraft/yaml.py", line 99, in __init__
    self._compute_part_dependencies(after_requests)
  File "/tmp/1496381/snapcraft/yaml.py", line 130, in _compute_part_dependencies
    wiki_part = w.get_part(dep)
  File "/tmp/1496381/snapcraft/wiki.py", line 59, in get_part
    return self.wiki_parts[name]
AttributeError: 'Wiki' object has no attribute 'wiki_parts'
daniel@daydream:/tmp/1496381/examples/downloader-with-wiki-parts$

review: Needs Fixing

lp://qastaging/~sergiusens/snapcraft/1496381 updated on 2015-09-16