From 60d3cfb9621cb9f45a6676da43f7855118efde39 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 13 Mar 2017 23:48:08 +0100 Subject: [PATCH 1/2] - neutrinoyparser: stay compatible with present code in Y_Blocks.txt --- src/nhttpd/tuxboxapi/neutrinoyparser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index 8692f5298..f7ab07684 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -839,8 +839,11 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) { std::string boxvendor(g_info.hw_caps->boxvendor); - std::string boxname(g_info.hw_caps->boxname); + /* stay compatible with present code in Y_Blocks.txt */ + if (boxvendor.compare("Coolstream") == 0) + boxvendor = "CST"; + std::string boxname(g_info.hw_caps->boxname); /* workaround for Neo2 */ if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1)) boxname += " Twin"; From 4bf9c74f59bc2ab327982556f16101857ee6b8d7 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 14 Mar 2017 08:04:26 +0100 Subject: [PATCH 2/2] - .gitignore: add compile - .svnignore: remove --- .gitignore | 1 + .svnignore | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .svnignore diff --git a/.gitignore b/.gitignore index 1443eff76..43dd1585a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ Makefile autom4te.cache *.in aclocal.m4 +compile config.* configure depcomp diff --git a/.svnignore b/.svnignore deleted file mode 100644 index e44c6013e..000000000 --- a/.svnignore +++ /dev/null @@ -1,12 +0,0 @@ -autom4te.cache -*.in -aclocal.m4 -config.* -configure -depcomp -install-sh -*.pc -libtool -ltmain.sh -missing -stamp.h1