[med-svn] [metabit] 06/06: Adapt patches

Andreas Tille tille at debian.org
Wed May 10 13:11:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository metabit.

commit 66d5c039b62c068172cf94499da78e12a03916a3
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 10 15:10:57 2017 +0200

    Adapt patches
---
 debian/patches/debian_packaged_lefse.patch   | 4 ++--
 debian/patches/safely_detect_metaphlan.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/debian_packaged_lefse.patch b/debian/patches/debian_packaged_lefse.patch
index fab08f2..59a02b8 100644
--- a/debian/patches/debian_packaged_lefse.patch
+++ b/debian/patches/debian_packaged_lefse.patch
@@ -11,7 +11,7 @@
                       "(https://bitbucket.org/nsegata/lefse, "
 --- a/parts.py
 +++ b/parts.py
-@@ -354,14 +354,14 @@ def analyzing(makefile, config, metaphla
+@@ -356,14 +356,14 @@ def analyzing(makefile, config, metaphla
          format_options.update(makefile["Lefse"]["format_input"])
  
          format_input_node = SimpleExecNode(os.path.join(config.lefse_path,
@@ -28,7 +28,7 @@
                                    run_lefse_input,
                                    run_lefse_output,
                                    makefile["Lefse"]["run_lefse"],
-@@ -372,19 +372,19 @@ def analyzing(makefile, config, metaphla
+@@ -374,19 +374,19 @@ def analyzing(makefile, config, metaphla
              if not makefile['Lefse'][step].has_key('--format'):
                  makefile['Lefse'][step]['--format'] = fmt
  
diff --git a/debian/patches/safely_detect_metaphlan.patch b/debian/patches/safely_detect_metaphlan.patch
index 5859cd3..7ceae78 100644
--- a/debian/patches/safely_detect_metaphlan.patch
+++ b/debian/patches/safely_detect_metaphlan.patch
@@ -6,7 +6,7 @@ Description: Since MetaPhLan contains a script metaphlan2_strainer.py it is
 
 --- a/parts.py
 +++ b/parts.py
-@@ -404,11 +404,16 @@ def analyzing(makefile, config, metaphla
+@@ -406,11 +406,16 @@ def analyzing(makefile, config, metaphla
  def _build_bowtie2_nodes(config, input_files_1, input_files_2, output_file,
                           log_file, dependencies, options):
  
@@ -28,7 +28,7 @@ Description: Since MetaPhLan contains a script metaphlan2_strainer.py it is
      reference = prefix
      
      params = Bowtie2Node.customize(input_files_1,
-@@ -435,7 +440,16 @@ def _build_metaphlan_node(config, params
+@@ -437,7 +442,16 @@ def _build_metaphlan_node(config, params
          raise RuntimeError("No input given to metaphlan, you made a mistake somewhere.\n"
                             "have you excluded all the libraries of sample %s ?" %Samplename)
      else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/metabit.git



More information about the debian-med-commit mailing list