diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/util/clean-depend.pl | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/util/clean-depend.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/util/clean-depend.pl b/src/lib/libcrypto/util/clean-depend.pl index 2b2bdb4048..d3525b0ed0 100644 --- a/src/lib/libcrypto/util/clean-depend.pl +++ b/src/lib/libcrypto/util/clean-depend.pl | |||
| @@ -42,6 +42,7 @@ foreach $file (sort keys %files) { | |||
| 42 | my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}}; | 42 | my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}}; |
| 43 | 43 | ||
| 44 | foreach $dep (sort @deps) { | 44 | foreach $dep (sort @deps) { |
| 45 | $dep=~s/^\.\///; | ||
| 45 | next if $prevdep eq $dep; # to exterminate duplicates... | 46 | next if $prevdep eq $dep; # to exterminate duplicates... |
| 46 | $prevdep = $dep; | 47 | $prevdep = $dep; |
| 47 | $len=0 if $len+length($dep)+1 >= 80; | 48 | $len=0 if $len+length($dep)+1 >= 80; |