X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/485ad5f92eb769b058a8e0c2cc0b60256fbca80b..26f6e599f59a33b435340251d3eed2ff7786b1e3:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 522035eb..718e0888 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -325,19 +325,11 @@ void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
 	FILE *f=fopen(file, "rt");
-	if (!f && strcmp(file, eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()) == 0)
-	{
-		struct stat s;
-		if ( !stat("lamedb", &s) )
-		{
-			if ( !stat(eEnv::resolve("${sysconfdir}/enigma2").c_str(), &s) )
-			{
-				rename("lamedb", eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
-				reloadServicelist();
-			}
-		}
+	if (!f) {
+		eDebug("can't open %s: %m", file);
 		return;
 	}
+
 	char line[256];
 	int version=3;
 	if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)
@@ -623,17 +615,9 @@ void eDVBDB::loadBouquet(const char *path)
 	p+=path;
 	eDebug("loading bouquet... %s", p.c_str());
 	FILE *fp=fopen(p.c_str(), "rt");
-	int entries=0;
 	if (!fp)
 	{
-		struct stat s;
-		if ( !stat(path, &s) )
-		{
-			rename(path, p.c_str() );
-			loadBouquet(path);
-			return;
-		}
-		eDebug("failed to open.");
+		eDebug("can't open %s: %m", p.c_str());
 		if ( strstr(path, "bouquets.tv") )
 		{
 			eDebug("recreate bouquets.tv");
@@ -648,6 +632,7 @@ void eDVBDB::loadBouquet(const char *path)
 		}
 		return;
 	}
+	int entries=0;
 	char line[256];
 	bool read_descr=false;
 	eServiceReference *e = NULL;