diff options
Diffstat (limited to 'subcmds')
| -rw-r--r-- | subcmds/sync.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index fe63b484..082b254f 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -60,7 +60,7 @@ from error import RepoChangedException, GitError, ManifestParseError | |||
| 60 | import platform_utils | 60 | import platform_utils |
| 61 | from project import SyncBuffer | 61 | from project import SyncBuffer |
| 62 | from progress import Progress | 62 | from progress import Progress |
| 63 | from repo_trace import IsTrace, Trace | 63 | from repo_trace import Trace |
| 64 | import ssh | 64 | import ssh |
| 65 | from wrapper import Wrapper | 65 | from wrapper import Wrapper |
| 66 | from manifest_xml import GitcManifest | 66 | from manifest_xml import GitcManifest |
| @@ -739,7 +739,6 @@ later is required to fix a server side protocol bug. | |||
| 739 | bak_dir = os.path.join(objdir, '.repo', 'pack.bak') | 739 | bak_dir = os.path.join(objdir, '.repo', 'pack.bak') |
| 740 | if not _BACKUP_OBJECTS or not platform_utils.isdir(pack_dir): | 740 | if not _BACKUP_OBJECTS or not platform_utils.isdir(pack_dir): |
| 741 | return | 741 | return |
| 742 | saved = [] | ||
| 743 | files = set(platform_utils.listdir(pack_dir)) | 742 | files = set(platform_utils.listdir(pack_dir)) |
| 744 | to_backup = [] | 743 | to_backup = [] |
| 745 | for f in files: | 744 | for f in files: |
| @@ -751,12 +750,10 @@ later is required to fix a server side protocol bug. | |||
| 751 | for fname in to_backup: | 750 | for fname in to_backup: |
| 752 | bak_fname = os.path.join(bak_dir, fname) | 751 | bak_fname = os.path.join(bak_dir, fname) |
| 753 | if not os.path.exists(bak_fname): | 752 | if not os.path.exists(bak_fname): |
| 754 | saved.append(fname) | 753 | with Trace('%s saved %s', bare_git._project.name, fname): |
| 755 | # Use a tmp file so that we are sure of a complete copy. | 754 | # Use a tmp file so that we are sure of a complete copy. |
| 756 | shutil.copy(os.path.join(pack_dir, fname), bak_fname + '.tmp') | 755 | shutil.copy(os.path.join(pack_dir, fname), bak_fname + '.tmp') |
| 757 | shutil.move(bak_fname + '.tmp', bak_fname) | 756 | shutil.move(bak_fname + '.tmp', bak_fname) |
| 758 | if saved: | ||
| 759 | Trace('%s saved %s', bare_git._project.name, ' '.join(saved)) | ||
| 760 | 757 | ||
| 761 | def _GCProjects(self, projects, opt, err_event): | 758 | def _GCProjects(self, projects, opt, err_event): |
| 762 | pm = Progress('Garbage collecting', len(projects), delay=False, quiet=opt.quiet) | 759 | pm = Progress('Garbage collecting', len(projects), delay=False, quiet=opt.quiet) |
