Browse Source

* Merge from Ubuntu:

- Consistently write a blank line between generators, even if a
    non-first generator starts its output with a comment.

r65341
tags/0.49
Colin Watson 10 years ago
parent
commit
2fac18c21e
2 changed files with 15 additions and 1 deletions
  1. +7
    -1
      apt-setup-verify
  2. +8
    -0
      debian/changelog

+ 7
- 1
apt-setup-verify View File

@@ -88,6 +88,7 @@ fi

items=0
gooditems=0
spacer=0

OLDIFS="$IFS"
IFS="$NL"
@@ -99,8 +100,9 @@ for line in $(sed 's/^/:/' $file); do
if echo "$line" | grep -Evq "^(#.*|)[[:space:]]*$"; then
items=$(expr $items + 1)
# Write blank line between generators
if [ $items = 1 ] && [ -f "$saveto" ]; then
if [ $spacer = 0 ] && [ -f "$saveto" ]; then
saveline ""
spacer=1
fi

if [ "$PROGRESS" ]; then
@@ -119,6 +121,10 @@ for line in $(sed 's/^/:/' $file); do
saveline "#$line"
fi
else
if [ "$line" ] && [ $spacer = 0 ] && [ -f "$saveto" ]; then
saveline ""
spacer=1
fi
# Ignore leading empty lines
if [ $items -ne 0 ] || [ "$line" ]; then
saveline "$line"


+ 8
- 0
debian/changelog View File

@@ -1,3 +1,11 @@
apt-setup (1:0.49) UNRELEASED; urgency=low

* Merge from Ubuntu:
- Consistently write a blank line between generators, even if a
non-first generator starts its output with a comment.

-- Colin Watson <cjwatson@debian.org> Mon, 08 Nov 2010 14:07:15 +0000

apt-setup (1:0.48) unstable; urgency=low

* Set LC_ALL=C when calling 'apt-cdrom ident', since we parse its output.


Loading…
Cancel
Save