Skip to content

Fix bug #4 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rda0 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix bug #4 #6

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1fc1fae
Add options --dn, --sort and --sort-prefix
rda0 Dec 20, 2017
9b43379
Remove / from DN in filename
rda0 Dec 21, 2017
1c22e01
Add option --exclude-attrs
rda0 Dec 21, 2017
bbf3558
Reverse DN for correct sorting without --sort
rda0 Dec 21, 2017
8cd2f60
Add option --suffix to hide the DN suffix of the backup
rda0 Dec 21, 2017
55d5d7e
Fix a bug where ARG_MAX is exceeded during git-add
rda0 Dec 21, 2017
24642fd
Update README
rda0 Dec 21, 2017
9246040
Split filelist into chunks for git add, git rm
rda0 Dec 22, 2017
d3d4bb2
Revert new-features changes (move to branch)
rda0 Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions ldap-git-backup.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,15 @@ sub main {
push(@filelist, $filename);
delete($files_before{$filename});
}
$repo->command('add', @filelist) if @filelist;
$repo->command('rm', (keys %files_before)) if %files_before;
my @filelist_rm = keys %files_before;
my $filelist_chunks_ref = LDAP::Utils::get_chunks(\@filelist);
my $filelist_rm_chunks_ref = LDAP::Utils::get_chunks(\@filelist_rm);
foreach my $chunk_ref (@$filelist_chunks_ref) {
$repo->command('add', @$chunk_ref) if $chunk_ref;
}
foreach my $chunk_ref (@$filelist_rm_chunks_ref) {
$repo->command('rm', @$chunk_ref) if $chunk_ref;
}

$repo->command('commit', "--message=$commit_msg", "--date=$commit_date");
$repo->command('gc', '--quiet') if $gc;
Expand Down Expand Up @@ -182,6 +189,26 @@ sub get_value_from_attribute {
return $value;
}

sub get_chunks {
my $filelist_ref = shift;
my $MAXARGS = 1048576;
my @filelist_chunks;
my $len = 0;
my $temp_array_ref;
for my $filename (@$filelist_ref) {
if (($len + length $filename) > $MAXARGS) {
push @filelist_chunks, $temp_array_ref;
$len = 0;
my $new_array_ref;
$temp_array_ref = $new_array_ref;
}
push @$temp_array_ref, $filename;
$len = $len + length $filename;
}
push @filelist_chunks, $temp_array_ref;
return \@filelist_chunks;
}

1;

__END__
Expand Down