mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Software Update with apply the settings (Part2)

Browse Source 
- Use g_settings.update_dir for directory Expert functions


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0463c3044
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part2)

- Use g_settings.update_dir for directory Expert functions


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2012-04-18 20:55:20 +02:00
parent a3dd812987
commit 2111213cf3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/ext_update.cpp
View File

@@ -121,7 +121,7 @@ bool CExtUpdate::ErrorReset(bool modus, const std::string & msg1, const std::str
bool CExtUpdate::writemtdExt(const std::string & filename)
{
imgFilename = "/tmp/" + FILESYSTEM_ENCODING_TO_UTF8_STRING(filename);
imgFilename = (std::string)g_settings.update_dir + "/" + FILESYSTEM_ENCODING_TO_UTF8_STRING(filename);
DBG_TIMER_START()
bool ret = writemtdExt();
DBG_TIMER_STOP("Image bearbeiten")
@@ -446,6 +446,7 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
size_t pos;
while(fgets(buf, sizeof(buf), f1) != NULL) {
std::string line = buf;
// remove comments
line = trim(line);
if (line.find_first_of("#") == 0)
continue;
@@ -476,8 +477,8 @@ bool CExtUpdate::readBackupList(const std::string & dstPath)
std::string dst = dstPath + line;
if ((line.find("*") != std::string::npos) || (line.find("?") != std::string::npos)) {
// Wildcards
WRITE_UPDATE_LOG("\n");
DBG_MSG("Wildcards: %s\n", dst.c_str());
WRITE_UPDATE_LOG("\n");
WRITE_UPDATE_LOG("--------------------\n");
WRITE_UPDATE_LOG("Wildcards: %s\n", dst.c_str());
copyFileList(line, dstPath);