diff options
| author | Dees Troy <dees_troy@teamw.in> | 2013-10-17 18:45:09 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@198.50.184.117> | 2013-10-17 18:45:09 +0200 |
| commit | 024167012277325cb3621a22a1b22e08f53bbbdd (patch) | |
| tree | a2e6f75ff1d1ea3e80d29b8840efd6ac4f4c90ee | |
| parent | Merge "Add toolbox_recovery rules" into twrp2.7 (diff) | |
| parent | Ensure root folders get added in split archives (diff) | |
| download | android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar.gz android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar.bz2 android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar.lz android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar.xz android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.tar.zst android_bootable_recovery-024167012277325cb3621a22a1b22e08f53bbbdd.zip | |
| -rw-r--r-- | twrpTar.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/twrpTar.cpp b/twrpTar.cpp index 9c151b939..76c23c868 100644 --- a/twrpTar.cpp +++ b/twrpTar.cpp @@ -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; |