888646 - Bug 887121 broke XULRunner packaging with AttributeError: 'str' object has no attribute 'destdir'

Status: VERIFIED FIXED

(Firefox Build System :: General, defect)

Description

[Phil Ringnalda (:philor)]

https://tbpl.mozilla.org/php/getParsedLog.php?id=24742262&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24742049&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24741949&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24741865&tree=Mozilla-Central

make[3]: Entering directory `/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/obj-firefox/xulrunner/installer'
Makefile:74: FULL_NSPR_CFLAGS=-I\${includedir}
/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/obj-firefox/_virtualenv/bin/python /builds/slave/m-cen-lx-xr-ntly-0000000000000/build/toolkit/mozapps/installer/packager.py -DMOZ_GLUE_IN_PROGRAM -DNO_NSPR_10_SUPPORT -DDLL_PREFIX=lib -DDLL_SUFFIX=.so -DBIN_SUFFIX= -DGRE_MILESTONE=25.0a1 -DGRE_BUILDID=20130629031116 -DMOZ_DEB_TIMESTAMP="Sat, 29  Jun 2013 07:39:35 -0400" -DMOZ_APP_NAME=xulrunner -Dinstalldir=/usr/local/lib/xulrunner-25.0a1  \
		--format omni \
		 \
		--ignore-errors \
		 \
		 \
		--optimizejars \
		 \
		 ../../dist ../../dist/sdk-stage \
		
Traceback (most recent call last):
  File "/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/toolkit/mozapps/installer/packager.py", line 374, in <module>
    main()
  File "/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/toolkit/mozapps/installer/packager.py", line 318, in main
    sink.add('', 'bin/*')
  File "/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/python/mozbuild/mozpack/packager/__init__.py", line 341, in add
    dest = mozpack.path.join(component.destdir, SimpleManifestSink.normalize_path(p))
AttributeError: 'str' object has no attribute 'destdir'
make[3]: Leaving directory `/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/obj-firefox/xulrunner/installer'
make[3]: *** [stage-package] Error 1
make[2]: Leaving directory `/builds/slave/m-cen-lx-xr-ntly-0000000000000/build/obj-firefox/xulrunner/installer'
make[2]: *** [make-sdk] Error 2
make[1]: *** [sdk] Error 2

Comment 1

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Attachment: Update missed use of SimpleManifestSink API. r=trivial

This is a simple follow-up to Bug 887121, with essentially no risk, so
I'm going to commit it as soon as the trees re-open.

Comment 2

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/d4659e304514

Comment 3

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/d4659e304514

Comment 4

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Looks good on TBPL:

https://tbpl.mozilla.org/php/getParsedLog.php?id=24779918&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24779636&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24779866&tree=Mozilla-Central
https://tbpl.mozilla.org/php/getParsedLog.php?id=24779193&tree=Mozilla-Central

Comment 5

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

Comment on attachment 769428 [details] [diff] [review]
Update missed use of SimpleManifestSink API. r=trivial

[Approval Request Comment]
Bug caused by (feature/regressing bug #): Bug 887121, which was recently uplifted to Aurora without this companion follow-up.

User impact if declined: Continuing burning Xr (xulrunner) on m-a.

Testing completed (on m-c, etc.): Lustrous green Xr on m-c.

Risk to taking this patch (and alternatives if risky): None.

String or IDL/UUID changes made by this patch: None.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/0368f4123c8a

Comment 7

[Nick Alexander :nalexander [he/him] (PTO Feb 24-March 3)]

I'm seeing lustrous green Xr on m-a, for example: https://tbpl.mozilla.org/php/getParsedLog.php?id=25959657&tree=Mozilla-Aurora.  Thanks for moving on this so quickly, bajaj and ryanvm!