[med-svn] [Git][med-team/snakemake][debian-v7] don't try to add to None

[Rebecca N. Palmer (@rnpalmer-guest)]

Rebecca N. Palmer pushed to branch debian-v7 at Debian Med / snakemake


Commits:
a43608c5 by Rebecca N. Palmer at 2024-08-03T11:29:07+01:00
don't try to add to None

(though that doesn't explain the mystery hang)

- - - - -


3 changed files:

- debian/changelog
- debian/patches/cancelscript_debug.patch
- debian/patches/test_piperead.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -4,7 +4,7 @@ snakemake (7.32.4-4) unstable; urgency=medium
   * Skip tests that crash in persistent_dict because
     Debian's pytools is too old (workaround for #1076925).
 
- -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 03 Aug 2024 09:40:51 +0100
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 03 Aug 2024 11:28:52 +0100
 
 snakemake (7.32.4-3) unstable; urgency=medium
 


=====================================
debian/patches/cancelscript_debug.patch
=====================================
@@ -12,8 +12,8 @@ Forwarded: not-needed
  
      if shouldfail:
 +        if shellcmd and "cancel" in shellcmd:
-+            import io
-+            print("buffer size",io.DEFAULT_BUFFER_SIZE,"cancel stdout:",run_stdout,"\nWorkdir:")
++            #import io;print("buffer size",io.DEFAULT_BUFFER_SIZE)
++            print("cancel stdout:",run_stdout,run_stdout2,"\nWorkdir:")
 +            print_tree(tmpdir, exclude=".snakemake/conda")
          assert not success, "expected error on execution"
      else:


=====================================
debian/patches/test_piperead.patch
=====================================
@@ -20,9 +20,9 @@ Forwarded: no
                      process.send_signal(signal.SIGINT)
 -                    time.sleep(2)
 +                    try:
-+                        run_stdout=run_stdout+process.communicate(timeout=2)[0]
++                        run_stdout2,_=process.communicate(timeout=2)
 +                    except TimeoutExpired as e:
-+                        run_stdout=run_stdout+e.stdout
++                        run_stdout2=e.stdout
                      success = process.returncode == 0
          except subprocess.CalledProcessError as e:
              success = False



View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/a43608c5d0f55894e234cdd135434ffa559ccb65

-- 
View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/a43608c5d0f55894e234cdd135434ffa559ccb65
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240803/54f7d079/attachment-0001.htm>