Merge branch 'master' into kilo

1 files changed, 0 insertions, 31 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch b/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
deleted file mode 100644
index b5da15a..0000000
--- a/meta-openstack/recipes-devtools/python/python-lesscpy/0002-Description-Fixup-for-python3.3-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8b9fb203948ca752d848cee951ccde2954abcfe3 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Wed, 30 Oct 2013 23:17:28 -0400
-Subject: [PATCH 2/2] Description: Fixup for python3.3 compat Author: James
- Page <james.page@ubuntu.com> Forwarded:
- https://github.com/robotis/Lesscpy/pull/23
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- lesscpy/scripts/compiler.py |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lesscpy/scripts/compiler.py b/lesscpy/scripts/compiler.py
-index f6b92c7..93dabd3 100644
---- a/lesscpy/scripts/compiler.py
-+++ b/lesscpy/scripts/compiler.py
-@@ -84,8 +84,9 @@ def run():
-     """Run compiler
-     """
-     aparse = argparse.ArgumentParser(description='LessCss Compiler',
--                                     epilog='<< jtm@robot.is @_o >>',
--                                     version=VERSION_STR)
-+                                     epilog='<< jtm@robot.is @_o >>')
-+    aparse.add_argument('-v', '--version', action='version',
-+                        version=VERSION_STR)
-     aparse.add_argument('-I', '--include', action="store", type=str,
-                         help="Included less-files (comma separated)")
-     aparse.add_argument('-V', '--verbose', action="store_true",
--- 
-1.7.10.4
-