38848 2020-08-26 11:47:59 +0300 Устаревший атрибут в скрипте etcnet.py для cloud-init 2020-11-09 14:57:26 +0300 1 1 4 Development Sisyphus cloud-init unstable x86_64 Linux CLOSED FIXED P5 normal --- 1 yosho1 obirvalger fedor obirvalger shaba yosho1 qa-sisyphus oldest_to_newest 192043 0 8915 yosho1 2020-08-26 11:47:59 +0300 Created attachment 8915 Заменен устаревший атрибут has_key В файле скрипта /usr/lib/python3/site-packages/cloudinit/net/etcnet.py используется устаревший атрибут has_key. Для python3 вместо конструкции вида if s.has_key('gateway') нужно использовать if 'gateway' in s Прикладываю исправленный скрипт 193966 1 repository-robot 2020-11-09 14:57:26 +0300 cloud-init-20.1-alt2 -> sisyphus: Mon Nov 09 2020 Mikhail Gordeev <obirvalger@altlinux> 20.1-alt2 - Fix dictionary key lookup for python3 (Closes: 38848) 8915 2020-08-26 11:47:59 +0300 2020-08-26 11:47:59 +0300 Заменен устаревший атрибут has_key etcnet.py text/plain 3802 yosho1 IyBUaGlzIGZpbGUgaXMgcGFydCBvZiBjbG91ZC1pbml0LiBTZWUgTElDRU5TRSBmaWxlIGZvciBs aWNlbnNlIGluZm9ybWF0aW9uLgoKaW1wb3J0IG9zCgpmcm9tIGNsb3VkaW5pdC5kaXN0cm9zLnBh cnNlcnMgaW1wb3J0IHJlc29sdl9jb25mCmZyb20gY2xvdWRpbml0IGltcG9ydCB1dGlsCgpmcm9t IC4gaW1wb3J0IHJlbmRlcmVyCgoKY2xhc3MgUmVuZGVyZXIocmVuZGVyZXIuUmVuZGVyZXIpOgog ICAgIiIiUmVuZGVycyBuZXR3b3JrIGluZm9ybWF0aW9uIGluIGEgL2V0Yy9uZXQgZm9ybWF0LiIi IgoKICAgIGlmYWNlX2RlZmF1bHRzID0gdHVwbGUoWwogICAgICAgICgnT05CT09UJywgVHJ1ZSks CiAgICAgICAgKCdESVNBQkxFRCcsIEZhbHNlKSwKICAgICAgICAoJ05NX0NPTlRST0xMRUQnLCBG YWxzZSksCiAgICAgICAgKCdCT09UUFJPVE8nLCAnZGhjcCcpLAogICAgXSkKCiAgICBkZWYgX19p bml0X18oc2VsZiwgY29uZmlnPU5vbmUpOgogICAgICAgIGlmIG5vdCBjb25maWc6CiAgICAgICAg ICAgIGNvbmZpZyA9IHt9CiAgICAgICAgc2VsZi5ldGNuZXRfZGlyID0gY29uZmlnLmdldCgnZXRj bmV0X2RpcicsICdldGMvbmV0L2lmYWNlcy8nKQogICAgICAgIHNlbGYubmV0cnVsZXNfcGF0aCA9 IGNvbmZpZy5nZXQoCiAgICAgICAgICAgICduZXRydWxlc19wYXRoJywgJ2V0Yy91ZGV2L3J1bGVz LmQvNzAtcGVyc2lzdGVudC1uZXQucnVsZXMnKQogICAgICAgIHNlbGYuZG5zX3BhdGggPSBjb25m aWcuZ2V0KCdkbnNfcGF0aCcsICdldGMvbmV0L2lmYWNlcy9sby9yZXNvbHYuY29uZicpCgogICAg QGNsYXNzbWV0aG9kCiAgICBkZWYgX3JlbmRlcl9ldGNuZXQoY2xzLCBiYXNlX2V0Y25ldF9kaXIs IG5ldHdvcmtfc3RhdGUpOgogICAgICAgICcnJ0dpdmVuIHN0YXRlLCByZXR1cm4gL2V0Yy9uZXQg ZmlsZXMgKyBjb250ZW50cycnJwogICAgICAgIG9wdGlvbnNfcGF0aCA9ICIlKGJhc2Upcy8lKG5h bWUpcy9vcHRpb25zIgogICAgICAgIGlwdjRfcGF0aCAgICA9ICIlKGJhc2Upcy8lKG5hbWUpcy9p cHY0YWRkcmVzcyIKICAgICAgICBpcHY0cl9wYXRoICAgPSAiJShiYXNlKXMvJShuYW1lKXMvaXB2 NHJvdXRlIgogICAgICAgIHJlc29sdl9wYXRoICA9ICIlKGJhc2Upcy9ldGgwL3Jlc29sdi5jb25m IgoKICAgICAgICBuYW1lc2VydmVycyA9IG5ldHdvcmtfc3RhdGUuZG5zX25hbWVzZXJ2ZXJzCiAg ICAgICAgc2VhcmNoZG9tYWlucyA9IG5ldHdvcmtfc3RhdGUuZG5zX3NlYXJjaGRvbWFpbnMKICAg ICAgICByZXNvbHZjb25mID0gW10KICAgICAgICBmb3Igc2QgaW4gc2VhcmNoZG9tYWluczoKICAg ICAgICAgICAgcmVzb2x2Y29uZi5hcHBlbmQoInNlYXJjaFx0JXMiICUgc2QpCgogICAgICAgIGZv ciBucyBpbiBuYW1lc2VydmVyczoKICAgICAgICAgICAgcmVzb2x2Y29uZi5hcHBlbmQoIm5hbWVz ZXJ2ZXJcdCVzIiAlIG5zKQoKICAgICAgICBjb250ZW50ID0ge30KCiAgICAgICAgcGF0aCA9IHJl c29sdl9wYXRoICUgKHsnYmFzZSc6IGJhc2VfZXRjbmV0X2Rpcn0pCiAgICAgICAgY29udGVudFtw YXRoXSA9ICdcbicuam9pbihyZXNvbHZjb25mKQoKICAgICAgICBmb3IgaWZhY2UgaW4gbmV0d29y a19zdGF0ZS5pdGVyX2ludGVyZmFjZXMoKToKICAgICAgICAgICAgaWYgaWZhY2VbJ3R5cGUnXSA9 PSAibG9vcGJhY2siOgogICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgaWZhY2Vf bmFtZSA9IGlmYWNlWyduYW1lJ10KICAgICAgICAgICAgc3VibmV0cyA9IGlmYWNlLmdldCgnc3Vi bmV0cycsIFtdKQogICAgICAgICAgICByZXMgPSB7fQogICAgICAgICAgICBmb3IgcyBpbiBzdWJu ZXRzOgogICAgICAgICAgICAgICAgbyA9IHJlcy5nZXQoJ2FkZHJlc3MnLCBbXSkKICAgICAgICAg ICAgICAgIG8uYXBwZW5kKCIlcy8lcyIgJSAoc1snYWRkcmVzcyddLCBzWydwcmVmaXgnXSkpCiAg ICAgICAgICAgICAgICByZXNbJ2FkZHJlc3MnXSA9IG8KICAgICAgICAgICAgICAgIGlmICdnYXRl d2F5JyBpbiBzOgogICAgICAgICAgICAgICAgICAgIHJlc1snZ2F0ZXdheSddID0gImRlZmF1bHQg dmlhICVzIiAlIHNbJ2dhdGV3YXknXQoKICAgICAgICAgICAgaWYgJ2FkZHJlc3MnIGluIHJlczoK ICAgICAgICAgICAgICAgIHBhdGggPSBpcHY0X3BhdGggJSAoeydiYXNlJzogYmFzZV9ldGNuZXRf ZGlyLCAnbmFtZSc6IGlmYWNlX25hbWV9KQogICAgICAgICAgICAgICAgY29udGVudFtwYXRoXSA9 ICdcbicuam9pbihyZXNbJ2FkZHJlc3MnXSkKCiAgICAgICAgICAgIGlmICdnYXRld2F5JyBpbiBy ZXM6CiAgICAgICAgICAgICAgICBwYXRoID0gaXB2NHJfcGF0aCAlICh7J2Jhc2UnOiBiYXNlX2V0 Y25ldF9kaXIsICduYW1lJzogaWZhY2VfbmFtZX0pCiAgICAgICAgICAgICAgICBjb250ZW50W3Bh dGhdID0gcmVzWydnYXRld2F5J10KCiAgICAgICAgICAgIG9wdHMgPSBbCiAgICAgICAgICAgICAg Ik9OQk9PVD15ZXMiLAogICAgICAgICAgICAgICJESVNBQkxFRD1ubyIsCiAgICAgICAgICAgICAg IkJPT1RQUk9UTz1zdGF0aWMiLAogICAgICAgICAgICAgICJDT05GSUdfSVBWND15ZXMiLAogICAg ICAgICAgICAgICJDT05GSUdfV0lSRUxFU1M9bm8iLAogICAgICAgICAgICAgICJUWVBFPWV0aCIs CiAgICAgICAgICAgICAgIk5NX0NPTlRST0xMRUQ9bm8iXQogICAgICAgICAgICBvcHRzX3BhdGgg PSBvcHRpb25zX3BhdGggJSAoeydiYXNlJzogYmFzZV9ldGNuZXRfZGlyLCAnbmFtZSc6IGlmYWNl X25hbWV9KQogICAgICAgICAgICBjb250ZW50W29wdHNfcGF0aF0gPSAnXG4nLmpvaW4ob3B0cykK CiAgICAgICAgcmV0dXJuIGNvbnRlbnQKCiAgICBkZWYgcmVuZGVyX25ldHdvcmtfc3RhdGUoc2Vs ZiwgbmV0d29ya19zdGF0ZSwgdGVtcGxhdGVzPU5vbmUsIHRhcmdldD1Ob25lKToKICAgICAgICBi YXNlX2V0Y25ldF9kaXIgPSB1dGlsLnRhcmdldF9wYXRoKHRhcmdldCwgc2VsZi5ldGNuZXRfZGly KQogICAgICAgIGZvciBwYXRoLCBkYXRhIGluIHNlbGYuX3JlbmRlcl9ldGNuZXQoYmFzZV9ldGNu ZXRfZGlyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV0 d29ya19zdGF0ZSkuaXRlbXMoKToKICAgICAgICAgICAgdXRpbC53cml0ZV9maWxlKHBhdGgsIGRh dGEpCgoKZGVmIGF2YWlsYWJsZSh0YXJnZXQ9Tm9uZSk6CiAgICBleHBlY3RlZCA9IFsnaWZ1cCcs ICdpZmRvd24nXQogICAgc2VhcmNoID0gWycvc2JpbicsICcvdXNyL3NiaW4nXQogICAgZm9yIHAg aW4gZXhwZWN0ZWQ6CiAgICAgICAgaWYgbm90IHV0aWwud2hpY2gocCwgc2VhcmNoPXNlYXJjaCwg dGFyZ2V0PXRhcmdldCk6CiAgICAgICAgICAgIHJldHVybiBGYWxzZQoKICAgIGV4cGVjdGVkX3Bh dGhzID0gWwogICAgICAgICdldGMvbmV0L3NjcmlwdHMvZnVuY3Rpb25zJywKICAgICAgICAnZXRj L25ldC9zY3JpcHRzL2Z1bmN0aW9ucy1ldGgnLAogICAgICAgICdldGMvbmV0L3NjcmlwdHMvZnVu Y3Rpb25zLWlwJywKICAgICAgICAnZXRjL25ldC9zY3JpcHRzL2Z1bmN0aW9ucy1pcHY0JywKICAg ICAgICAnZXRjL25ldC9zY3JpcHRzL2Z1bmN0aW9ucy1pcHY2JywKICAgICAgICAnZXRjL25ldC9z Y3JpcHRzL2Z1bmN0aW9ucy12bGFuJywKICAgICAgICAnZXRjL25ldC9zY3JpcHRzL2lmZG93bidd CiAgICBmb3IgcCBpbiBleHBlY3RlZF9wYXRoczoKICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2Zp bGUodXRpbC50YXJnZXRfcGF0aCh0YXJnZXQsIHApKToKICAgICAgICAgICAgcmV0dXJuIEZhbHNl CiAgICByZXR1cm4gVHJ1ZQoKCiMgdmk6IHRzPTQgZXhwYW5kdGFiCg==