Datasets:

code-philia
/

CoEdPilot-generator

Dataset card Data Studio Files Files and versions Community

Split (3)

train · 2.08M rows

docstring_tokens stringlengths 0 76.5k	code_tokens stringlengths 75 1.81M	label_window sequencelengths 4 2.12k	html_url stringlengths 74 116	file_name stringlengths 3 311
log.Debug("IPSET: invalid value %q", it)	<mask> } <mask> <mask> ipsetNames := strings.Split(hostsAndNames[1], ",") <mask> if len(ipsetNames) == 0 { <mask> log.Debug("IPSET: invalid value '%s'", it) <mask> continue <mask> } <mask> bad := false <mask> for i := range ipsetNames { <mask> ipsetNames[i] = strings.TrimSpace(ipsetNames[i]) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("DHCPv4: bad option string: %s", o) </s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("skipping unknown blocked-service '%s'", s) </s> add log.Debug("skipping unknown blocked-service %q", s)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/dnsforward/ipset.go
log.Debug("IPSET: invalid value %q", it)	<mask> break <mask> } <mask> } <mask> if bad { <mask> log.Debug("IPSET: invalid value '%s'", it) <mask> continue <mask> } <mask> <mask> hosts := strings.Split(hostsAndNames[0], ",") <mask> for _, host := range hosts { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("DHCPv4: bad option string: %s", o) </s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s) </s> add log.Debug("Clients: skipping unknown blocked-service %q", s)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/dnsforward/ipset.go
log.Debug("IPSET: invalid value %q", it)	<mask> for _, host := range hosts { <mask> host = strings.TrimSpace(host) <mask> host = strings.ToLower(host) <mask> if len(host) == 0 { <mask> log.Debug("IPSET: invalid value '%s'", it) <mask> continue <mask> } <mask> c.ipsetList[host] = ipsetNames <mask> } <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host) </s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", </s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d",	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/dnsforward/ipset.go
log.Info("IPSET: ipset add: code:%d output:%q", code, out)	<mask> log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err) <mask> continue <mask> } <mask> if code != 0 { <mask> log.Info("IPSET: ipset add: code:%d output:'%s'", code, out) <mask> continue <mask> } <mask> log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name) <mask> } <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) </s> add log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) </s> remove log.Debug("DHCPv4: bad option string: %s", o) </s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err) </s> add err2 = fmt.Errorf("os.Mkdir(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/dnsforward/ipset.go
log.Printf("Couldn't look up replacement host %q: %s", newAddr, err)	<mask> } <mask> <mask> err := s.dnsProxy.Resolve(newContext) <mask> if err != nil { <mask> log.Printf("Couldn't look up replacement host '%s': %s", newAddr, err) <mask> return s.genServerFailure(request) <mask> } <mask> <mask> resp := s.makeResponse(request) <mask> if newContext.Res != nil { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err) </s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err) </s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/dnsforward/msg.go
const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" )	<mask> "go.etcd.io/bbolt" <mask> "golang.org/x/crypto/bcrypt" <mask> ) <mask> <mask> const cookieTTL = 365 * 24 // in hours <mask> const sessionCookieName = "agh_session" <mask> <mask> type session struct { <mask> userName string <mask> expire uint32 // expiration time (in seconds) <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove var ( nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID ) </s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" const resolvedConfData = `[Resolve] </s> add const ( resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" resolvedConfData = `[Resolve] </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/auth.go
a.db, err = bbolt.Open(dbFilename, 0o644, nil)	<mask> a.sessionTTL = sessionTTL <mask> a.sessions = make(map[string]session) <mask> rand.Seed(time.Now().UTC().Unix()) <mask> var err error <mask> a.db, err = bbolt.Open(dbFilename, 0644, nil) <mask> if err != nil { <mask> log.Error("Auth: open DB: %s: %s", dbFilename, err) <mask> if err.Error() == "invalid argument" { <mask> log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations") <mask> } </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair") </s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err) </s> add err2 = fmt.Errorf("zip file Open(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/auth.go
log.Info("Auth: invalid user name or password: name=%q", req.Name)	<mask> } <mask> <mask> cookie := Context.auth.httpCookie(req) <mask> if len(cookie) == 0 { <mask> log.Info("Auth: invalid user name or password: name='%s'", req.Name) <mask> time.Sleep(1 * time.Second) <mask> http.Error(w, "invalid user name or password", http.StatusBadRequest) <mask> return <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err) </s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) </s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart) </s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName) </s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/auth.go
log.Debug("Clients: skipping unknown blocked-service %q", s)	<mask> } <mask> <mask> for _, s := range cy.BlockedServices { <mask> if !dnsfilter.BlockedSvcKnown(s) { <mask> log.Debug("Clients: skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <mask> cli.BlockedServices = append(cli.BlockedServices, s) <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("skipping unknown blocked-service '%s'", s) </s> add log.Debug("skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown tag '%s'", t) </s> add log.Debug("Clients: skipping unknown tag %q", t) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
log.Debug("Clients: skipping unknown tag %q", t)	<mask> } <mask> <mask> for _, t := range cy.Tags { <mask> if !clients.tagKnown(t) { <mask> log.Debug("Clients: skipping unknown tag '%s'", t) <mask> continue <mask> } <mask> cli.Tags = append(cli.Tags, t) <mask> } <mask> sort.Strings(cli.Tags) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s) </s> add log.Debug("Clients: skipping unknown blocked-service %q", s) </s> remove log.Debug("skipping unknown blocked-service '%s'", s) </s> add log.Debug("skipping unknown blocked-service %q", s) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
return fmt.Errorf("id required")	<mask> return fmt.Errorf("invalid Name") <mask> } <mask> <mask> if len(c.IDs) == 0 { <mask> return fmt.Errorf("ID required") <mask> } <mask> <mask> for i, id := range c.IDs { <mask> ip := net.ParseIP(id) <mask> if ip != nil { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("invalid upstream servers: %s", err) </s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> add log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err) </s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP") </s> add return s, fmt.Errorf("dhcpv4: invalid range start IP")	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
return fmt.Errorf("invalid upstream servers: %w", err)	<mask> sort.Strings(c.Tags) <mask> <mask> err := dnsforward.ValidateUpstreams(c.Upstreams) <mask> if err != nil { <mask> return fmt.Errorf("invalid upstream servers: %s", err) <mask> } <mask> <mask> return nil <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err) </s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err) </s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err) </s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list))	<mask> for _, id := range c.IDs { <mask> clients.idIndex[id] = &c <mask> } <mask> <mask> log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) <mask> return true, nil <mask> } <mask> <mask> // Del removes a client <mask> func (clients clientsContainer) Del(name string) bool { </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) </s> add log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) </s> remove return fmt.Errorf("ID required") </s> add return fmt.Errorf("id required") </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s) </s> add log.Debug("Clients: skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown tag '%s'", t) </s> add log.Debug("Clients: skipping unknown tag %q", t) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost))	<mask> Source: source, <mask> } <mask> clients.ipHost[ip] = ch <mask> } <mask> log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost)) <mask> return true, nil <mask> } <mask> <mask> // Remove all entries that match the specified source <mask> func (clients clientsContainer) rmHosts(source clientSource) int { </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> add log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove log.Info("IPSET: ipset add: code:%d output:'%s'", code, out) </s> add log.Info("IPSET: ipset add: code:%d output:%q", code, out) </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", </s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", </s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d",	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/clients.go
const ( resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" resolvedConfData = `[Resolve]	<mask> <mask> return true <mask> } <mask> <mask> const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" <mask> const resolvedConfData = `[Resolve] <mask> DNS=127.0.0.1 <mask> DNSStubListener=no <mask> ` <mask> const resolvConfPath = "/etc/resolv.conf" <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove const cookieTTL = 365 * 24 // in hours const sessionCookieName = "agh_session" </s> add const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" ) </s> remove "github.com/joomcode/errorx" </s> add </s> remove log.Debug("DHCPv6 RA: loop exit") </s> add log.Debug("dhcpv6 ra: loop exit") </s> remove log.Debug("DHCPv4: No lease for %s", mac) </s> add log.Debug("dhcpv4: No lease for %s", mac)	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
)	<mask> DNS=127.0.0.1 <mask> DNSStubListener=no <mask> ` <mask> const resolvConfPath = "/etc/resolv.conf" <mask> <mask> // Deactivate DNSStubListener <mask> func disableDNSStubListener() error { <mask> dir := filepath.Dir(resolvedConfPath) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" const resolvedConfData = `[Resolve] </s> add const ( resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf" resolvedConfData = `[Resolve] </s> remove err := os.MkdirAll(dir, 0755) </s> add err := os.MkdirAll(dir, 0o755) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove const cookieTTL = 365 * 24 // in hours const sessionCookieName = "agh_session" </s> add const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" ) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr) </s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr)	[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
err := os.MkdirAll(dir, 0o755)	<mask> <mask> // Deactivate DNSStubListener <mask> func disableDNSStubListener() error { <mask> dir := filepath.Dir(resolvedConfPath) <mask> err := os.MkdirAll(dir, 0755) <mask> if err != nil { <mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) <mask> } <mask> <mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755) </s> add err := os.MkdirAll(Context.getDataDir(), 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
return fmt.Errorf("os.MkdirAll: %s: %w", dir, err)	<mask> func disableDNSStubListener() error { <mask> dir := filepath.Dir(resolvedConfPath) <mask> err := os.MkdirAll(dir, 0755) <mask> if err != nil { <mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) <mask> } <mask> <mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err := os.MkdirAll(dir, 0755) </s> add err := os.MkdirAll(dir, 0o755) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755) </s> add err := os.MkdirAll(Context.getDataDir(), 0o755) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644)	<mask> if err != nil { <mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) <mask> } <mask> <mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) <mask> } <mask> <mask> _ = os.Rename(resolvConfPath, resolvConfPath+".backup") </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err := os.MkdirAll(dir, 0755) </s> add err := os.MkdirAll(dir, 0o755) </s> remove return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err) </s> add return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err)	<mask> } <mask> <mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) <mask> } <mask> <mask> _ = os.Rename(resolvConfPath, resolvConfPath+".backup") <mask> err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath) <mask> if err != nil { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err) </s> add return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) </s> remove err := os.MkdirAll(dir, 0755) </s> add err := os.MkdirAll(dir, 0o755) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err)	<mask> _ = os.Rename(resolvConfPath, resolvConfPath+".backup") <mask> err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath) <mask> if err != nil { <mask> _ = os.Remove(resolvedConfPath) // remove the file we've just created <mask> return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err) <mask> } <mask> <mask> cmd := exec.Command("systemctl", "reload-or-restart", "systemd-resolved") <mask> log.Tracef("executing %s %v", cmd.Path, cmd.Args) <mask> _, err = cmd.Output() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/control_install.go
	<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> // Called by other modules when configuration is changed <mask> func onConfigModified() { <mask> _ = config.write() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/AdguardTeam/golibs/log" "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return fmt.Errorf("dnsServer.Prepare: %w", err)	<mask> dnsConfig := generateServerConfig() <mask> err = Context.dnsServer.Prepare(&dnsConfig) <mask> if err != nil { <mask> closeDNSServer() <mask> return fmt.Errorf("dnsServer.Prepare: %s", err) <mask> } <mask> <mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients) <mask> Context.whois = initWhois(&Context.clients) <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("filterlist.NewRuleStorage(): %s", err) </s> add return fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return false // software	<mask> ip4 := ip.To4() <mask> if ip4 != nil { <mask> switch ip4[0] { <mask> case 0: <mask> return false //software <mask> case 10: <mask> return false //private network <mask> case 127: <mask> return false //loopback <mask> case 169: </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //private network </s> add return false // private network </s> remove return false //loopback </s> add return false // loopback </s> remove return false //link-local </s> add return false // link-local </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return false // private network	<mask> switch ip4[0] { <mask> case 0: <mask> return false //software <mask> case 10: <mask> return false //private network <mask> case 127: <mask> return false //loopback <mask> case 169: <mask> if ip4[1] == 254 { <mask> return false //link-local </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //loopback </s> add return false // loopback </s> remove return false //software </s> add return false // software </s> remove return false //link-local </s> add return false // link-local </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return false // loopback	<mask> return false //software <mask> case 10: <mask> return false //private network <mask> case 127: <mask> return false //loopback <mask> case 169: <mask> if ip4[1] == 254 { <mask> return false //link-local <mask> } <mask> case 172: </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //private network </s> add return false // private network </s> remove return false //link-local </s> add return false // link-local </s> remove return false //software </s> add return false // software </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return false // link-local	<mask> case 127: <mask> return false //loopback <mask> case 169: <mask> if ip4[1] == 254 { <mask> return false //link-local <mask> } <mask> case 172: <mask> if ip4[1] >= 16 && ip4[1] <= 31 { <mask> return false //private network <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //loopback </s> add return false // loopback </s> remove return false //private network </s> add return false // private network </s> remove return false //private network </s> add return false // private network </s> remove return false //software </s> add return false // software </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return false // private network	<mask> return false //link-local <mask> } <mask> case 172: <mask> if ip4[1] >= 16 && ip4[1] <= 31 { <mask> return false //private network <mask> } <mask> case 192: <mask> if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network <mask> (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation <mask> (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved (ip4[1] == 168) { //private network </s> add if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation </s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //link-local </s> add return false // link-local </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network	<mask> if ip4[1] >= 16 && ip4[1] <= 31 { <mask> return false //private network <mask> } <mask> case 192: <mask> if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network <mask> (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation <mask> (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved <mask> (ip4[1] == 168) { //private network <mask> return false <mask> } <mask> case 198: <mask> if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network <mask> (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation </s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet </s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	<mask> (ip4[1] == 168) { //private network <mask> return false <mask> } <mask> case 198: <mask> if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network <mask> (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation <mask> return false <mask> } <mask> case 203: <mask> if ip4[1] == 0 && ip4[2] == 113 { //documentation <mask> return false </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved (ip4[1] == 168) { //private network </s> add if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network </s> remove return false //private network </s> add return false // private network </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation </s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet </s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
if ip4[1] == 0 && ip4[2] == 113 { // documentation	<mask> (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation <mask> return false <mask> } <mask> case 203: <mask> if ip4[1] == 0 && ip4[2] == 113 { //documentation <mask> return false <mask> } <mask> case 224: <mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast <mask> return false </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved (ip4[1] == 168) { //private network </s> add if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network </s> remove return false //private network </s> add return false // private network </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet </s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
if ip4[1] == 0 && ip4[2] == 0 { // multicast	<mask> if ip4[1] == 0 && ip4[2] == 113 { //documentation <mask> return false <mask> } <mask> case 224: <mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast <mask> return false <mask> } <mask> case 255: <mask> if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet <mask> return false </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet </s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation </s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved (ip4[1] == 168) { //private network </s> add if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet	<mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast <mask> return false <mask> } <mask> case 255: <mask> if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet <mask> return false <mask> } <mask> } <mask> } else { <mask> if ip.IsLoopback() \|\| ip.IsLinkLocalMulticast() \|\| ip.IsLinkLocalUnicast() { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast </s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation </s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //private network </s> add return false // private network </s> remove if (ip4[1] == 0 && ip4[2] == 0) \|\| //private network (ip4[1] == 0 && ip4[2] == 2) \|\| //documentation (ip4[1] == 88 && ip4[2] == 99) \|\| //reserved (ip4[1] == 168) { //private network </s> add if (ip4[1] == 0 && ip4[2] == 0) \|\| // private network (ip4[1] == 0 && ip4[2] == 2) \|\| // documentation (ip4[1] == 88 && ip4[2] == 99) \|\| // reserved (ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| //private network (ip4[1] == 51 \|\| ip4[2] == 100) { //documentation </s> add if (ip4[1] == 18 \|\| ip4[2] == 19) \|\| // private network (ip4[1] == 51 \|\| ip4[2] == 100) { // documentation	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return fmt.Errorf("couldn't start forwarding DNS server: %w", err)	<mask> Context.clients.Start() <mask> <mask> err := Context.dnsServer.Start() <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server") <mask> } <mask> <mask> Context.dnsFilter.Start() <mask> Context.filters.Start() <mask> Context.stats.Start() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server") </s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server") </s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly") </s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return fmt.Errorf("couldn't start forwarding DNS server: %w", err)	<mask> func reconfigureDNSServer() error { <mask> newconfig := generateServerConfig() <mask> err := Context.dnsServer.Reconfigure(&newconfig) <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server") <mask> } <mask> <mask> return nil <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server") </s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server") </s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly") </s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)	<mask> } <mask> <mask> err := Context.dnsServer.Stop() <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server") <mask> } <mask> <mask> closeDNSServer() <mask> return nil <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server") </s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server") </s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly") </s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server") </s> add return fmt.Errorf("could not reconfigure the server: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/dns.go
var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID	<mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> var ( <mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID <mask> ) <mask> <mask> // Filtering - module object <mask> type Filtering struct { <mask> // conf FilteringConf <mask> refreshStatus uint32 // 0:none; 1:in progress </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove const cookieTTL = 365 * 24 // in hours const sessionCookieName = "agh_session" </s> add const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" ) </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/filter.go
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0o755)	<mask> <mask> // Init - initialize the module <mask> func (f Filtering) Init() { <mask> f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.)$`) <mask> _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755) <mask> f.loadFilters(config.Filters) <mask> f.loadFilters(config.WhitelistFilters) <mask> deduplicateFilters() <mask> updateUniqueFilterID(config.Filters) <mask> updateUniqueFilterID(config.WhitelistFilters) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove "github.com/joomcode/errorx" </s> add </s> remove log.Debug("DHCPv6 RA: closing") </s> add log.Debug("dhcpv6 ra: closing") </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/filter.go
return false, fmt.Errorf("open file: %w", err)	<mask> var reader io.Reader <mask> if filepath.IsAbs(filter.URL) { <mask> f, err := os.Open(filter.URL) <mask> if err != nil { <mask> return false, fmt.Errorf("open file: %s", err) <mask> } <mask> defer f.Close() <mask> reader = f <mask> } else { <mask> resp, err := Context.client.Get(filter.URL) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err) </s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err) </s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err) </s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/filter.go
"github.com/AdguardTeam/AdGuardHome/internal/agherr"	<mask> "time" <mask> <mask> "gopkg.in/natefinch/lumberjack.v2" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/update" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/isdelve" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
	<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/update" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> <mask> "github.com/joomcode/errorx" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/isdelve" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
log.Info("Received signal %q", sig)	<mask> signal.Notify(Context.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT) <mask> go func() { <mask> for { <mask> sig := <-Context.appSignalChannel <mask> log.Info("Received signal '%s'", sig) <mask> switch sig { <mask> case syscall.SIGHUP: <mask> Context.clients.Reload() <mask> Context.tls.Reload() <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false //software </s> add return false // software </s> remove log.Info("DHCPv4: listening") </s> add log.Info("dhcpv4: listening") </s> remove return false //private network </s> add return false // private network </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets") </s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove log.Debug("DHCPv4: srv.Serve: %s", err) </s> add log.Debug("dhcpv4: srv.Serve: %s", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
err := os.MkdirAll(Context.getDataDir(), 0o755)	<mask> }() <mask> } <mask> } <mask> <mask> err := os.MkdirAll(Context.getDataDir(), 0755) <mask> if err != nil { <mask> log.Fatalf("Cannot create DNS data dir at %s: %s", Context.getDataDir(), err) <mask> } <mask> <mask> sessFilename := filepath.Join(Context.getDataDir(), "sessions.db") </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err := os.MkdirAll(dir, 0755) </s> add err := os.MkdirAll(dir, 0o755) </s> remove _, err := os.OpenFile(logFilePath, os.O_WRONLY\|os.O_CREATE\|os.O_APPEND, 0644) </s> add _, err := os.OpenFile(logFilePath, os.O_WRONLY\|os.O_CREATE\|os.O_APPEND, 0o644) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server") </s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err) </s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
if // noinspection ALL	<mask> if runtime.GOOS == "windows" { <mask> // On Windows we need to have admin rights to run properly <mask> <mask> admin, _ := util.HaveAdminRights() <mask> if //noinspection ALL <mask> admin \|\| isdelve.Enabled { <mask> // Don't forget that for this to work you need to add "delve" tag explicitly <mask> // https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program <mask> return <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err) </s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst) </s> add return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't listen on :68") </s> add return false, fmt.Errorf("couldn't listen on :68: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
err := ioutil.WriteFile(fn, []byte(data), 0o644)	<mask> <mask> // Write PID to a file <mask> func writePIDFile(fn string) bool { <mask> data := fmt.Sprintf("%d", os.Getpid()) <mask> err := ioutil.WriteFile(fn, []byte(data), 0644) <mask> if err != nil { <mask> log.Error("Couldn't write PID to file %s: %v", fn, err) <mask> return false <mask> } <mask> return true </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain") </s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key") </s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
_, err := os.OpenFile(logFilePath, os.O_WRONLY\|os.O_CREATE\|os.O_APPEND, 0o644)	<mask> if filepath.IsAbs(ls.LogFile) { <mask> logFilePath = ls.LogFile <mask> } <mask> <mask> _, err := os.OpenFile(logFilePath, os.O_WRONLY\|os.O_CREATE\|os.O_APPEND, 0644) <mask> if err != nil { <mask> log.Fatalf("cannot create a log file: %s", err) <mask> } <mask> <mask> log.SetOutput(&lumberjack.Logger{ </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false, fmt.Errorf("open file: %s", err) </s> add return false, fmt.Errorf("open file: %w", err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755) </s> add err := os.MkdirAll(Context.getDataDir(), 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
MaxAge: ls.LogMaxAge, // days	<mask> Compress: ls.LogCompress, // disabled by default <mask> LocalTime: ls.LogLocalTime, <mask> MaxBackups: ls.LogMaxBackups, <mask> MaxSize: ls.LogMaxSize, // megabytes <mask> MaxAge: ls.LogMaxAge, //days <mask> }) <mask> } <mask> } <mask> <mask> func cleanup() { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target) </s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName) </s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return fmt.Errorf("DNS: failed to parse default upstreams: %v", err) </s> add return fmt.Errorf("dns: failed to parse default upstreams: %v", err) </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr) </s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)	<mask> continue <mask> } <mask> return con, err <mask> } <mask> return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) <mask> } <mask> <mask> func getHTTPProxy(req http.Request) (url.URL, error) { <mask> if len(config.ProxyURL) == 0 { <mask> return nil, nil </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces") </s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err) </s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error { var errx error if err == nil { errx = fmt.Errorf(message, args...) } else { errx = errorx.Decorate(err, message, args...) } log.Println(errx.Error()) return errx } </s> add </s> remove return nil, fmt.Errorf("os.Open(): %s", err) </s> add return nil, fmt.Errorf("os.Open(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/home.go
err = fmt.Errorf("port %q is not a number", v)	<mask> var err error <mask> var p int <mask> minPort, maxPort := 0, 1<<16-1 <mask> if p, err = strconv.Atoi(v); err != nil { <mask> err = fmt.Errorf("port '%s' is not a number", v) <mask> } else if p < minPort \|\| p > maxPort { <mask> err = fmt.Errorf("port %d not in range %d - %d", p, minPort, maxPort) <mask> } else { <mask> o.bindPort = p <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("%s is not a valid port: %s", port, err) </s> add return fmt.Errorf("%s is not a valid port: %w", port, err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error { var errx error if err == nil { errx = fmt.Errorf(message, args...) } else { errx = errorx.Decorate(err, message, args...) } log.Println(errx.Error()) return errx } </s> add </s> remove return false, fmt.Errorf("open file: %s", err) </s> add return false, fmt.Errorf("open file: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err) </s> add return s, fmt.Errorf("dhcpv4: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/options.go
	<mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> var tlsWebHandlersRegistered = false <mask> <mask> // TLSMod - TLS module object </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove var ( nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID ) </s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/tls.go
return data, fmt.Errorf("failed to parse new TLS config json: %w", err)	<mask> func unmarshalTLS(r http.Request) (tlsConfigSettings, error) { <mask> data := tlsConfigSettings{} <mask> err := json.NewDecoder(r.Body).Decode(&data) <mask> if err != nil { <mask> return data, errorx.Decorate(err, "Failed to parse new TLS config json") <mask> } <mask> <mask> if data.CertificateChain != "" { <mask> certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain) <mask> if err != nil { </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain") </s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair") </s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key") </s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644) </s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server") </s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/tls.go
return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err)	<mask> <mask> if data.CertificateChain != "" { <mask> certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain) <mask> if err != nil { <mask> return data, errorx.Decorate(err, "Failed to base64-decode certificate chain") <mask> } <mask> data.CertificateChain = string(certPEM) <mask> if data.CertificatePath != "" { <mask> return data, fmt.Errorf("certificate data and file can't be set together") <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key") </s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json") </s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair") </s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644) </s> add err := ioutil.WriteFile(fn, []byte(data), 0o644)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/tls.go
return data, fmt.Errorf("failed to base64-decode private key: %w", err)	<mask> <mask> if data.PrivateKey != "" { <mask> keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey) <mask> if err != nil { <mask> return data, errorx.Decorate(err, "Failed to base64-decode private key") <mask> } <mask> <mask> data.PrivateKey = string(keyPEM) <mask> if data.PrivateKeyPath != "" { <mask> return data, fmt.Errorf("private key data and file can't be set together") </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain") </s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json") </s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair") </s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644) </s> add err := ioutil.WriteFile(fn, []byte(data), 0o644)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/tls.go
return fmt.Errorf("dns configuration is not a map")	<mask> for k, v := range v { <mask> newDNSConfig[fmt.Sprint(k)] = v <mask> } <mask> default: <mask> return fmt.Errorf("DNS configuration is not a map") <mask> } <mask> <mask> // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside <mask> if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok { <mask> newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)} </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err) </s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input) </s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A) </s> add return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it) </s> add log.Debug("IPSET: invalid value %q", it)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/upgrade.go
return "", fmt.Errorf("whois: redirect loop")	<mask> } <mask> <mask> log.Debug("Whois: redirected to %s IP:%s", redir, target) <mask> } <mask> return "", fmt.Errorf("Whois: redirect loop") <mask> } <mask> <mask> // Request WHOIS information <mask> func (w Whois) process(ip string) [][]string { <mask> data := [][]string{} </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644) </s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target) </s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: Sending ICMP Echo to %v", target) </s> add log.Debug("dhcpv4: Sending ICMP Echo to %v", target) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error { var errx error if err == nil { errx = fmt.Errorf(message, args...) } else { errx = errorx.Decorate(err, message, args...) } log.Println(errx.Error()) return errx } </s> add </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac) </s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/home/whois.go
"github.com/AdguardTeam/AdGuardHome/internal/agherr"	<mask> <mask> import ( <mask> "io" <mask> <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> // QLogReader allows reading from multiple query log files in the reverse order. <mask> // <mask> // Please note that this is a stateful object. </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/AdguardTeam/golibs/log" "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove const cookieTTL = 365 * 24 // in hours const sessionCookieName = "agh_session" </s> add const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" ) </s> remove "github.com/joomcode/errorx" </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/querylog/qlog_reader.go
return agherr.Many("Error while closing QLogReader", errs...)	<mask> } <mask> } <mask> <mask> if len(errs) > 0 { <mask> return errorx.DecorateMany("Error while closing QLogReader", errs...) <mask> } <mask> <mask> return nil <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return s, fmt.Errorf("DHCPv4: %s", err) </s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("ID required") </s> add return fmt.Errorf("id required") </s> remove e = ioutil.WriteFile(dst, d, 0644) </s> add e = ioutil.WriteFile(dst, d, 0o644) </s> remove return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) </s> add return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/querylog/qlog_reader.go
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)	<mask> defer resp.Body.Close() <mask> } <mask> <mask> if err != nil { <mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) <mask> } <mask> <mask> body, err := ioutil.ReadAll(resp.Body) <mask> if err != nil { <mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) </s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/check.go
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)	<mask> } <mask> <mask> body, err := ioutil.ReadAll(resp.Body) <mask> if err != nil { <mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) <mask> } <mask> <mask> u.versionJSON = body <mask> u.versionCheckLastTime = time.Now() <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) </s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/check.go
return info, fmt.Errorf("version.json: %w", err)	<mask> info := VersionInfo{} <mask> versionJSON := make(map[string]interface{}) <mask> err := json.Unmarshal(data, &versionJSON) <mask> if err != nil { <mask> return info, fmt.Errorf("version.json: %s", err) <mask> } <mask> <mask> var ok1, ok2, ok3, ok4 bool <mask> info.NewVersion, ok1 = versionJSON["version"].(string) <mask> info.Announcement, ok2 = versionJSON["announcement"].(string) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return false, fmt.Errorf("open file: %s", err) </s> add return false, fmt.Errorf("open file: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err) </s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err) </s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err) </s> add err2 = fmt.Errorf("zip file Open(): %w", err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err) </s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/check.go
return fmt.Errorf(".zip unpack failed: %w", err)	<mask> log.Debug("updater: unpacking the package") <mask> if strings.HasSuffix(pkgNameOnly, ".zip") { <mask> u.unpackedFiles, err = zipFileUnpack(u.packageName, u.updateDir) <mask> if err != nil { <mask> return fmt.Errorf(".zip unpack failed: %s", err) <mask> } <mask> <mask> } else if strings.HasSuffix(pkgNameOnly, ".tar.gz") { <mask> u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir) <mask> if err != nil { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf(".tar.gz unpack failed: %s", err) </s> add return fmt.Errorf(".tar.gz unpack failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf(".tar.gz unpack failed: %w", err)	<mask> <mask> } else if strings.HasSuffix(pkgNameOnly, ".tar.gz") { <mask> u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir) <mask> if err != nil { <mask> return fmt.Errorf(".tar.gz unpack failed: %s", err) <mask> } <mask> <mask> } else { <mask> return fmt.Errorf("unknown package extension") <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf(".zip unpack failed: %s", err) </s> add return fmt.Errorf(".zip unpack failed: %w", err) </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary()) </s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf("copyFile() failed: %w", err)	<mask> func (u Updater) check() error { <mask> log.Debug("updater: checking configuration") <mask> err := copyFile(u.ConfigName, filepath.Join(u.updateDir, "AdGuardHome.yaml")) <mask> if err != nil { <mask> return fmt.Errorf("copyFile() failed: %s", err) <mask> } <mask> cmd := exec.Command(u.updateExeName, "--check-config") <mask> err = cmd.Run() <mask> if err != nil \|\| cmd.ProcessState.ExitCode() != 0 { <mask> return fmt.Errorf("exec.Command(): %s %d", err, cmd.ProcessState.ExitCode()) </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err) </s> add return fmt.Errorf(".zip unpack failed: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err) </s> add return s, fmt.Errorf("dhcpv4: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
_ = os.Mkdir(u.backupDir, 0o755)	<mask> } <mask> <mask> func (u Updater) backup() error { <mask> log.Debug("updater: backing up the current configuration") <mask> _ = os.Mkdir(u.backupDir, 0755) <mask> err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml")) <mask> if err != nil { <mask> return fmt.Errorf("copyFile() failed: %s", err) <mask> } <mask> </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf("copyFile() failed: %w", err)	<mask> log.Debug("updater: backing up the current configuration") <mask> _ = os.Mkdir(u.backupDir, 0755) <mask> err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml")) <mask> if err != nil { <mask> return fmt.Errorf("copyFile() failed: %s", err) <mask> } <mask> <mask> // workdir/README.md -> backup/README.md <mask> err = copySupportingFiles(u.unpackedFiles, u.WorkDir, u.backupDir) <mask> if err != nil { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf("http request failed: %w", err)	<mask> // Download package file and save it to disk <mask> func (u Updater) downloadPackageFile(url string, filename string) error { <mask> resp, err := u.Client.Get(url) <mask> if err != nil { <mask> return fmt.Errorf("HTTP request failed: %s", err) <mask> } <mask> if resp != nil && resp.Body != nil { <mask> defer resp.Body.Close() <mask> } <mask> </s> Pull request: all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) </s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf("ioutil.ReadAll() failed: %w", err)	<mask> <mask> log.Debug("updater: reading HTTP body") <mask> body, err := ioutil.ReadAll(resp.Body) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.ReadAll() failed: %s", err) <mask> } <mask> <mask> _ = os.Mkdir(u.updateDir, 0755) <mask> <mask> log.Debug("updater: saving package to file") </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
_ = os.Mkdir(u.updateDir, 0o755)	<mask> if err != nil { <mask> return fmt.Errorf("ioutil.ReadAll() failed: %s", err) <mask> } <mask> <mask> _ = os.Mkdir(u.updateDir, 0755) <mask> <mask> log.Debug("updater: saving package to file") <mask> err = ioutil.WriteFile(filename, body, 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err) </s> add return fmt.Errorf(".zip unpack failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err = ioutil.WriteFile(filename, body, 0o644)	<mask> <mask> _ = os.Mkdir(u.updateDir, 0755) <mask> <mask> log.Debug("updater: saving package to file") <mask> err = ioutil.WriteFile(filename, body, 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile() failed: %s", err) <mask> } <mask> return nil <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err) </s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err) </s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755) </s> add _ = os.Mkdir(u.backupDir, 0o755)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return fmt.Errorf("ioutil.WriteFile() failed: %w", err)	<mask> <mask> log.Debug("updater: saving package to file") <mask> err = ioutil.WriteFile(filename, body, 0644) <mask> if err != nil { <mask> return fmt.Errorf("ioutil.WriteFile() failed: %s", err) <mask> } <mask> return nil <mask> } <mask> <mask> // Unpack all files from .tar.gz file to the specified directory </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err = ioutil.WriteFile(filename, body, 0644) </s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove _ = os.Mkdir(u.updateDir, 0755) </s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err) </s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err) </s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err) </s> add return fmt.Errorf(".zip unpack failed: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return nil, fmt.Errorf("os.Open(): %w", err)	<mask> // Return the list of files (not directories) written <mask> func tarGzFileUnpack(tarfile, outdir string) ([]string, error) { <mask> f, err := os.Open(tarfile) <mask> if err != nil { <mask> return nil, fmt.Errorf("os.Open(): %s", err) <mask> } <mask> defer func() { <mask> _ = f.Close() <mask> }() <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove return false, fmt.Errorf("open file: %s", err) </s> add return false, fmt.Errorf("open file: %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return nil, fmt.Errorf("gzip.NewReader(): %w", err)	<mask> }() <mask> <mask> gzReader, err := gzip.NewReader(f) <mask> if err != nil { <mask> return nil, fmt.Errorf("gzip.NewReader(): %s", err) <mask> } <mask> <mask> var files []string <mask> var err2 error <mask> tarReader := tar.NewReader(gzReader) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err) </s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err) </s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err) </s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("tarReader.Next(): %w", err)	<mask> err2 = nil <mask> break <mask> } <mask> if err != nil { <mask> err2 = fmt.Errorf("tarReader.Next(): %s", err) <mask> break <mask> } <mask> <mask> _, inputNameOnly := filepath.Split(header.Name) <mask> if len(inputNameOnly) == 0 { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err) </s> add err2 = fmt.Errorf("zip file Open(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))	<mask> <mask> outputName := filepath.Join(outdir, inputNameOnly) <mask> <mask> if header.Typeflag == tar.TypeDir { <mask> err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) <mask> if err != nil && !os.IsExist(err) { <mask> err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) <mask> break <mask> } <mask> log.Debug("updater: created directory %s", outputName) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err) </s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err)	<mask> <mask> if header.Typeflag == tar.TypeDir { <mask> err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) <mask> if err != nil && !os.IsExist(err) { <mask> err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) <mask> break <mask> } <mask> log.Debug("updater: created directory %s", outputName) <mask> continue <mask> } else if header.Typeflag != tar.TypeReg { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) </s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err) </s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) </s> add f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0o777))	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0o777))	<mask> log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag) <mask> continue <mask> } <mask> <mask> f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) <mask> if err != nil { <mask> err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) <mask> break <mask> } <mask> _, err = io.Copy(f, tarReader) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) </s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err)	<mask> } <mask> <mask> f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) <mask> if err != nil { <mask> err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) <mask> break <mask> } <mask> _, err = io.Copy(f, tarReader) <mask> if err != nil { <mask> _ = f.Close() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) </s> add f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("io.Copy(): %w", err)	<mask> } <mask> _, err = io.Copy(f, tarReader) <mask> if err != nil { <mask> _ = f.Close() <mask> err2 = fmt.Errorf("io.Copy(): %s", err) <mask> break <mask> } <mask> err = f.Close() <mask> if err != nil { <mask> err2 = fmt.Errorf("f.Close(): %s", err) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("f.Close(): %w", err)	<mask> break <mask> } <mask> err = f.Close() <mask> if err != nil { <mask> err2 = fmt.Errorf("f.Close(): %s", err) <mask> break <mask> } <mask> <mask> log.Debug("updater: created file %s", outputName) <mask> files = append(files, header.Name) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) </s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
return nil, fmt.Errorf("zip.OpenReader(): %w", err)	<mask> // Return the list of files (not directories) written <mask> func zipFileUnpack(zipfile, outdir string) ([]string, error) { <mask> r, err := zip.OpenReader(zipfile) <mask> if err != nil { <mask> return nil, fmt.Errorf("zip.OpenReader(): %s", err) <mask> } <mask> defer r.Close() <mask> <mask> var files []string <mask> var err2 error </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, fmt.Errorf("os.Open(): %s", err) </s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err) </s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error { var errx error if err == nil { errx = fmt.Errorf(message, args...) } else { errx = errorx.Decorate(err, message, args...) } log.Println(errx.Error()) return errx } </s> add </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) </s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("zip file Open(): %w", err)	<mask> var zr io.ReadCloser <mask> for _, zf := range r.File { <mask> zr, err = zf.Open() <mask> if err != nil { <mask> err2 = fmt.Errorf("zip file Open(): %s", err) <mask> break <mask> } <mask> <mask> fi := zf.FileInfo() <mask> inputNameOnly := fi.Name() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("tarReader.Next(): %s", err) </s> add err2 = fmt.Errorf("tarReader.Next(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) </s> add f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("os.Mkdir(): %w", err)	<mask> <mask> if fi.IsDir() { <mask> err = os.Mkdir(outputName, fi.Mode()) <mask> if err != nil && !os.IsExist(err) { <mask> err2 = fmt.Errorf("os.Mkdir(): %s", err) <mask> break <mask> } <mask> log.Tracef("created directory %s", outputName) <mask> continue <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) </s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("os.OpenFile(): %w", err)	<mask> } <mask> <mask> f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, fi.Mode()) <mask> if err != nil { <mask> err2 = fmt.Errorf("os.OpenFile(): %s", err) <mask> break <mask> } <mask> _, err = io.Copy(f, zr) <mask> if err != nil { <mask> _ = f.Close() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0777)) </s> add f, err := os.OpenFile(outputName, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err) </s> add err2 = fmt.Errorf("os.Mkdir(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("io.Copy(): %w", err)	<mask> } <mask> _, err = io.Copy(f, zr) <mask> if err != nil { <mask> _ = f.Close() <mask> err2 = fmt.Errorf("io.Copy(): %s", err) <mask> break <mask> } <mask> err = f.Close() <mask> if err != nil { <mask> err2 = fmt.Errorf("f.Close(): %s", err) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err) </s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err) </s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
err2 = fmt.Errorf("f.Close(): %w", err)	<mask> break <mask> } <mask> err = f.Close() <mask> if err != nil { <mask> err2 = fmt.Errorf("f.Close(): %s", err) <mask> break <mask> } <mask> <mask> log.Tracef("created file %s", outputName) <mask> files = append(files, inputNameOnly) </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove err2 = fmt.Errorf("f.Close(): %s", err) </s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err) </s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err) </s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777)) </s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
e = ioutil.WriteFile(dst, d, 0o644)	<mask> d, e := ioutil.ReadFile(src) <mask> if e != nil { <mask> return e <mask> } <mask> e = ioutil.WriteFile(dst, d, 0644) <mask> if e != nil { <mask> return e <mask> } <mask> return nil <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove addrs, e := iface.Addrs() if e != nil { return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name) </s> add addrs, err := iface.Addrs() if err != nil { return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) </s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) </s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err) </s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove return fmt.Errorf("wrong upstream format: %s", err) </s> add return fmt.Errorf("wrong upstream format: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/update/updater.go
	<mask> "syscall" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> // NetInterface represents a list of network interfaces <mask> type NetInterface struct { <mask> Name string // Network interface name </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove "github.com/joomcode/errorx" </s> add </s> remove "github.com/joomcode/errorx" </s> add </s> remove const cookieTTL = 365 * 24 // in hours const sessionCookieName = "agh_session" </s> add const ( cookieTTL = 365 * 24 // in hours sessionCookieName = "agh_session" ) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName) </s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err)	[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/util/network_utils.go
return nil, fmt.Errorf("couldn't get list of interfaces: %w", err)	<mask> // invalid interface is a ppp interface or the one that doesn't allow broadcasts <mask> func GetValidNetInterfaces() ([]net.Interface, error) { <mask> ifaces, err := net.Interfaces() <mask> if err != nil { <mask> return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) <mask> } <mask> <mask> netIfaces := []net.Interface{} <mask> <mask> for i := range ifaces { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces") </s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove addrs, e := iface.Addrs() if e != nil { return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name) </s> add addrs, err := iface.Addrs() if err != nil { return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName) </s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err) </s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/util/network_utils.go
return nil, fmt.Errorf("couldn't get interfaces: %w", err)	<mask> // we do not return link-local addresses here <mask> func GetValidNetInterfacesForWeb() ([]NetInterface, error) { <mask> ifaces, err := GetValidNetInterfaces() <mask> if err != nil { <mask> return nil, errorx.Decorate(err, "Couldn't get interfaces") <mask> } <mask> if len(ifaces) == 0 { <mask> return nil, errors.New("couldn't find any legible interface") <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove addrs, e := iface.Addrs() if e != nil { return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name) </s> add addrs, err := iface.Addrs() if err != nil { return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) </s> add return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error { var errx error if err == nil { errx = fmt.Errorf(message, args...) } else { errx = errorx.Decorate(err, message, args...) } log.Println(errx.Error()) return errx } </s> add </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName) </s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/util/network_utils.go
addrs, err := iface.Addrs() if err != nil { return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err)	<mask> <mask> var netInterfaces []NetInterface <mask> <mask> for _, iface := range ifaces { <mask> addrs, e := iface.Addrs() <mask> if e != nil { <mask> return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name) <mask> } <mask> <mask> netIface := NetInterface{ <mask> Name: iface.Name, <mask> MTU: iface.MTU, </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d 02d16a0b4 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <[email protected]> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <[email protected]> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a3 62cc334f4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2 df34ee5c0 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <[email protected]> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240. </s> remove e = ioutil.WriteFile(dst, d, 0644) </s> add e = ioutil.WriteFile(dst, d, 0o644) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err) </s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name) </s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces") </s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac) </s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac)	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693	internal/util/network_utils.go
	<mask> dnsProxy proxy.Proxy // DNS proxy instance <mask> dnsFilter dnsfilter.Dnsfilter // DNS filter instance <mask> queryLog queryLog // Query log instance <mask> stats stats // General server statistics <mask> once sync.Once <mask> <mask> AllowedClients map[string]bool // IP addresses of whitelist clients <mask> DisallowedClients map[string]bool // IP addresses of clients that should be blocked <mask> AllowedClientsIPNet []net.IPNet // CIDRs of whitelist clients <mask> DisallowedClientsIPNet []net.IPNet // CIDRs of clients that should be blocked </s> * dnsforward: move initialization of periodic tasks to NewServer() </s> remove return &Server{ </s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog") err = s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { return errorx.Decorate(err, "failed to load stats from querylog") } // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically s.once.Do(func() { log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() }) </s> add </s> remove if s.queryLog == nil { s.queryLog = newQueryLog(".") } if s.stats == nil { s.stats = newStats() } </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
// Note: this function must be called only once	<mask> // NewServer creates a new instance of the dnsforward.Server <mask> // baseDir is the base directory for query logs <mask> func NewServer(baseDir string) Server { <mask> s := &Server{ <mask> queryLog: newQueryLog(baseDir), <mask> stats: newStats(), <mask> } </s> dnsforward: move initialization of periodic tasks to NewServer() </s> remove return &Server{ </s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog") err = s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { return errorx.Decorate(err, "failed to load stats from querylog") } // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically s.once.Do(func() { log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() }) </s> add </s> remove if s.queryLog == nil { s.queryLog = newQueryLog(".") } if s.stats == nil { s.stats = newStats() } </s> add </s> remove once sync.Once </s> add	[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
s := &Server{	<mask> <mask> // NewServer creates a new instance of the dnsforward.Server <mask> // baseDir is the base directory for query logs <mask> func NewServer(baseDir string) Server { <mask> return &Server{ <mask> queryLog: newQueryLog(baseDir), <mask> stats: newStats(), <mask> } <mask> } <mask> </s> dnsforward: move initialization of periodic tasks to NewServer() </s> remove log.Tracef("Loading stats from querylog") err = s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { return errorx.Decorate(err, "failed to load stats from querylog") } // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically s.once.Do(func() { log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() }) </s> add </s> remove if s.queryLog == nil { s.queryLog = newQueryLog(".") } if s.stats == nil { s.stats = newStats() } </s> add </s> remove once sync.Once </s> add	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
log.Tracef("Loading stats from querylog") err := s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { log.Error("failed to load stats from querylog: %s", err) } log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() return s	<mask> stats: newStats(), <mask> } <mask> } <mask> <mask> // FilteringConfig represents the DNS filtering configuration of AdGuard Home <mask> // The zero FilteringConfig is empty and ready for use. <mask> type FilteringConfig struct { <mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features </s> * dnsforward: move initialization of periodic tasks to NewServer() </s> remove return &Server{ </s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog") err = s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { return errorx.Decorate(err, "failed to load stats from querylog") } // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically s.once.Do(func() { log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() }) </s> add </s> remove once sync.Once </s> add </s> remove if s.queryLog == nil { s.queryLog = newQueryLog(".") } if s.stats == nil { s.stats = newStats() } </s> add	[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
	<mask> if s.dnsFilter != nil \|\| s.dnsProxy != nil { <mask> return errors.New("DNS server is already started") <mask> } <mask> <mask> if s.queryLog == nil { <mask> s.queryLog = newQueryLog(".") <mask> } <mask> <mask> if s.stats == nil { <mask> s.stats = newStats() <mask> } <mask> <mask> err := s.initDNSFilter() <mask> if err != nil { <mask> return err <mask> } <mask> </s> * dnsforward: move initialization of periodic tasks to NewServer() </s> remove log.Tracef("Loading stats from querylog") err = s.queryLog.fillStatsFromQueryLog(s.stats) if err != nil { return errorx.Decorate(err, "failed to load stats from querylog") } // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically s.once.Do(func() { log.Printf("Start DNS server periodic jobs") go s.queryLog.periodicQueryLogRotate() go s.queryLog.runningTop.periodicHourlyTopRotate() go s.stats.statsRotator() }) </s> add </s> remove return &Server{ </s> add s := &Server{ </s> remove once sync.Once </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
	<mask> if err != nil { <mask> return err <mask> } <mask> <mask> log.Tracef("Loading stats from querylog") <mask> err = s.queryLog.fillStatsFromQueryLog(s.stats) <mask> if err != nil { <mask> return errorx.Decorate(err, "failed to load stats from querylog") <mask> } <mask> <mask> // TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically <mask> s.once.Do(func() { <mask> log.Printf("Start DNS server periodic jobs") <mask> go s.queryLog.periodicQueryLogRotate() <mask> go s.queryLog.runningTop.periodicHourlyTopRotate() <mask> go s.stats.statsRotator() <mask> }) <mask> <mask> proxyConfig := proxy.Config{ <mask> UDPListenAddr: s.conf.UDPListenAddr, <mask> TCPListenAddr: s.conf.TCPListenAddr, <mask> Ratelimit: s.conf.Ratelimit, <mask> RatelimitWhitelist: s.conf.RatelimitWhitelist, </s> * dnsforward: move initialization of periodic tasks to NewServer() </s> remove if s.queryLog == nil { s.queryLog = newQueryLog(".") } if s.stats == nil { s.stats = newStats() } </s> add </s> remove return &Server{ </s> add s := &Server{ </s> remove once sync.Once </s> add	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9	dnsforward/dnsforward.go
command: AdGuardHome -w $SNAP_DATA --no-check-update	<mask> publish: false <mask> license: GPL-3.0 <mask> apps: <mask> adguard-home: <mask> args: -w ${SNAP_DATA} --no-check-update <mask> plugs: [ network-bind ] <mask> daemon: simple <mask> <mask> checksum: <mask> name_template: 'checksums.txt' </s> Fix project name, update README </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json </s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt </s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge </s> add # Overwrite the "version" tag when we push to the edge channel DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove # Remove leading "v" from the tag name RELEASE_VERSION=$(TAG_NAME:v%=%) </s> add RELEASE_VERSION=$(TAG_NAME)	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede	.goreleaser.yml
RELEASE_VERSION=$(TAG_NAME)	<mask> <mask> # Version properties <mask> COMMIT=$(shell git rev-parse --short HEAD) <mask> TAG_NAME=$(shell git describe --abbrev=0) <mask> <mask> # Remove leading "v" from the tag name <mask> RELEASE_VERSION=$(TAG_NAME:v%=%) <mask> SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT) <mask> <mask> # Set proper version <mask> VERSION= <mask> ifeq ($(TAG_NAME),$(shell git describe --abbrev=4)) </s> Fix project name, update README </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge </s> add # Overwrite the "version" tag when we push to the edge channel DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt </s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json </s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove args: -w ${SNAP_DATA} --no-check-update </s> add command: AdGuardHome -w $SNAP_DATA --no-check-update	[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede	Makefile
# Overwrite the "version" tag when we push to the edge channel DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge	<mask> ifeq ($(CHANNEL),beta) <mask> DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta <mask> endif <mask> ifeq ($(CHANNEL),edge) <mask> DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge <mask> endif <mask> endif <mask> <mask> # Validate docker build arguments <mask> ifndef DOCKER_IMAGE_NAME </s> Fix project name, update README </s> remove # Remove leading "v" from the tag name RELEASE_VERSION=$(TAG_NAME:v%=%) </s> add RELEASE_VERSION=$(TAG_NAME) </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt </s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json </s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove args: -w ${SNAP_DATA} --no-check-update </s> add command: AdGuardHome -w $SNAP_DATA --no-check-update	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede	Makefile
echo "version=$(version)" > $(DIST_DIR)/version.txt	<mask> @echo Writing version file: $(version) <mask> <mask> # Variables for CI <mask> rm -f $(DIST_DIR)/version.txt <mask> echo "version=v$(version)" > $(DIST_DIR)/version.txt <mask> <mask> # Prepare the version.json file <mask> rm -f $(DIST_DIR)/version.json <mask> echo "{" >> $(DIST_DIR)/version.json <mask> echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json </s> Fix project name, update README </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json </s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove # Remove leading "v" from the tag name RELEASE_VERSION=$(TAG_NAME:v%=%) </s> add RELEASE_VERSION=$(TAG_NAME) </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge </s> add # Overwrite the "version" tag when we push to the edge channel DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove args: -w ${SNAP_DATA} --no-check-update </s> add command: AdGuardHome -w $SNAP_DATA --no-check-update	[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]	https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede	Makefile

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.