Bug#1036182: bullseye-pu: package spyder/4.2.1+dfsg1-3+deb11u2

[Julian Gilbey]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: spyder at packages.debian.org
Control: affects -1 + src:spyder

[ Reason ]
I mistakenly took only one of the four commits that made up the
duplicate-code-on-save bug fix in the deb11u1 update
(https://github.com/spyder-ide/spyder/pull/14759/commits); the result
has turned out to be quite broken ("Run file" no longer works!), but I
didn't realise this when I uploaded +deb11u1.  Of the other three
commits, one was purely cosmetic (whitespace consistency), 1.5 related
to the test suite (which is not included in the bullseye version of
spyder) and the remaining 0.5 of a commit (one line) was critical.

[ Impact ]
The "Run file" functionality is lost in many (most?) cases.

[ Tests ]
There are no automated tests in bullseye, unfortunately (which I why I
didn't discover this at the time).  Manual testing has indicated that
this patch fixes the issue.

[ Risks ]
I don't see any risk in applying this patch.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Apply half of the commit
https://github.com/spyder-ide/spyder/pull/14759/commits/b38e483eb5707db845921345084f4b7de20b6148
which was left out of the original patch.

[ Other info ]
That I'll be more careful next time?!

Best wishes,

   Julian


diff -Nru spyder-4.2.1+dfsg1/debian/changelog spyder-4.2.1+dfsg1/debian/changelog
--- spyder-4.2.1+dfsg1/debian/changelog	2023-01-09 19:58:36.000000000 +0000
+++ spyder-4.2.1+dfsg1/debian/changelog	2023-05-15 21:56:49.000000000 +0100
@@ -1,3 +1,10 @@
+spyder (4.2.1+dfsg1-3+deb11u2) bullseye; urgency=medium
+
+  * Fix broken patch in previous update, with thanks to Baptiste Pellegrin
+    (closes: #1036128)
+
+ -- Julian Gilbey <jdg at debian.org>  Mon, 15 May 2023 21:56:49 +0100
+
 spyder (4.2.1+dfsg1-3+deb11u1) bullseye; urgency=medium
 
   * Fix duplicate-code-on-save bug (closes: #989660)
diff -Nru spyder-4.2.1+dfsg1/debian/patches/Prevent-double-saving-when-running-a-file.patch spyder-4.2.1+dfsg1/debian/patches/Prevent-double-saving-when-running-a-file.patch
--- spyder-4.2.1+dfsg1/debian/patches/Prevent-double-saving-when-running-a-file.patch	2023-01-09 19:58:36.000000000 +0000
+++ spyder-4.2.1+dfsg1/debian/patches/Prevent-double-saving-when-running-a-file.patch	2023-05-15 21:56:49.000000000 +0100
@@ -158,7 +158,7 @@
          if self.get_option('save_all_before_run'):
 -            self.save_all(save_new_files=save_new_files)
 +            all_saved = self.save_all(save_new_files=save_new_files)
-+            if not all_saved:
++            if all_saved is not None and not all_saved:
 +                return
          if self.__last_ec_exec is None:
              return