55932 2025-09-10 11:26:49 +0300 [gnome-shell] Добавить уведомление о конфликте IP-адресов 2025-12-19 14:49:30 +0300 1 1 4 Development Sisyphus gnome-shell unstable x86_64 Linux NEW P5 normal --- 1 paladindev aris aris armatik qa-sisyphus oldest_to_newest 272237 0 paladindev 2025-09-10 11:26:49 +0300 Реализовано уведомление о конфликте ip-адресов https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3800 272710 1 19584 paladindev 2025-09-18 15:20:05 +0300 Created attachment 19584 Feature patch 272711 2 paladindev 2025-09-18 15:21:33 +0300 Предлагаю добавить функционал реализованный в патче. 279272 3 armatik 2025-12-19 14:49:30 +0300 aris@ какой статус по ошибки, есть возможность интеграции? 19584 2025-09-18 15:20:05 +0300 2025-09-18 15:20:05 +0300 Feature patch patchfile.patch text/plain 3373 paladindev RnJvbSBiOGRiYWJhNTFlNGVkYTVmMzM2ZmQ0ZjgzNjcwZjk3MmNhZjg2YmRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgRGF2eWR6aWsgPHBhbGFkaW5kZXZAYWx0bGlu dXgub3JnPgpEYXRlOiBXZWQsIDE2IEp1bCAyMDI1IDE3OjUxOjE0ICswMzAwClN1YmplY3Q6IFtQ QVRDSF0gbmV0d29yazogRGlmZmVyZW50IG5vdGlmaWNhdGlvbiBkZXNjcmlwdGlvbiBpZgogYWN0 aXZhdGlvbi1mYWlsZWQKClNob3dzIGRpZmZlcmVudCBub3RpZmljYXRpb24gZGVzY3JpcHRpb24g aWYgYWN0aXZhdGlvbi1mYWlsZWQgcmVhc29uIHdhcwpJUF9DT05GSUdfVU5BVkFJTEFCTEUKCkFs c28gdGhpcyBjb21taXQgYWRkcyBpbnQgcGFyYW0gdG8gTk1Ub2dnbGUgY2xhc3Mgd2hpY2ggaXMg cmVwcmVzZW50cwpOTS5EZXZpY2VTdGF0ZVJlYXNvbiBlbnVtLiBUaGF0IGNhbiBiZSB1c2VkIHRv IHNob3cgZGlmZmVyZW50IGVycm9yCm1lc3NhZ2Ugd2hlbiBhY3RpdmF0aW9uLWZhaWxlZCBzaWdu YWwgaXMgYWN0aXZhdGVkLgoKTm90ZTogTk1WcG5Ub2dnbGUgYWx3YXlzIGVtaXRzIHNpZ25hbCB3 aXRoIE5NLkRldmljZVN0YXRlUmVhc29uLk5PTkUKLS0tCiBqcy91aS9zdGF0dXMvbmV0d29yay5q cyB8IDIwICsrKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9u cygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9qcy91aS9zdGF0dXMvbmV0d29yay5q cyBiL2pzL3VpL3N0YXR1cy9uZXR3b3JrLmpzCmluZGV4IDk2Y2ExYWQwMi4uYjQ4YmVmMzg0IDEw MDY0NAotLS0gYS9qcy91aS9zdGF0dXMvbmV0d29yay5qcworKysgYi9qcy91aS9zdGF0dXMvbmV0 d29yay5qcwpAQCAtMTM3NSw3ICsxMzc1LDkgQEAgY29uc3QgTk1WcG5Db25uZWN0aW9uSXRlbSA9 IEdPYmplY3QucmVnaXN0ZXJDbGFzcyh7CiAKIGNvbnN0IE5NVG9nZ2xlID0gR09iamVjdC5yZWdp c3RlckNsYXNzKHsKICAgICBTaWduYWxzOiB7Ci0gICAgICAgICdhY3RpdmF0aW9uLWZhaWxlZCc6 IHt9LAorICAgICAgICAnYWN0aXZhdGlvbi1mYWlsZWQnOiB7CisgICAgICAgICAgICBwYXJhbV90 eXBlczogW0dPYmplY3QuVFlQRV9JTlRdLAorICAgICAgICB9LAogICAgIH0sCiB9LCBjbGFzcyBO TVRvZ2dsZSBleHRlbmRzIFF1aWNrTWVudVRvZ2dsZSB7CiAgICAgY29uc3RydWN0b3IoKSB7CkBA IC0xNjE0LDcgKzE2MTYsNyBAQCBjbGFzcyBOTVZwblRvZ2dsZSBleHRlbmRzIE5NVG9nZ2xlIHsK IAogICAgICAgICBjb25zdCBpdGVtID0gbmV3IE5NVnBuQ29ubmVjdGlvbkl0ZW0odGhpcywgY29u bmVjdGlvbik7CiAgICAgICAgIGl0ZW0uY29ubmVjdE9iamVjdCgKLSAgICAgICAgICAgICdhY3Rp dmF0aW9uLWZhaWxlZCcsICgpID0+IHRoaXMuZW1pdCgnYWN0aXZhdGlvbi1mYWlsZWQnKSwKKyAg ICAgICAgICAgICdhY3RpdmF0aW9uLWZhaWxlZCcsICgpID0+IHRoaXMuZW1pdCgnYWN0aXZhdGlv bi1mYWlsZWQnLCBOTS5EZXZpY2VTdGF0ZVJlYXNvbi5OT05FKSwKICAgICAgICAgICAgIHRoaXMp OwogICAgICAgICB0aGlzLl9hZGRJdGVtKGNvbm5lY3Rpb24sIGl0ZW0pOwogCkBAIC0xNzMxLDcg KzE3MzMsNyBAQCBjbGFzcyBOTURldmljZVRvZ2dsZSBleHRlbmRzIE5NVG9nZ2xlIHsKICAgICAg ICAgICAgY2FuY2VsbGVkIHRoZSBhZ2VudCBkaWFsb2cgKi8KICAgICAgICAgaWYgKG5ld1N0YXRl ID09PSBOTS5EZXZpY2VTdGF0ZS5GQUlMRUQgJiYKICAgICAgICAgICAgIHJlYXNvbiAhPT0gTk0u RGV2aWNlU3RhdGVSZWFzb24uTk9fU0VDUkVUUykKLSAgICAgICAgICAgIHRoaXMuZW1pdCgnYWN0 aXZhdGlvbi1mYWlsZWQnKTsKKyAgICAgICAgICAgIHRoaXMuZW1pdCgnYWN0aXZhdGlvbi1mYWls ZWQnLCByZWFzb24pOwogICAgIH0KIAogICAgIF9jcmVhdGVEZXZpY2VNZW51SXRlbShfZGV2aWNl KSB7CkBAIC0yMDk4LDcgKzIxMDAsNyBAQCBjbGFzcyBJbmRpY2F0b3IgZXh0ZW5kcyBTeXN0ZW1J bmRpY2F0b3IgewogCiAgICAgICAgIHRoaXMucXVpY2tTZXR0aW5nc0l0ZW1zLmZvckVhY2godG9n Z2xlID0+IHsKICAgICAgICAgICAgIHRvZ2dsZS5jb25uZWN0T2JqZWN0KAotICAgICAgICAgICAg ICAgICdhY3RpdmF0aW9uLWZhaWxlZCcsICgpID0+IHRoaXMuX29uQWN0aXZhdGlvbkZhaWxlZCgp LAorICAgICAgICAgICAgICAgICdhY3RpdmF0aW9uLWZhaWxlZCcsIChfLCByZWFzb24pID0+IHRo aXMuX29uQWN0aXZhdGlvbkZhaWxlZChyZWFzb24pLAogICAgICAgICAgICAgICAgIHRoaXMpOwog ICAgICAgICB9KTsKIApAQCAtMjE2MiwxNCArMjE2NCwxNCBAQCBjbGFzcyBJbmRpY2F0b3IgZXh0 ZW5kcyBTeXN0ZW1JbmRpY2F0b3IgewogICAgICAgICB9CiAgICAgfQogCi0gICAgX29uQWN0aXZh dGlvbkZhaWxlZCgpIHsKKyAgICBfb25BY3RpdmF0aW9uRmFpbGVkKHJlYXNvbikgewogICAgICAg ICB0aGlzLl9ub3RpZmljYXRpb24/LmRlc3Ryb3koKTsKIAogICAgICAgICBjb25zdCBzb3VyY2Ug PSBNZXNzYWdlVHJheS5nZXRTeXN0ZW1Tb3VyY2UoKTsKICAgICAgICAgdGhpcy5fbm90aWZpY2F0 aW9uID0gbmV3IE1lc3NhZ2VUcmF5Lk5vdGlmaWNhdGlvbih7CiAgICAgICAgICAgICBzb3VyY2Us CiAgICAgICAgICAgICB0aXRsZTogXygnQ29ubmVjdGlvbiBmYWlsZWQnKSwKLSAgICAgICAgICAg IGJvZHk6IF8oJ0FjdGl2YXRpb24gb2YgbmV0d29yayBjb25uZWN0aW9uIGZhaWxlZCcpLAorICAg ICAgICAgICAgYm9keTogdGhpcy5fcmVhc29uVG9Mb2NhbGl6ZWRTdHJpbmcocmVhc29uKSwKICAg ICAgICAgICAgIGljb25OYW1lOiAnbmV0d29yay1lcnJvci1zeW1ib2xpYycsCiAgICAgICAgICAg ICB1cmdlbmN5OiBNZXNzYWdlVHJheS5VcmdlbmN5LkhJR0gsCiAgICAgICAgICAgICBpc1RyYW5z aWVudDogdHJ1ZSwKQEAgLTIxODAsNiArMjE4MiwxMiBAQCBjbGFzcyBJbmRpY2F0b3IgZXh0ZW5k cyBTeXN0ZW1JbmRpY2F0b3IgewogICAgICAgICBzb3VyY2UuYWRkTm90aWZpY2F0aW9uKHRoaXMu X25vdGlmaWNhdGlvbik7CiAgICAgfQogCisgICAgX3JlYXNvblRvTG9jYWxpemVkU3RyaW5nKHJl YXNvbikgeworICAgICAgICBpZiAocmVhc29uID09PSBOTS5EZXZpY2VTdGF0ZVJlYXNvbi5JUF9D T05GSUdfVU5BVkFJTEFCTEUpCisgICAgICAgICAgICByZXR1cm4gXygnSVAgY29uZmlndXJhdGlv biBmYWlsZWQnKTsKKyAgICAgICAgcmV0dXJuIF8oJ0FjdGl2YXRpb24gb2YgbmV0d29yayBjb25u ZWN0aW9uIGZhaWxlZCcpOworICAgIH0KKwogICAgIF9zeW5jTWFpbkNvbm5lY3Rpb24oKSB7CiAg ICAgICAgIHRoaXMuX21haW5Db25uZWN0aW9uPy5kaXNjb25uZWN0T2JqZWN0KHRoaXMpOwogCi0t IAoyLjQyLjQKCg==