bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix various typos and problems.

Browse source
This commit is contained in:
Bradley M. Kuhn 2013-11-30 14:06:14 -05:00
parent 0fd3c3256d
commit 0eaae363eb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
calendar-import.plx
View file

@ -160,10 +160,10 @@ END_ICAL
ELISP_END ELISP_END
; ;
$elispFH->close(); $elispFH->close();
my @emacsOutput = read_from_process($emacsBinary, '--no-windows', my @emacsOutput = read_from_process($config->{emacsBinary}, '--no-windows',
'--batch', '--no-site-file', '-l', $elispFile); '--batch', '--no-site-file', '-l', $elispFile);
DieLog("Emacs process for exporting $privateCalendarFile and " . DieLog("Emacs process for importing $veventFile and " .
"$publicCalendarFile exited with non-zero exit status of " . "$config->{proposedDiary} exited with non-zero exit status of " .
"$? ($!), and output of:\n " . join("\n ", @emacsOutput)) "$? ($!), and output of:\n " . join("\n ", @emacsOutput))
if ($? != 0); if ($? != 0);
my $goodCount =0; my $goodCount =0;
@ -183,14 +183,14 @@ sub HandleProposal ($$$) {
ParseEventAndAddProposed($config, $file, "PROPOSED CHANGE"); ParseEventAndAddProposed($config, $file, "PROPOSED CHANGE");
} elsif ($operation eq 'D') { } elsif ($operation eq 'D') {
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}"); chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
system($emacsSettings->{gitBinary}, 'checkout', $config->{myBranch}); system($config->{gitBinary}, 'checkout', $config->{myBranch});
DieLog("Unable to checkout $config->{myBranch} branch in git") unless ($? == 0); DieLog("Unable to checkout $config->{myBranch} branch in git") unless ($? == 0);
ParseEventAndAddProposed($config, $file, "PROPOSED DELETE"); ParseEventAndAddProposed($config, $file, "PROPOSED DELETE");
# Now, reset back to incoming branch, as GenerateDiaryFromNewEvents assumes that. # Now, reset back to incoming branch, as GenerateDiaryFromNewEvents assumes that.
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}"); chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch}); system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0); DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
} else { } else {
DieLog("Invalid operation of $operation for $file"); DieLog("Invalid operation of $operation for $file");
@ -202,13 +202,13 @@ sub GenerateDiaryFromNewEvents ($) {
chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}"); chdir $config->{gitDir} or DieLog("Unable to change directory to $config->{gitDir}");
system($emacsSettings->{gitBinary}, 'checkout', $config->{incomingBranch}); system($config->{gitBinary}, 'checkout', $config->{incomingBranch});
DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0); DieLog("Unable to checkout $config->{incomingBranch} branch in git") unless ($? == 0);
my @gitDiffSummaryOutput = my @gitDiffSummaryOutput =
read_from_process($emacsSettings->{gitBinary}, 'diff-index', $config->{myBranch}); read_from_process($config->{gitBinary}, 'diff-index', $config->{myBranch});
foreach my $line (@gitDiffSummaryOutput) { foreach my $line (@gitDiffSummaryOutput) {
next if $line ~= /$ENV{USER}/; # Ignore lines that aren't for my calendar. next if $line =~ /$ENV{USER}/; # Ignore lines that aren't for my calendar.
DieLog("odd line in diff-index output: $line") unless DieLog("odd line in diff-index output: $line") unless
$line =~ /(A|D|M)\s+(\S+)$/; $line =~ /(A|D|M)\s+(\S+)$/;
my($operation, $file) = ($1, $2); my($operation, $file) = ($1, $2);