27381 2012-05-29 18:05:40 +0400 Cinnamon 1.4-UP1 и muffin-1.0.3 2012-06-02 15:21:26 +0400 1 1 4 Development Sisyphus cinnamon unstable all Linux CLOSED FIXED P3 normal --- 1 vladimir.didenko antohami antohami aris slava qa-sisyphus oldest_to_newest 131522 0 vladimir.didenko 2012-05-29 18:05:40 +0400 Создан новый стабильный бранч для cinnamon - 1.4 UP1 с небольшими фиксами относительно 1.4, а также выпущен muffin-1.0.3 с поддержкой clutter 1.9 и Gnome 3.4. http://cinnamon.linuxmint.com/?p=190 Хорошо было бы обновить эти пакеты в Сизифе. Себе собрал локально - регрессий по отношению к предыдущей версии не заметил. 131524 1 mike 2012-05-29 18:32:31 +0400 Спасибо; а) 1.4 UP3 не смотрели? б) часом нет желания помайнтейнить? :) 131525 2 vladimir.didenko 2012-05-29 19:26:37 +0400 (В ответ на комментарий №1) > Спасибо; > а) 1.4 UP3 не смотрели? Быстро собрать не получилось. Проблемы с settings.patch. В федоре тоже пока UP1 собирают. Будет время - попробую разобраться в чем проблема. Или может, в других дистрибутивах быстрее поправят. > б) часом нет желания помайнтейнить? :) Желание есть, но времени пока нету. Все силы и время оставшиеся от работы уходят на подготовку к защите кандидатской диссертации. Может после защиты осенью и решусь :-) 131526 3 5474 vladimir.didenko 2012-05-29 19:42:38 +0400 Created attachment 5474 Патч для cinnamon-settings версии UP3 Как оказалось патч для cinnamon-settings всего лишь убирает оттуда настройку времени. В аттаче патч для Cinnamon UP3. 131536 4 repository-robot 2012-05-30 15:38:29 +0400 cinnamon-1.4.0-alt6 -> sisyphus: * Wed May 30 2012 Michael Shigorin <mike@altlinux> 1.4.0-alt6 - rebuilt for Sisyphus (closes: #27381) * Tue May 29 2012 Vladimir Didenko <vladimir.didenko@gmail.com> 1.4.0-alt5 - update to 1.4-UP3 - window-attention.patch that disables annoying window popups * Wed May 23 2012 Vladimir Didenko <vladimir.didenko@gmail.com> 1.4.0-alt4 - update to 1.4-UP1 * Thu May 10 2012 Michael Shigorin <mike@altlinux> 1.4.0-alt3.1 - changed wmsession priority from 05 to 02 so that 02Cinnamon comes just before 02Gnome (the rationale being that if this GNOME3 extension is installed it's likely to have been desired in the first place) 5474 2012-05-29 19:42:38 +0400 2012-05-29 19:42:38 +0400 Патч для cinnamon-settings версии UP3 cinnamon-1.4.0_settings.patch text/plain 16087 vladimir.didenko ZGlmZiAtLWdpdCBhL2ZpbGVzL3Vzci9saWIvY2lubmFtb24tc2V0dGluZ3MvY2lubmFtb24tc2V0 dGluZ3MucHkgYi9maWxlcy91c3IvbGliL2Npbm5hbW9uLXNldHRpbmdzL2Npbm5hbW9uLXNldHRp bmdzLnB5CmluZGV4IGZhMWUyMTIuLjhiYjFjMWYgMTAwNzU1Ci0tLSBhL2ZpbGVzL3Vzci9saWIv Y2lubmFtb24tc2V0dGluZ3MvY2lubmFtb24tc2V0dGluZ3MucHkKKysrIGIvZmlsZXMvdXNyL2xp Yi9jaW5uYW1vbi1zZXR0aW5ncy9jaW5uYW1vbi1zZXR0aW5ncy5weQpAQCAtMTEsOSArMTEsNiBA QCB0cnk6CiAgICAgaW1wb3J0IGdjb25mCiAgICAgaW1wb3J0IGpzb24KICAgICBpbXBvcnQgZGJ1 cwotICAgIGltcG9ydCB0egotICAgIGltcG9ydCB0aW1lCi0gICAgZnJvbSBkYXRldGltZSBpbXBv cnQgZGF0ZXRpbWUKICAgICBmcm9tIHVzZXIgaW1wb3J0IGhvbWUKICAgICBpbXBvcnQgdGhyZWFk CiBleGNlcHQgRXhjZXB0aW9uLCBkZXRhaWw6CkBAIC03MzgsMjQ1ICs3MzUsNiBAQCBjbGFzcyBH U2V0dGluZ3NDb21ib0JveChHdGsuSEJveCk6CiAgICAgICAgICAgICB2YWx1ZSA9IHNlbGYubW9k ZWxbdHJlZV9pdGVyXVswXSAgICAgICAgICAgIAogICAgICAgICAgICAgc2VsZi5zZXR0aW5ncy5z ZXRfc3RyaW5nKHNlbGYua2V5LCB2YWx1ZSkgICAgICAgICAgICAgICAgICAgICAgIAogCi1jbGFz cyBUaW1lWm9uZVNlbGVjdG9yV2lkZ2V0KEd0ay5IQm94KToKLSAgICBkZWYgX19pbml0X18oc2Vs Zik6Ci0gICAgICAgIHN1cGVyKFRpbWVab25lU2VsZWN0b3JXaWRnZXQsIHNlbGYpLl9faW5pdF9f KCkKLSAgICAgICAgCi0gICAgICAgIHByb3h5ID0gZGJ1cy5TeXN0ZW1CdXMoKS5nZXRfb2JqZWN0 KCJvcmcuZ25vbWUuU2V0dGluZ3NEYWVtb24uRGF0ZVRpbWVNZWNoYW5pc20iLCAiLyIpCi0gICAg ICAgIHNlbGYuZGJ1c19pZmFjZSA9IGRidXMuSW50ZXJmYWNlKHByb3h5LCBkYnVzX2ludGVyZmFj ZT0ib3JnLmdub21lLlNldHRpbmdzRGFlbW9uLkRhdGVUaW1lTWVjaGFuaXNtIikKLSAgICAgICAg Ci0gICAgICAgIHNlbGYudGltZXpvbmVzID0gdHoubG9hZF9kYigpCi0gICAgICAgIAotICAgICAg ICBzZWxmLnNlbGVjdGVkX3JlZ2lvbiwgc2VsZi5zZWxlY3RlZF9jaXR5ID0gc2VsZi5nZXRfc2Vs ZWN0ZWRfem9uZSgpCi0gICAgICAgIAotICAgICAgICByZWdpb25fbGFiZWwgPSBHdGsuTGFiZWwo XygiUmVnaW9uIikpCi0gICAgICAgIHNlbGYucGFja19zdGFydChyZWdpb25fbGFiZWwsIEZhbHNl LCBGYWxzZSwgMikKLSAgICAgICAgCi0gICAgICAgIHJlZ2lvbnMgPSBzZWxmLnRpbWV6b25lcy5r ZXlzKCkKLSAgICAgICAgcmVnaW9ucy5zb3J0KCkKLSAgICAgICAgc2VsZi5yZWdpb25fbW9kZWwg PSBHdGsuTGlzdFN0b3JlKHN0ciwgc3RyKQotICAgICAgICBzZWxlY3RlZF9yZWdpb25faXRlciA9 IE5vbmUKLSAgICAgICAgZm9yIHJlZ2lvbiBpbiByZWdpb25zOgotICAgICAgICAgICAgaXRlciA9 IHNlbGYucmVnaW9uX21vZGVsLmluc2VydF9iZWZvcmUoTm9uZSwgTm9uZSkKLSAgICAgICAgICAg IHNlbGYucmVnaW9uX21vZGVsLnNldF92YWx1ZShpdGVyLCAwLCByZWdpb24pICAgICAgICAgICAg ICAgIAotICAgICAgICAgICAgc2VsZi5yZWdpb25fbW9kZWwuc2V0X3ZhbHVlKGl0ZXIsIDEsIHJl Z2lvbi5yZXBsYWNlKCJfIiwgIiAiKSkgICAgICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAg ICAgIGlmIChyZWdpb24gPT0gc2VsZi5zZWxlY3RlZF9yZWdpb24pOgotICAgICAgICAgICAgICAg IHNlbGVjdGVkX3JlZ2lvbl9pdGVyID0gaXRlcgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAKLSAgICAgICAgc2VsZi5yZWdpb25fd2lkZ2V0ID0gR3RrLkNvbWJvQm94Lm5ld193aXRo X21vZGVsKHNlbGYucmVnaW9uX21vZGVsKSAgIAotICAgICAgICByZW5kZXJlcl90ZXh0ID0gR3Rr LkNlbGxSZW5kZXJlclRleHQoKQotICAgICAgICBzZWxmLnJlZ2lvbl93aWRnZXQucGFja19zdGFy dChyZW5kZXJlcl90ZXh0LCBUcnVlKQotICAgICAgICBzZWxmLnJlZ2lvbl93aWRnZXQuYWRkX2F0 dHJpYnV0ZShyZW5kZXJlcl90ZXh0LCAidGV4dCIsIDEpCi0gICAgICAgIGlmIHNlbGVjdGVkX3Jl Z2lvbl9pdGVyIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgc2VsZi5yZWdpb25fd2lkZ2V0LnNl dF9hY3RpdmVfaXRlcihzZWxlY3RlZF9yZWdpb25faXRlcikKLSAgICAgICAgc2VsZi5wYWNrX3N0 YXJ0KHNlbGYucmVnaW9uX3dpZGdldCwgRmFsc2UsIEZhbHNlLCAyKQotICAgICAgICAKLSAgICAg ICAgY2l0eV9sYWJlbCA9IEd0ay5MYWJlbChfKCJDaXR5IikpCi0gICAgICAgIHNlbGYucGFja19z dGFydChjaXR5X2xhYmVsLCBGYWxzZSwgRmFsc2UsIDIpCi0gICAgICAgIAotICAgICAgICBzZWxm LmNpdHlfbW9kZWwgPSBHdGsuTGlzdFN0b3JlKHN0ciwgc3RyKQotICAgICAgICBzZWxmLmNpdHlf d2lkZ2V0ID0gR3RrLkNvbWJvQm94Lm5ld193aXRoX21vZGVsKHNlbGYuY2l0eV9tb2RlbCkgICAK LSAgICAgICAgcmVuZGVyZXJfdGV4dCA9IEd0ay5DZWxsUmVuZGVyZXJUZXh0KCkKLSAgICAgICAg c2VsZi5jaXR5X3dpZGdldC5wYWNrX3N0YXJ0KHJlbmRlcmVyX3RleHQsIFRydWUpCi0gICAgICAg IHNlbGYuY2l0eV93aWRnZXQuYWRkX2F0dHJpYnV0ZShyZW5kZXJlcl90ZXh0LCAidGV4dCIsIDEp Ci0gICAgICAgIHNlbGYucGFja19zdGFydChzZWxmLmNpdHlfd2lkZ2V0LCBGYWxzZSwgRmFsc2Us IDIpCi0gICAgICAgIAotICAgICAgICBzZWxmLnVwZGF0ZV9jaXRpZXNfbGlzdCgpCi0gICAgICAg IAotICAgICAgICBzZWxmLnJlZ2lvbl93aWRnZXQuY29ubmVjdCgiY2hhbmdlZCIsIHNlbGYub25f cmVnaW9uX2NoYW5nZWQpCi0gICAgICAgIHNlbGYuY2l0eV93aWRnZXQuY29ubmVjdCgiY2hhbmdl ZCIsIHNlbGYub25fY2l0eV9jaGFuZ2VkKQotICAgIGRlZiBvbl9jaXR5X2NoYW5nZWQoc2VsZiwg d2lkZ2V0KToKLSAgICAgICAgdHJlZV9pdGVyID0gd2lkZ2V0LmdldF9hY3RpdmVfaXRlcigpCi0g ICAgICAgIGlmIHRyZWVfaXRlciAhPSBOb25lOgotICAgICAgICAgICAgc2VsZi5zZWxlY3RlZF9j aXR5ID0gc2VsZi5jaXR5X21vZGVsW3RyZWVfaXRlcl1bMF0KLSAgICAgICAgICAgIHNlbGYuZGJ1 c19pZmFjZS5TZXRUaW1lem9uZShzZWxmLnNlbGVjdGVkX3JlZ2lvbisiLyIrc2VsZi5zZWxlY3Rl ZF9jaXR5KQotICAgIGRlZiBvbl9yZWdpb25fY2hhbmdlZChzZWxmLCB3aWRnZXQpOgotICAgICAg ICB0cmVlX2l0ZXIgPSB3aWRnZXQuZ2V0X2FjdGl2ZV9pdGVyKCkKLSAgICAgICAgaWYgdHJlZV9p dGVyICE9IE5vbmU6ICAgICAgICAgICAgCi0gICAgICAgICAgICBzZWxmLnNlbGVjdGVkX3JlZ2lv biA9IHNlbGYucmVnaW9uX21vZGVsW3RyZWVfaXRlcl1bMF0KLSAgICAgICAgICAgIHNlbGYudXBk YXRlX2NpdGllc19saXN0KCkKLSAgICBkZWYgdXBkYXRlX2NpdGllc19saXN0KHNlbGYpOgotICAg ICAgICBzZWxmLmNpdHlfbW9kZWwuY2xlYXIoKQotICAgICAgICBpZiBzZWxmLnNlbGVjdGVkX3Jl Z2lvbiBhbmQgc2VsZi5zZWxlY3RlZF9yZWdpb24gaW4gc2VsZi50aW1lem9uZXMua2V5cygpOgot ICAgICAgICAgICAgY2l0aWVzID0gc2VsZi50aW1lem9uZXNbc2VsZi5zZWxlY3RlZF9yZWdpb25d Ci0gICAgICAgICAgICBjaXRpZXMuc29ydCgpCi0gICAgICAgICAgICBzZWxlY3RlZF9jaXR5X2l0 ZXIgPSBOb25lCi0gICAgICAgICAgICBmb3IgY2l0eSBpbiBjaXRpZXM6Ci0gICAgICAgICAgICAg ICAgaXRlciA9IHNlbGYuY2l0eV9tb2RlbC5pbnNlcnRfYmVmb3JlKE5vbmUsIE5vbmUpCi0gICAg ICAgICAgICAgICAgc2VsZi5jaXR5X21vZGVsLnNldF92YWx1ZShpdGVyLCAwLCBjaXR5KSAgICAg ICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBzZWxmLmNpdHlfbW9kZWwuc2V0X3ZhbHVlKGl0 ZXIsIDEsIGNpdHkucmVwbGFjZSgiXyIsICIgIikpICAgICAgICAgICAgICAgICAgICAgICAgCi0g ICAgICAgICAgICAgICAgaWYgKGNpdHkgPT0gc2VsZi5zZWxlY3RlZF9jaXR5KToKLSAgICAgICAg ICAgICAgICAgICAgc2VsZWN0ZWRfY2l0eV9pdGVyID0gaXRlcgotICAgICAgICAgICAgaWYgc2Vs ZWN0ZWRfY2l0eV9pdGVyIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgICAgIHNlbGYuY2l0eV93 aWRnZXQuc2V0X2FjdGl2ZV9pdGVyKHNlbGVjdGVkX2NpdHlfaXRlcikKLSAgICBkZWYgZ2V0X3Nl bGVjdGVkX3pvbmUoc2VsZik6Ci0gICAgICAgIHR6ID0gc2VsZi5kYnVzX2lmYWNlLkdldFRpbWV6 b25lKCkKLSAgICAgICAgaWYgIi8iIGluIHR6OgotICAgICAgICAgICAgaSA9IHR6LmluZGV4KCIv IikKLSAgICAgICAgICAgIHJlZ2lvbiA9IHR6WzppXQotICAgICAgICAgICAgY2l0eSA9IHR6W2kr MTpdCi0gICAgICAgICAgICByZXR1cm4gcmVnaW9uLCBjaXR5Ci0gICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICByZXR1cm4gIiIsICIiCi0gICAgICAgICAgICAKLWNsYXNzIENoYW5nZVRpbWVXaWRn ZXQoR3RrLkhCb3gpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgc3VwZXIoQ2hh bmdlVGltZVdpZGdldCwgc2VsZikuX19pbml0X18oKQotICAgICAgICBwcm94eSA9IGRidXMuU3lz dGVtQnVzKCkuZ2V0X29iamVjdCgib3JnLmdub21lLlNldHRpbmdzRGFlbW9uLkRhdGVUaW1lTWVj aGFuaXNtIiwgIi8iKQotICAgICAgICBzZWxmLmRidXNfaWZhY2UgPSBkYnVzLkludGVyZmFjZShw cm94eSwgZGJ1c19pbnRlcmZhY2U9Im9yZy5nbm9tZS5TZXR0aW5nc0RhZW1vbi5EYXRlVGltZU1l Y2hhbmlzbSIpCi0gICAgICAgIAotICAgICAgICAjIEVuc3VyZXMgd2UgYXJlIHNldHRpbmcgdGhl IHN5c3RlbSB0aW1lIG9ubHkgd2hlbiB0aGUgdXNlciBjaGFuZ2VzIGl0Ci0gICAgICAgIHNlbGYu Y2hhbmdlZE9uVGltZW91dCA9IEZhbHNlCi0gICAgICAgIAotICAgICAgICAjIEVuc3VyZXMgd2Ug ZG8gbm90IHVwZGF0ZSB0aGUgdmFsdWVzIGluIHRoZSBkYXRlL3RpbWUgZmllbGRzIGR1cmluZyB0 aGUgREJ1cyBjYWxsIHRvIHNldCB0aGUgdGltZQotICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWUg PSBGYWxzZQotICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jayA9IHRocmVhZC5hbGxvY2F0 ZSgpCi0gICAgICAgIHNlbGYuX3RpbWVfdG9fc2V0ID0gTm9uZQotICAgICAgICAKLSAgICAgICAg c2VsZi50aGlydHlEYXlzID0gWzMsIDUsIDgsIDEwXQotICAgICAgICBtb250aHMgPSBbJ0phbnVh cnknLCdGZWJydWFyeScsJ01hcmNoJywnQXByaWwnLCdNYXknLCdKdW5lJywnSnVseScsJ0F1Z3Vz dCcsJ1NlcHRlbWJlcicsJ09jdG9iZXInLCdOb3ZlbWJlcicsJ0RlY2VtYmVyJ10KLSAgICAgICAg Ci0gICAgICAgICMgQm94ZXMKLSAgICAgICAgdGltZUJveCA9IEd0ay5IQm94KCkKLSAgICAgICAg ZGF0ZUJveCA9IEd0ay5IQm94KCkKLSAgICAgICAgCi0gICAgICAgICMgQ29tYm8gQm94ZXMKLSAg ICAgICAgc2VsZi5tb250aEJveCA9IEd0ay5Db21ib0JveFRleHQoKQotICAgICAgICAKLSAgICAg ICAgZm9yIG1vbnRoIGluIG1vbnRoczoKLSAgICAgICAgICAgIHNlbGYubW9udGhCb3guYXBwZW5k X3RleHQobW9udGgpCi0gICAgICAgIAotICAgICAgICAjIEFkanVzdG1lbnRzCi0gICAgICAgIGhv dXJBZGogPSBHdGsuQWRqdXN0bWVudCgwLCAwLCAyMywgMSwgMSkKLSAgICAgICAgbWluQWRqID0g R3RrLkFkanVzdG1lbnQoMCwgMCwgNTksIDEsIDEpCi0gICAgICAgIHllYXJBZGogPSBHdGsuQWRq dXN0bWVudCgwLCAwLCA5OTk5LCAxLCA1KQotICAgICAgICBkYXlBZGogPSBHdGsuQWRqdXN0bWVu dCgwLCAxLCAzMSwgMSwgMSkKLSAgICAgICAgCi0gICAgICAgICMgU3BpbiBidXR0b25zCi0gICAg ICAgIHNlbGYuaG91clNwaW4gPSBHdGsuU3BpbkJ1dHRvbigpCi0gICAgICAgIHNlbGYubWluU3Bp biA9IEd0ay5TcGluQnV0dG9uKCkKLSAgICAgICAgc2VsZi55ZWFyU3BpbiA9IEd0ay5TcGluQnV0 dG9uKCkKLSAgICAgICAgc2VsZi5kYXlTcGluID0gR3RrLlNwaW5CdXR0b24oKQotICAgICAgICAK LSAgICAgICAgc2VsZi5ob3VyU3Bpbi5jb25maWd1cmUoaG91ckFkaiwgMC41LCAwKQotICAgICAg ICBzZWxmLm1pblNwaW4uY29uZmlndXJlKG1pbkFkaiwgMC41LCAwKQotICAgICAgICBzZWxmLnll YXJTcGluLmNvbmZpZ3VyZSh5ZWFyQWRqLCAwLjUsIDApCi0gICAgICAgIHNlbGYuZGF5U3Bpbi5j b25maWd1cmUoZGF5QWRqLCAwLjUsIDApCi0gICAgICAgICNzZWxmLmhvdXJTcGluLnNldF9lZGl0 YWJsZShGYWxzZSkKLSAgICAgICAgI3NlbGYubWluU3Bpbi5zZXRfZWRpdGFibGUoRmFsc2UpCi0g ICAgICAgICNzZWxmLnllYXJTcGluLnNldF9lZGl0YWJsZShGYWxzZSkKLSAgICAgICAgI3NlbGYu ZGF5U3Bpbi5zZXRfZWRpdGFibGUoRmFsc2UpCi0gICAgICAgIAotICAgICAgICBzZWxmLnVwZGF0 ZV90aW1lKCkKLSAgICAgICAgR09iamVjdC50aW1lb3V0X2FkZCgxMDAwLCBzZWxmLnVwZGF0ZV90 aW1lKQotICAgICAgICAKLSAgICAgICAgIyBDb25uZWN0IHRvIGNhbGxiYWNrCi0gICAgICAgIHNl bGYuaG91clNwaW4uY29ubmVjdCgnY2hhbmdlZCcsIHNlbGYuX2NoYW5nZV9zeXN0ZW1fdGltZSkK LSAgICAgICAgc2VsZi5taW5TcGluLmNvbm5lY3QoJ2NoYW5nZWQnLCBzZWxmLl9jaGFuZ2Vfc3lz dGVtX3RpbWUpCi0gICAgICAgIHNlbGYubW9udGhCb3guY29ubmVjdCgnY2hhbmdlZCcsIHNlbGYu X2NoYW5nZV9zeXN0ZW1fdGltZSkKLSAgICAgICAgc2VsZi55ZWFyU3Bpbi5jb25uZWN0KCdjaGFu Z2VkJywgc2VsZi5fY2hhbmdlX3N5c3RlbV90aW1lKQotICAgICAgICBzZWxmLmRheVNwaW4uY29u bmVjdCgnY2hhbmdlZCcsIHNlbGYuX2NoYW5nZV9zeXN0ZW1fdGltZSkKLSAgICAgICAgCi0gICAg ICAgIHRpbWVCb3gucGFja19zdGFydChzZWxmLmhvdXJTcGluLCBGYWxzZSwgRmFsc2UsIDIpCi0g ICAgICAgIHRpbWVCb3gucGFja19zdGFydChHdGsuTGFiZWwoXygiOiIpKSwgRmFsc2UsIEZhbHNl LCAyKQotICAgICAgICB0aW1lQm94LnBhY2tfc3RhcnQoc2VsZi5taW5TcGluLCBGYWxzZSwgRmFs c2UsIDIpCi0gICAgICAgIAotICAgICAgICBkYXRlQm94LnBhY2tfc3RhcnQoc2VsZi5tb250aEJv eCwgRmFsc2UsIEZhbHNlLCAyKQotICAgICAgICBkYXRlQm94LnBhY2tfc3RhcnQoc2VsZi5kYXlT cGluLCBGYWxzZSwgRmFsc2UsIDIpCi0gICAgICAgIGRhdGVCb3gucGFja19zdGFydChzZWxmLnll YXJTcGluLCBGYWxzZSwgRmFsc2UsIDIpCi0gICAgICAgIAotICAgICAgICBzZWxmLnBhY2tfc3Rh cnQoR3RrLkxhYmVsKF8oIkRhdGUgOiAiKSksIEZhbHNlLCBGYWxzZSwgMikKLSAgICAgICAgc2Vs Zi5wYWNrX3N0YXJ0KGRhdGVCb3gsIFRydWUsIFRydWUsIDIpCi0gICAgICAgIHNlbGYucGFja19z dGFydChHdGsuTGFiZWwoXygiVGltZSA6ICIpKSwgRmFsc2UsIEZhbHNlLCAyKQotICAgICAgICBz ZWxmLnBhY2tfc3RhcnQodGltZUJveCwgVHJ1ZSwgVHJ1ZSwgMikKLSAgICAgICAgCi0gICAgZGVm IHVwZGF0ZV90aW1lKHNlbGYpOgotICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jay5hY3F1 aXJlKCkKLSAgICAgICAgZG9fdXBkYXRlID0gbm90IHNlbGYuX3NldHRpbmdfdGltZQotICAgICAg ICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jay5yZWxlYXNlKCkKLSAgICAgICAgCi0gICAgICAgIGlm IG5vdCBkb191cGRhdGU6Ci0gICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAKLSAgICAg ICAgZHQgPSBkYXRldGltZS5ub3coKQotICAgICAgICAKLSAgICAgICAgc2VsZi5jaGFuZ2VkT25U aW1lb3V0ID0gVHJ1ZQotICAgICAgICAKLSAgICAgICAgIyBUaW1lCi0gICAgICAgIHNlbGYuaG91 clNwaW4uc2V0X3ZhbHVlKCBkdC5ob3VyICkKLSAgICAgICAgc2VsZi5taW5TcGluLnNldF92YWx1 ZSggZHQubWludXRlICkKLSAgICAgICAgCi0gICAgICAgICMgRGF0ZQotICAgICAgICBzZWxmLm1v bnRoQm94LnNldF9hY3RpdmUoIGR0Lm1vbnRoLTEgKQotICAgICAgICBzZWxmLmRheVNwaW4uc2V0 X3ZhbHVlKCBkdC5kYXkgKQotICAgICAgICBzZWxmLnllYXJTcGluLnNldF92YWx1ZSggZHQueWVh ciApCi0gICAgICAgIAotICAgICAgICBzZWxmLmNoYW5nZWRPblRpbWVvdXQgPSBGYWxzZQotICAg ICAgICAKLSAgICAgICAgIyBVcGRhdGUgdGhlIG1heCBvZiB0aGUgZGF5IHNwaW4gYm94Ci0gICAg ICAgIG1heERheSA9IDMxCi0gICAgICAgIGlmIGR0Lm1vbnRoID09IDI6Ci0gICAgICAgICAgICBp ZiBkdC55ZWFyICUgNCA9PSAwOgotICAgICAgICAgICAgICAgIG1heERheSA9IDI5Ci0gICAgICAg ICAgICBlbHNlOgotICAgICAgICAgICAgICAgIG1heERheSA9IDI4Ci0gICAgICAgIGVsaWYgZHQu bW9udGgtMSBpbiBzZWxmLnRoaXJ0eURheXM6Ci0gICAgICAgICAgICBtYXhEYXkgPSAzMAotICAg ICAgICAgICAgCi0gICAgICAgIHNlbGYuZGF5U3Bpbi5nZXRfYWRqdXN0bWVudCgpLnNldF91cHBl cihtYXhEYXkpCi0gICAgICAgIAotICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAKLSAgICBk ZWYgY2hhbmdlX3VzaW5nX250cChzZWxmLCB1c2luZ050cCk6Ci0gICAgICAgICMgQ2hlY2sgaWYg d2Ugd2VyZSB1c2luZyBOdHAgYnkgc2VlaW5nIGlmIHRoZSBzcGluIGJ1dHRvbgotICAgICAgICAj IGlzIHNlbnNpdGl2ZQotICAgICAgICBzZWxmLnNldF9zZW5zaXRpdmUobm90IHVzaW5nTnRwKQot ICAgIAotICAgIGRlZiBfZG9fY2hhbmdlX3N5c3RlbV90aW1lKHNlbGYpOgotICAgICAgICBzZWxm Ll9zZXR0aW5nX3RpbWVfbG9jay5hY3F1aXJlKCkKLSAgICAgICAgZG9fc2V0ID0gbm90IHNlbGYu X3NldHRpbmdfdGltZQotICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWUgPSBUcnVlCi0gICAgICAg IHNlbGYuX3NldHRpbmdfdGltZV9sb2NrLnJlbGVhc2UoKQotICAgICAgICAKLSAgICAgICAgIyBJ ZiB0aGVyZSBpcyBhbHJlYWR5IGFub3RoZXIgdGhyZWFkIHVwZGF0aW5nIHRoZSB0aW1lLCB3ZSBs ZXQgaXQgZG8gdGhlIGpvYgotICAgICAgICBpZiBub3QgZG9fc2V0OgotICAgICAgICAgICAgcmV0 dXJuCi0gICAgICAgIAotICAgICAgICBkb25lID0gRmFsc2UKLSAgICAgICAgd2hpbGUgbm90IGRv bmU6Ci0gICAgICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jay5hY3F1aXJlKCkKLSAgICAg ICAgICAgIHRpbWVfdG9fc2V0ID0gc2VsZi5fdGltZV90b19zZXQKLSAgICAgICAgICAgIHNlbGYu X3RpbWVfdG9fc2V0ID0gTm9uZQotICAgICAgICAgICAgc2VsZi5fc2V0dGluZ190aW1lX2xvY2su cmVsZWFzZSgpCi0gICAgICAgICAgICAKLSAgICAgICAgICAgIHNlbGYuZGJ1c19pZmFjZS5TZXRU aW1lKHRpbWVfdG9fc2V0KQotICAgICAgICAgICAgCi0gICAgICAgICAgICAjIENoZWNrIHdoZXRo ZXIgYW5vdGhlciByZXF1ZXN0IHRvIHNldCB0aGUgdGltZSB3YXMgZG9uZSBzaW5jZSB0aGlzIHRo cmVhZCBzdGFydGVkCi0gICAgICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jay5hY3F1aXJl KCkKLSAgICAgICAgICAgIGlmIHNlbGYuX3RpbWVfdG9fc2V0PT1Ob25lOgotICAgICAgICAgICAg ICAgIGRvbmUgPSBUcnVlCi0gICAgICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9jay5yZWxl YXNlKCkKLSAgICAgICAgCi0gICAgICAgIHNlbGYuX3NldHRpbmdfdGltZV9sb2NrLmFjcXVpcmUo KQotICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWUgPSBGYWxzZQotICAgICAgICBzZWxmLl9zZXR0 aW5nX3RpbWVfbG9jay5yZWxlYXNlKCkKLSAgICAgICAgICAgICAgICAKLSAgICBkZWYgX2NoYW5n ZV9zeXN0ZW1fdGltZShzZWxmLCB3aWRnZXQpOgotICAgICAgICBpZiBub3Qgc2VsZi5jaGFuZ2Vk T25UaW1lb3V0OgotICAgICAgICAgICAgaG91ciA9IGludCggc2VsZi5ob3VyU3Bpbi5nZXRfdmFs dWUoKSApCi0gICAgICAgICAgICBtaW51dGUgPSBpbnQoIHNlbGYubWluU3Bpbi5nZXRfdmFsdWUo KSApCi0gICAgICAgICAgICBtb250aCA9IHNlbGYubW9udGhCb3guZ2V0X2FjdGl2ZSgpICsgMQot ICAgICAgICAgICAgZGF5ID0gaW50KCBzZWxmLmRheVNwaW4uZ2V0X3ZhbHVlKCkgKQotICAgICAg ICAgICAgeWVhciA9IGludCggc2VsZi55ZWFyU3Bpbi5nZXRfdmFsdWUoKSApCi0gICAgICAgICAg ICAKLSAgICAgICAgICAgIG5ld0R0ID0gZGF0ZXRpbWUoeWVhciwgbW9udGgsIGRheSwgaG91ciwg bWludXRlKQotICAgICAgICAgICAgCi0gICAgICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9j ay5hY3F1aXJlKCkKLSAgICAgICAgICAgIHNlbGYuX3RpbWVfdG9fc2V0ID0gdGltZS5ta3RpbWUo bmV3RHQudXRjdGltZXR1cGxlKCkpCi0gICAgICAgICAgICBzZWxmLl9zZXR0aW5nX3RpbWVfbG9j ay5yZWxlYXNlKCkKLSAgICAgICAgICAgIAotICAgICAgICAgICAgdGhyZWFkLnN0YXJ0X25ld190 aHJlYWQoc2VsZi5fZG9fY2hhbmdlX3N5c3RlbV90aW1lLCAoKSkKLQogY2xhc3MgVGl0bGVCYXJC dXR0b25zT3JkZXJTZWxlY3RvcihHdGsuVGFibGUpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToK ICAgICAgICAgc2VsZi5rZXkgPSAiL2Rlc2t0b3AvY2lubmFtb24vd2luZG93cy9idXR0b25fbGF5 b3V0IgpAQCAtMTEyMSwyNyArODc5LDEyIEBAIGNsYXNzIE1haW5XaW5kb3c6CiAgICAgICAgIHNp ZGVQYWdlLmFkZF93aWRnZXQoR1NldHRpbmdzQ2hlY2tCdXR0b24oXygiUGFuZWwgTGF1bmNoZXJz IGRyYWdnYWJsZSIpLCAib3JnLmNpbm5hbW9uIiwgInBhbmVsLWxhdW5jaGVycy1kcmFnZ2FibGUi KSkgICAgICAgCiAgICAgICAgIAogICAgICAgICBzaWRlUGFnZSA9IFNpZGVQYWdlKF8oIkNhbGVu ZGFyIiksICJjbG9jay5zdmciLCBzZWxmLmNvbnRlbnRfYm94KQotICAgICAgICBzZWxmLnNpZGVQ YWdlcy5hcHBlbmQoKHNpZGVQYWdlLCAiY2FsZW5kYXIiKSkKLSAgICAgICAgc2VsZi5jaGFuZ2VU aW1lV2lkZ2V0ID0gQ2hhbmdlVGltZVdpZGdldCgpICAgICAKKyAgICAgICAgc2VsZi5zaWRlUGFn ZXMuYXBwZW5kKChzaWRlUGFnZSwgImNhbGVuZGFyIikpICAgICAKICAgICAgICAgc2lkZVBhZ2Uu YWRkX3dpZGdldChHU2V0dGluZ3NDaGVja0J1dHRvbihfKCJTaG93IHdlZWsgZGF0ZXMgaW4gY2Fs ZW5kYXIiKSwgIm9yZy5jaW5uYW1vbi5jYWxlbmRhciIsICJzaG93LXdlZWtkYXRlIikpICAgICAg ICAgCiAgICAgICAgIHNpZGVQYWdlLmFkZF93aWRnZXQoR1NldHRpbmdzRW50cnkoXygiRGF0ZSBm b3JtYXQgZm9yIHRoZSBwYW5lbCIpLCAib3JnLmNpbm5hbW9uLmNhbGVuZGFyIiwgImRhdGUtZm9y bWF0IikpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgIHNpZGVQYWdl LmFkZF93aWRnZXQoR1NldHRpbmdzRW50cnkoXygiRGF0ZSBmb3JtYXQgaW5zaWRlIHRoZSBkYXRl IGFwcGxldCIpLCAib3JnLmNpbm5hbW9uLmNhbGVuZGFyIiwgImRhdGUtZm9ybWF0LWZ1bGwiKSkg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgc2lkZVBhZ2UuYWRkX3dp ZGdldChHdGsuTGlua0J1dHRvbi5uZXdfd2l0aF9sYWJlbCgiaHR0cDovL3d3dy5mb3JhZ29vZHN0 cmZ0aW1lLmNvbS8iLCBfKCJHZW5lcmF0ZSB5b3VyIG93biBkYXRlIGZvcm1hdHMiKSkpCi0gICAg ICAgIHNlbGYubnRwQ2hlY2tCdXR0b24gPSBOb25lIAotICAgICAgICB0cnk6Ci0gICAgICAgICAg ICBzZWxmLm50cENoZWNrQnV0dG9uID0gREJ1c0NoZWNrQnV0dG9uKF8oIlVzZSBuZXR3b3JrIHRp bWUiKSwgIm9yZy5nbm9tZS5TZXR0aW5nc0RhZW1vbi5EYXRlVGltZU1lY2hhbmlzbSIsICIvIiwg IkdldFVzaW5nTnRwIiwgIlNldFVzaW5nTnRwIikKLSAgICAgICAgICAgIHNpZGVQYWdlLmFkZF93 aWRnZXQoc2VsZi5udHBDaGVja0J1dHRvbikKLSAgICAgICAgZXhjZXB0OgotICAgICAgICAgICAg cGFzcwotICAgICAgICBzaWRlUGFnZS5hZGRfd2lkZ2V0KHNlbGYuY2hhbmdlVGltZVdpZGdldCkK LSAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2lkZVBhZ2UuYWRkX3dpZGdldChUaW1lWm9uZVNl bGVjdG9yV2lkZ2V0KCkpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHBhc3MKLSAgICAg ICAgCi0gICAgICAgIGlmIHNlbGYubnRwQ2hlY2tCdXR0b24gIT0gTm9uZToKLSAgICAgICAgICAg IHNlbGYubnRwQ2hlY2tCdXR0b24uY29ubmVjdCgndG9nZ2xlZCcsIHNlbGYuX250cF90b2dnbGVk KQotICAgICAgICAgICAgc2VsZi5jaGFuZ2VUaW1lV2lkZ2V0LmNoYW5nZV91c2luZ19udHAoIHNl bGYubnRwQ2hlY2tCdXR0b24uZ2V0X2FjdGl2ZSgpICkKKwogICAgICAgICAKICAgICAgICAgc2lk ZVBhZ2UgPSBTaWRlUGFnZShfKCJIb3QgY29ybmVyIiksICJvdmVydmlldy5zdmciLCBzZWxmLmNv bnRlbnRfYm94KQogICAgICAgICBzZWxmLnNpZGVQYWdlcy5hcHBlbmQoKHNpZGVQYWdlLCAiaG90 Y29ybmVyIikpCkBAIC0xMzE2LDcgKzEwNTksNiBAQCBjbGFzcyBNYWluV2luZG93OgogICAgICAg ICBzaWRlUGFnZS5hZGRfd2lkZ2V0KEdTZXR0aW5nc0ZvbnRCdXR0b24oXygiRGVmYXVsdCBmb250 IiksICJvcmcuZ25vbWUuZGVza3RvcC5pbnRlcmZhY2UiLCAiZm9udC1uYW1lIikpCiAgICAgICAg IHNpZGVQYWdlLmFkZF93aWRnZXQoR1NldHRpbmdzRm9udEJ1dHRvbihfKCJEb2N1bWVudCBmb250 IiksICJvcmcuZ25vbWUuZGVza3RvcC5pbnRlcmZhY2UiLCAiZG9jdW1lbnQtZm9udC1uYW1lIikp CiAgICAgICAgIHNpZGVQYWdlLmFkZF93aWRnZXQoR1NldHRpbmdzRm9udEJ1dHRvbihfKCJNb25v c3BhY2UgZm9udCIpLCAib3JnLmdub21lLmRlc2t0b3AuaW50ZXJmYWNlIiwgIm1vbm9zcGFjZS1m b250LW5hbWUiKSkKLSAgICAgICAgc2lkZVBhZ2UuYWRkX3dpZGdldChHQ29uZkZvbnRCdXR0b24o XygiV2luZG93IHRpdGxlIGZvbnQiKSwgIi9hcHBzL21ldGFjaXR5L2dlbmVyYWwvdGl0bGViYXJf Zm9udCIpKQogICAgICAgICBzaWRlUGFnZS5hZGRfd2lkZ2V0KEdTZXR0aW5nc0NvbWJvQm94KF8o IkhpbnRpbmciKSwgIm9yZy5nbm9tZS5zZXR0aW5ncy1kYWVtb24ucGx1Z2lucy54c2V0dGluZ3Mi LCAiaGludGluZyIsIFsoaSwgaS50aXRsZSgpKSBmb3IgaSBpbiAoIm5vbmUiLCAic2xpZ2h0Iiwg Im1lZGl1bSIsICJmdWxsIildKSkKICAgICAgICAgc2lkZVBhZ2UuYWRkX3dpZGdldChHU2V0dGlu Z3NDb21ib0JveChfKCJBbnRpYWxpYXNpbmciKSwgIm9yZy5nbm9tZS5zZXR0aW5ncy1kYWVtb24u cGx1Z2lucy54c2V0dGluZ3MiLCAiYW50aWFsaWFzaW5nIiwgWyhpLCBpLnRpdGxlKCkpIGZvciBp IGluICgibm9uZSIsICJncmF5c2NhbGUiLCAicmdiYSIpXSkpCiAgICAgICAgICAgICAgICAgICAg ICAgICAKQEAgLTEzNTcsOSArMTA5OSw2IEBAIGNsYXNzIE1haW5XaW5kb3c6CiAgICAgICAgIHNl bGYuY29udGVudF9ib3hfc3cuaGlkZSgpCiAgICAgICAgIHNlbGYudG9wX2J1dHRvbl9ib3guaGlk ZSgpCiAgICAgICAgIHNlbGYuc2lkZV92aWV3X3N3LnNob3dfYWxsKCkKLSAgICAgICAgCi0gICAg ZGVmIF9udHBfdG9nZ2xlZChzZWxmLCB3aWRnZXQpOgotICAgICAgICBzZWxmLmNoYW5nZVRpbWVX aWRnZXQuY2hhbmdlX3VzaW5nX250cCggc2VsZi5udHBDaGVja0J1dHRvbi5nZXRfYWN0aXZlKCkg KQogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIAogaWYgX19uYW1lX18gPT0gIl9f bWFpbl9fIjoKZGlmZiAtLWdpdCBhL2ZpbGVzL3Vzci9saWIvY2lubmFtb24tc2V0dGluZ3MvdHou cHkgYi9maWxlcy91c3IvbGliL2Npbm5hbW9uLXNldHRpbmdzL3R6LnB5CmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAxYjFkMjY0Li4wMDAwMDAwCi0tLSBhL2ZpbGVzL3Vzci9saWIvY2lu bmFtb24tc2V0dGluZ3MvdHoucHkKKysrIC9kZXYvbnVsbApAQCAtMSwzNSArMCwwIEBACi1pbXBv cnQgb3MKLQotZGVmIGxvYWRfZGIoKToKLSAgICB0el9kYiA9IHt9Ci0gICAgCi0gICAgZmlsZW5h bWUgPSAnL3Vzci9zaGFyZS96b25laW5mby96b25lLnRhYicKLSAgICBpZiBub3Qgb3MucGF0aC5l eGlzdHMoZmlsZW5hbWUpOgotICAgICAgICBmaWxlbmFtZSA9ICcvdXNyL3NoYXJlL2xpYi96b25l aW5mby90YWIvem9uZV9zdW4udGFiJwotICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhmaWxlbmFt ZSk6Ci0gICAgICAgIHJldHVybiB7fQotICAgICAgICAKLSAgICB0el9maWxlID0gb3BlbihmaWxl bmFtZSkKLSAgICAKLSAgICBmb3IgbGluZSBpbiB0el9maWxlOgotICAgICAgICBsaW5lID0gbGlu ZS5yc3RyaXAoKS5sc3RyaXAoKQotICAgICAgICBpZiBsaW5lPT0iIiBvciBsaW5lWzBdID09ICcj JzoKLSAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgIAotICAgICAgICB0el9pbmZvID0gbGlu ZS5zcGxpdCgnXHQnKQotICAgICAgICBpZiBsZW4odHpfaW5mbyk8MzoKLSAgICAgICAgICAgIGNv bnRpbnVlCi0gICAgICAgIHR6ID0gdHpfaW5mb1syXQotICAgICAgICBpZiAiLyIgaW4gdHo6Ci0g ICAgICAgICAgICBpID0gdHouaW5kZXgoIi8iKQotICAgICAgICAgICAgcmVnaW9uID0gdHpbOmld Ci0gICAgICAgICAgICB6b25lID0gdHpbaSsxOl0KLSAgICAgICAgCi0gICAgICAgICAgICBpZiBy ZWdpb24gbm90IGluIHR6X2RiOgotICAgICAgICAgICAgICAgIHR6X2RiW3JlZ2lvbl0gPSBbXQot ICAgICAgICAgICAgCi0gICAgICAgICAgICB0el9kYltyZWdpb25dLmFwcGVuZCh6b25lKQotICAg ICAgICAKLSAgICB0el9maWxlLmNsb3NlKCkKLSAgICAKLSAgICByZXR1cm4gdHpfZGIKZGlmZiAt LWdpdCBhL2ZpbGVzL3Vzci9zaGFyZS9jaW5uYW1vbi9hcHBsZXRzL2NhbGVuZGFyQGNpbm5hbW9u Lm9yZy9hcHBsZXQuanMgYi9maWxlcy91c3Ivc2hhcmUvY2lubmFtb24vYXBwbGV0cy9jYWxlbmRh ckBjaW5uYW1vbi5vcmcvYXBwbGV0LmpzCmluZGV4IDJiNWRjODIuLjZjMzY3Y2EgMTAwNjQ0Ci0t LSBhL2ZpbGVzL3Vzci9zaGFyZS9jaW5uYW1vbi9hcHBsZXRzL2NhbGVuZGFyQGNpbm5hbW9uLm9y Zy9hcHBsZXQuanMKKysrIGIvZmlsZXMvdXNyL3NoYXJlL2Npbm5hbW9uL2FwcGxldHMvY2FsZW5k YXJAY2lubmFtb24ub3JnL2FwcGxldC5qcwpAQCAtNjIsOSArNjIsNyBAQCBNeUFwcGxldC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9jYWxlbmRhciA9IG5ldyBDYWxlbmRhci5DYWxl bmRhcih0aGlzLl9ldmVudFNvdXJjZSk7ICAgICAgIAogICAgICAgICAgICAgdmJveC5hZGQodGhp cy5fY2FsZW5kYXIuYWN0b3IpOwogCi0gICAgICAgICAgICBsZXQgaXRlbSA9IG5ldyBQb3B1cE1l bnUuUG9wdXBNZW51SXRlbShfKCJEYXRlIGFuZCBUaW1lIFNldHRpbmdzIikpCi0gICAgICAgICAg ICBpdGVtLmNvbm5lY3QoImFjdGl2YXRlIiwgTGFuZy5iaW5kKHRoaXMsIHRoaXMuX29uTGF1bmNo U2V0dGluZ3MpKTsKLSAgICAgICAgICAgIC8vdGhpcy5tZW51LmFkZE1lbnVJdGVtKGl0ZW0pOwor ICAgICAgICAgICAgaXRlbSA9IHRoaXMubWVudS5hZGRTZXR0aW5nc0FjdGlvbihfKCJEYXRlIGFu ZCBUaW1lIFNldHRpbmdzIiksICdnbm9tZS1kYXRldGltZS1wYW5lbC5kZXNrdG9wJyk7CiAgICAg ICAgICAgICBpZiAoaXRlbSkgewogICAgICAgICAgICAgICAgIGxldCBzZXBhcmF0b3IgPSBuZXcg UG9wdXBNZW51LlBvcHVwU2VwYXJhdG9yTWVudUl0ZW0oKTsKICAgICAgICAgICAgICAgICBzZXBh cmF0b3Iuc2V0Q29sdW1uV2lkdGhzKDEpOwpAQCAtOTYsMTEgKzk0LDYgQEAgTXlBcHBsZXQucHJv dG90eXBlID0gewogICAgIG9uX2FwcGxldF9jbGlja2VkOiBmdW5jdGlvbihldmVudCkgewogICAg ICAgICB0aGlzLm1lbnUudG9nZ2xlKCk7CiAgICAgfSwKLSAgICAKLSAgICBfb25MYXVuY2hTZXR0 aW5nczogZnVuY3Rpb24oKSB7Ci0gICAgICAgIHRoaXMubWVudS5jbG9zZSgpOwotICAgICAgICBV dGlsLnNwYXduQ29tbWFuZExpbmUoImNpbm5hbW9uLXNldHRpbmdzIGNhbGVuZGFyIik7Ci0gICAg fSwKIAogICAgIF91cGRhdGVDbG9ja0FuZERhdGU6IGZ1bmN0aW9uKCkgewogICAgICAgICBsZXQg ZGF0ZUZvcm1hdCA9IHRoaXMuX2NhbGVuZGFyU2V0dGluZ3MuZ2V0X3N0cmluZygnZGF0ZS1mb3Jt YXQnKTsgICAgICAgCg==