import delve-1.4.1-1.module+el8.3.0+7840+63dfb1ed

This commit is contained in:
CentOS Sources 2020-11-03 07:05:22 -05:00 committed by Andrew Lukoshko
parent 9cf2dc82a2
commit 6854b49df3
4 changed files with 27 additions and 74 deletions

View File

@ -1 +1 @@
16527e9bd43ee65b1dc9352e7a3dd171da9b5d3e SOURCES/delve-1.3.2.tar.gz 1a4e8f7672c329e493b2fd1f0a4cfe653c537bd7 SOURCES/delve-1.4.1.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/delve-1.3.2.tar.gz SOURCES/delve-1.4.1.tar.gz

View File

@ -1,58 +0,0 @@
diff --git a/pkg/terminal/command_test.go b/pkg/terminal/command_test.go
index 14fb795..350347f 100644
--- a/pkg/terminal/command_test.go
+++ b/pkg/terminal/command_test.go
@@ -278,6 +278,19 @@ func TestIssue411(t *testing.T) {
})
}
+func TestExitStatus(t *testing.T) {
+ withTestTerminal("continuetestprog", t, func(term *FakeTerminal) {
+ term.Exec("continue")
+ status, err := term.handleExit()
+ if err != nil {
+ t.Fatal(err)
+ }
+ if status != 0 {
+ t.Fatalf("incorrect exit status, expected 0, got %d", status)
+ }
+ })
+}
+
func TestScopePrefix(t *testing.T) {
const goroutinesLinePrefix = " Goroutine "
const goroutinesCurLinePrefix = "* Goroutine "
diff --git a/pkg/terminal/terminal.go b/pkg/terminal/terminal.go
index cb59de9..b8ae4d8 100644
--- a/pkg/terminal/terminal.go
+++ b/pkg/terminal/terminal.go
@@ -354,17 +354,20 @@ func (t *Term) handleExit() (int, error) {
s, err := t.client.GetState()
if err != nil {
- if isErrProcessExited(err) && t.client.IsMulticlient() {
- answer, err := yesno(t.line, "Remote process has exited. Would you like to kill the headless instance? [Y/n] ")
- if err != nil {
- return 2, io.EOF
- }
- if answer {
- if err := t.client.Detach(true); err != nil {
- return 1, err
+ if isErrProcessExited(err) {
+ if t.client.IsMulticlient() {
+ answer, err := yesno(t.line, "Remote process has exited. Would you like to kill the headless instance? [Y/n] ")
+ if err != nil {
+ return 2, io.EOF
+ }
+ if answer {
+ if err := t.client.Detach(true); err != nil {
+ return 1, err
+ }
}
+ return 0, err
}
- return 0, err
+ return 0, nil
}
return 1, err
}

View File

@ -1,22 +1,20 @@
Name: delve Name: delve
Version: 1.3.2 Version: 1.4.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: A debugger for the Go programming language Summary: A debugger for the Go programming language
License: MIT License: MIT
URL: https://github.com/go-delve/delve URL: https://github.com/go-delve/delve
Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
ExcludeArch: ppc64le s390x aarch64 i686 armv7hl ExcludeArch: ppc64le s390x aarch64 %{ix86} armv7hl
BuildRequires: compiler(go-compiler) BuildRequires: compiler(go-compiler)
BuildRequires: git BuildRequires: git
BuildRequires: lsof
Provides: dlv = %{version} Provides: dlv = %{version}
Patch1781: ./1781-pkg-terminal-Fix-exit-status.patch
%description %description
Delve is a debugger for the Go programming language. The goal of the project Delve is a debugger for the Go programming language. The goal of the project
is to provide a simple, full featured debugging tool for Go. Delve should be is to provide a simple, full featured debugging tool for Go. Delve should be
@ -27,7 +25,6 @@ much as possible.
%prep %prep
%setup -q %setup -q
%patch1781 -p1
rm -rf go.mod rm -rf go.mod
mv vendor %{_builddir}/src mv vendor %{_builddir}/src
mkdir -p "%{_builddir}/src/github.com/go-delve/" mkdir -p "%{_builddir}/src/github.com/go-delve/"
@ -65,15 +62,29 @@ done
%changelog %changelog
* Mon May 25 2020 Alejandro Sáez <asm@redhat.com> - 1.4.1-1
- Rebase to 1.4.1
- Resolves: rhbz#1821281
- Related: rhbz#1820596
* Fri May 22 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-2
- Change i686 to a better macro
- Related: rhbz#1820596
* Tue Apr 28 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-1
- Rebase to 1.4.0
- Remove Patch1781
- Related: rhbz#1820596
* Thu Jan 16 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-3 * Thu Jan 16 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-3
- Resolves: rhbz#1758612 - Resolves: rhbz#1758612
- Resolves: rhbz#1780554 - Resolves: rhbz#1780554
- Add patch: 1781-pkg-terminal-Fix-exit-status.patch - Add patch: 1781-pkg-terminal-Fix-exit-status.patch
* Wed Jan 15 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-2 * Wed Jan 15 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-2
- Added tests - Added tests
- Related: rhbz#1758612 - Related: rhbz#1758612
* Wed Nov 27 2019 Alejandro Sáez <asm@redhat.com> - 1.3.2-1 * Wed Nov 27 2019 Alejandro Sáez <asm@redhat.com> - 1.3.2-1
- First package for RHEL - First package for RHEL
- Related: rhbz#1758612 - Related: rhbz#1758612