Refreshed fix-python-m-coverage.patch

Change-Id: I38c4a14aba88ecc43379f15ea69b2abc369f46e8

Rewritten-From: 6441e8cc728d3a31628d0b6d1f66e98dce6166df

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 370690af094cc6cb0ee39d23031fa33c20394a29..e2388942abe761973e58e758583b3dd9ca2e8612 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ horizon (2014.1~rc1-1) experimental; urgency=low
 
   * New upstream release.
   * Reviewed (build-)depends for this release.
+  * Refreshed fix-python-m-coverage.patch
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 02 Apr 2014 18:24:26 +0800
 

diff --git a/trusty/debian/patches/fix-python-m-coverage.patch b/trusty/debian/patches/fix-python-m-coverage.patch
index a83434798e64c6bbd537dbce28ea38b971837c26..fb4db50a3c6782acdc67d0d27db00a9dd3896af2 100644 (file)
--- a/trusty/debian/patches/fix-python-m-coverage.patch
+++ b/trusty/debian/patches/fix-python-m-coverage.patch
@@ -4,9 +4,11 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
 Last-Update: 2014-03-14
 
---- horizon-2014.1~b3.orig/run_tests.sh
-+++ horizon-2014.1~b3/run_tests.sh
-@@ -315,8 +315,8 @@ function run_tests_all {
+Index: horizon/run_tests.sh
+===================================================================
+--- horizon.orig/run_tests.sh  2014-04-02 18:21:26.000000000 +0800
++++ horizon/run_tests.sh       2014-04-02 18:29:17.000000000 +0800
+@@ -319,8 +319,8 @@
      export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
    fi
    if [ $with_coverage -eq 1 ]; then
@@ -17,7 +19,7 @@ Last-Update: 2014-03-14
    fi
    ${command_wrapper} ${coverage_run} $root/manage.py test horizon --settings=horizon.test.settings $testopts
    # get results of the Horizon tests
-@@ -333,9 +333,9 @@ function run_tests_all {
+@@ -337,9 +337,9 @@
  
    if [ $with_coverage -eq 1 ]; then
      echo "Generating coverage reports"