[Pkg-javascript-devel] Help with MUT needed

[Nilesh Patra]

On Thu, 9 Jul 2020 at 16:41, Nilesh Patra <npatra974 at gmail.com> wrote:

>
> Hi,
>
> On Thu, 9 Jul 2020 at 16:09, <merkys at debian.org> wrote:
>
>> Hi,
>>
>> On 2020-07-09 13:12, Nilesh Patra wrote:
>> > For me, it was failing to even gbp import - I noticed that the
>> > compression=xz parameter is missing in the watch file.
>> > After fixing this, the build starts and w/o the unexpected changes
>> thingy.
>> > I've pushed to salsa, please $gbp pull :-)
>>
>> Thanks for the fix! However, this does not solve the problem for me... I
>> merged my branch to master locally, and executed the following:
>>
>> gbp import-orig --pristine-tar --uscan
>> gbp dch --commit
>>
>> Then commented out first two patches and ran:
>>
>> gbp buildpackage -uc -us --git-pristine-tar --git-ignore-new
>>
>> This results in the same "unexpected upstream changes" error. I am
>> working on machine running sid.
>>
>> > If you feel that this looks fine, can you please merge this branch with
>> > master and push here? :)
>> > That'd  be great.
>>
>> I will merge and push my branch once I solve the issue with MUT. I don't
>> want to leave the repository on salsa in somewhat broken state.
>>
>
> I tried to build this again, and I noticed that I get the same error now.
> Pasting some of it:
>
> dpkg-source: info: local changes detected, the modified files are:
>
>  node-node-sass-4.14.1+git20200512.e1fc158+dfsg/sass-spec/spec/errors/extend/placeholder/missing/input.scss
>
>  node-node-sass-4.14.1+git20200512.e1fc158+dfsg/sass-spec/spec/errors/extend/placeholder/optional/input.scss
>
>  node-node-sass-4.14.1+git20200512.e1fc158+dfsg/sass-spec/spec/errors/extend/placeholder/simple/input.scss
>
>  node-node-sass-4.14.1+git20200512.e1fc158+dfsg/sass-spec/spec/errors/extend/selector/missing/input.scss
>
> This looks very weird, considering sass-spec is just an embedded node
> module and should not throw upstream errors.
> I suspected that the tarball is getting corrupted somehow.
> Hence, I did the following:
>
> tar cvfJ
> node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-true-case-path.tar.xz
> true-case-path
> mv
> node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-true-case-path.tar.xz
> ../
> tar cvfJ  mv sass-spec.xz
> ../node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-sass-spec.tar.xz
> sass-spec
>

Oops:
tar cvfJ
node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-sass-spec.tar.xz
sass-spec


> mv sass-spec.xz
> ../node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-sass-spec.tar.xz ../
>

mv node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig-sass-spec.tar.xz ../

Basically, recreating the tarballs and importing again.


>
> Delete the tag and re-import
>
> git tag -d git tag -d upstream/4.14.1+git20200512.e1fc158+dfsg
> gbp import-orig --pristine-tar
> ../node-node-sass_4.14.1+git20200512.e1fc158+dfsg.orig.tar.gz
>
> This now starts to build w/o those weird stuff.
> Hope that helps.
>
> Kind Regards,
> Nilesh
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-javascript-devel/attachments/20200709/48e2a2eb/attachment.html>