Olemis Lang avatar Olemis Lang committed 73514a6

BH Multiproduct #115 : Removing trailing whitespaces from parent config paths ... (errors=2)

Ran 27 tests in 2.462s

Comments (0)

Files changed (1)

t115/t115_r1427886_product_config.diff

 # HG changeset patch
-# Parent beed3d3bb95c8439bd31a7a68840c036e5f1a29c
+# Parent 9fce1096e2a7545deea716178b420928a32358c6
 BH Multiproduct #115 : Product-specific settings
 
-diff -r beed3d3bb95c bloodhound_dashboard/bhdashboard/model.py
---- a/bloodhound_dashboard/bhdashboard/model.py	Mon Jan 07 13:44:27 2013 -0500
-+++ b/bloodhound_dashboard/bhdashboard/model.py	Tue Jan 08 00:27:16 2013 -0500
+diff -r 9fce1096e2a7 bloodhound_dashboard/bhdashboard/model.py
+--- a/bloodhound_dashboard/bhdashboard/model.py	Tue Jan 08 00:31:17 2013 -0500
++++ b/bloodhound_dashboard/bhdashboard/model.py	Tue Jan 08 00:50:02 2013 -0500
 @@ -117,8 +117,9 @@
                  self._update_from_row(row)
                  break
              # we won't know which class we need until called
              model = cls.__new__(cls)
              data = dict([(fields[i], row[i]) for i in range(len(fields))])
-diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/api.py
---- a/bloodhound_multiproduct/multiproduct/api.py	Mon Jan 07 13:44:27 2013 -0500
-+++ b/bloodhound_multiproduct/multiproduct/api.py	Tue Jan 08 00:27:16 2013 -0500
+diff -r 9fce1096e2a7 bloodhound_multiproduct/multiproduct/api.py
+--- a/bloodhound_multiproduct/multiproduct/api.py	Tue Jan 08 00:31:17 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/api.py	Tue Jan 08 00:50:02 2013 -0500
 @@ -31,9 +31,9 @@
  from trac.util.translation import _, N_
  from trac.web.chrome import ITemplateProvider
      del modelcls
      
      def get_version(self):
-diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/config.py
+diff -r 9fce1096e2a7 bloodhound_multiproduct/multiproduct/config.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/bloodhound_multiproduct/multiproduct/config.py	Tue Jan 08 00:27:16 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/config.py	Tue Jan 08 00:50:02 2013 -0500
 @@ -0,0 +1,311 @@
 +
 +#  Licensed to the Apache Software Foundation (ASF) under one
 +        from trac import config
 +        self.parents = (parents or [])
 +        for filename in self.get('inherit', 'file').split(','):
-+            filename = Section._normalize_path(filename, self.env)
++            filename = Section._normalize_path(filename.strip(), self.env)
 +            self.parents.append(config.Configuration(filename))
 +
 +class Section(Section):
 +            path = os.path.join(env.path, 'conf', path)
 +        return os.path.normcase(os.path.realpath(path))
 +
-diff -r beed3d3bb95c bloodhound_multiproduct/multiproduct/model.py
---- a/bloodhound_multiproduct/multiproduct/model.py	Mon Jan 07 13:44:27 2013 -0500
-+++ b/bloodhound_multiproduct/multiproduct/model.py	Tue Jan 08 00:27:16 2013 -0500
+diff -r 9fce1096e2a7 bloodhound_multiproduct/multiproduct/model.py
+--- a/bloodhound_multiproduct/multiproduct/model.py	Tue Jan 08 00:31:17 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/model.py	Tue Jan 08 00:50:02 2013 -0500
 @@ -18,6 +18,7 @@
  
  """Models to support multi-product"""
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.