After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 670814 - checkout_mode = 'clobber' interacts badly with tarball source-subdir
checkout_mode = 'clobber' interacts badly with tarball source-subdir
Status: RESOLVED FIXED
Product: jhbuild
Classification: Infrastructure
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks: 670790
 
 
Reported: 2012-02-26 01:26 UTC by Allison Karlitskaya (desrt)
Modified: 2012-05-17 12:09 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Support xml attribute source-subdir in _wipedir (3.05 KB, patch)
2012-04-17 12:10 UTC, Craig Keogh
committed Details | Review

Description Allison Karlitskaya (desrt) 2012-02-26 01:26:59 UTC
js185 is a very odd module:

  <autotools id="js185" check-target="false"
             autogenargs="--enable-threadsafe --with-system-nspr">
    <pkg-config>mozjs185.pc</pkg-config>
    <branch repo="ftp.mozilla.org"
            module="js/js185-1.0.0.tar.gz"
            version="1.0.0"
            checkoutdir="js185-1.0.0"
            source-subdir="js/src"
            md5sum="a4574365938222adca0a6bd33329cb32" size="6164605">
      <patch file="js185.destdir.patch" strip="0"/>
    </branch>
    <dependencies>
      <dep package="nspr"/>
    </dependencies>
  </autotools>


Unfortunately, when using checkout_mode = 'clobber', the source directory that gets erased before the checkout is the js/src subdirectory.  This makes it impossible to extract a second copy of the source (since the toplevel js185-1.0.0 directory is still there).  That causes the build to fail.

This would also impact the "wipe directory and start over" option, I suspect.

We need wipedir() to effect the toplevel directory, not the source subdirectory.
Comment 1 Craig Keogh 2012-04-17 12:10:08 UTC
Created attachment 212199 [details] [review]
Support xml attribute source-subdir in _wipedir
Comment 2 Craig Keogh 2012-05-17 12:08:45 UTC
Comment on attachment 212199 [details] [review]
Support xml attribute source-subdir in _wipedir

Committed.
http://git.gnome.org/browse/jhbuild/commit/?id=f7403f1daed165eba85f5b622f84174dc9d02718