Commit 02416701 authored by Dees Troy's avatar Dees Troy Committed by Gerrit Code Review
Browse files

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

parents c01ed9e9 ed400775
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment