On Sat, May 28, 2022 at 08:45:28PM +0100, Adam D. Barratt wrote:
> Control: tags -1 + confirmed
>
> On Wed, 2022-04-13 at 19:46 +0100, Julian Gilbey wrote:
> > The bug is reported in https://bugs.debian.org/989660
> > I didn't spot it at the time because I'm only an uploader, not the
> > named maintainer, and had forgotten to check the BTS. Sorry about
> > that. The bug was present in version 4.2.1 of Spyder, but was fixed
> > by upstream in version 4.2.2.
> >
>
> The metadata for that bug indicates that it still affects the version
> of spyder present in unstable and testing. Given the above description,
> I'm assuming that this is simply an oversight in the metadata. Assuming
> that's correct, please feel free to go ahead with the upload, but
> please do add an appropriate fixed version to #989660 so that the BTS
> knows the correct state.
Dear Adam,
Oh gosh, I've let this slip so long.
I've just closed the BTS bug #989660 with an appropriate version.
> FWIW, I think the patch actually ends up being relatively simple if one
> excludes the changes in indentation that result; a version with the
> equivalent of "diff -w" applied would potentially be helpful to
> confirm.
You are spot on here! Here's the -w version for the files touched
under spyder (i.e., excluding the debian/* files):
diff -Nrub spyder-4.2.1+dfsg1-3/spyder/plugins/editor/plugin.py
spyder-4.2.1+dfsg1-3+deb11u1/spyder/plugins/editor/plugin.py
--- spyder-4.2.1+dfsg1-3/spyder/plugins/editor/plugin.py 2021-02-05
12:29:00.000000000 +0000
+++ spyder-4.2.1+dfsg1-3+deb11u1/spyder/plugins/editor/plugin.py
2023-01-06 07:36:24.000000000 +0000
@@ -2567,7 +2567,7 @@
def run_file(self, debug=False):
"""Run script inside current interpreter or in a new one"""
editorstack = self.get_current_editorstack()
- if editorstack.save(save_new_files=False):
+
editor = self.get_current_editor()
fname = osp.abspath(self.get_current_filename())
@@ -2650,7 +2650,9 @@
def re_run_file(self, save_new_files=True):
"""Re-run last script"""
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:
+ return
if self.__last_ec_exec is None:
return
(fname, wdir, args, interact, debug,
diff -Nrub spyder-4.2.1+dfsg1-3/spyder/plugins/editor/widgets/editor.py
spyder-4.2.1+dfsg1-3+deb11u1/spyder/plugins/editor/widgets/editor.py
--- spyder-4.2.1+dfsg1-3/spyder/plugins/editor/widgets/editor.py
2021-02-05 12:29:00.000000000 +0000
+++ spyder-4.2.1+dfsg1-3+deb11u1/spyder/plugins/editor/widgets/editor.py
2023-01-06 07:36:24.000000000 +0000
@@ -2265,9 +2265,11 @@
Iterate through self.data and call save() on any modified files.
"""
+ all_saved = True
for index in range(self.get_stack_count()):
if self.data[index].editor.document().isModified():
- self.save(index, save_new_files=save_new_files)
+ all_saved &= self.save(index, save_new_files=save_new_files)
+ return all_saved
#------ Update UI
def start_stop_analysis_timer(self):
I've just updated the debian/changelog timestamp so it is not
misleading, otherwise everything remains the same as when I originally
sent a debdiff. I'm now uploading this version to bullseye.
Thanks for your help!
Julian
