PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure root folders get added in split archives" into twrp2.7

Browse Source
This commit is contained in:
Dees Troy
2013-10-17 11:45:09 -05:00
committed by Gerrit Code Review
parent c01ed9e9e2 ed40077534
commit 0241670122
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twrpTar.cpp
+7 -1
View File
@@ -536,6 +536,12 @@ int twrpTar::Generate_Multiple_Archives(string Path) {
{
unsigned long long folder_size = TWFunc::Get_Folder_Size(FileName, false);
if (Archive_Current_Size + folder_size > MAX_ARCHIVE_SIZE) {
// Add the root folder first
LOGINFO("Adding root folder '%s' before splitting.\n", FileName.c_str());
if (addFile(FileName, true) != 0) {
LOGERR("Error adding folder '%s' to split archive.\n", FileName.c_str());
return -1;
}
LOGINFO("Calling Generate_Multiple_Archives\n");
if (Generate_Multiple_Archives(FileName) < 0)
return -1;
@@ -717,7 +723,7 @@ int twrpTar::tarDirs(bool include_root) {
if (strcmp(de->d_name, ".") != 0) {
subfolder += de->d_name;
} else {
LOGINFO("addFile '%s' including root: %i\n", buf, include_root);
LOGINFO("tarDirs addFile '%s' including root: %i\n", subfolder.c_str(), include_root);
if (addFile(subfolder, include_root) != 0)
return -1;
continue;