Skip to content

Commit

Permalink
- Update indention level to 4 spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
schaefi committed Aug 1, 2014
1 parent e5ece84 commit 9c67715
Show file tree
Hide file tree
Showing 846 changed files with 176,747 additions and 176,740 deletions.
10 changes: 5 additions & 5 deletions .archive
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ tar -cjf ../kiwi-repo.tar.bz2 system/*repo
cd ..
touch -c -r kiwi/kiwi.pl kiwi
tar -cjf kiwi.tar.bz2 \
--exclude=system/*repo \
--exclude=rpm \
--exclude=doc \
--exclude=.git \
kiwi/
--exclude=system/*repo \
--exclude=rpm \
--exclude=doc \
--exclude=.git \
kiwi/

mv kiwi.tar.bz2 kiwi/
mv kiwi-repo.tar.bz2 kiwi/
Expand Down
6 changes: 3 additions & 3 deletions .catalog.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<group id="kiwi">
<system systemId="/usr/share/kiwi/xsl/master.xsl" uri="xsl/master.xsl"/>
</group>
<group id="kiwi">
<system systemId="/usr/share/kiwi/xsl/master.xsl" uri="xsl/master.xsl"/>
</group>
</catalog>
84 changes: 42 additions & 42 deletions .changelog
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,49 @@ my $indent;
$ENV{LC_ALL} = "C";

while (my $line = <>) {
if ($ignore < 2) {
$ignore = 0;
}
if ($line =~ /^commit/) {
$ignore = 1;
}
if ($line =~ /^Merge|Conflicts/) {
$ignore = 2;
}
if (($ignore < 2) && ($line =~ /^Author: .*<(.*)@.*>/)) {
$name = $1;
$ignore = 1;
}
next if ($ignore);

if ($line =~ /^Date: (.*) [\+-].*/) {
if (@out) {
my $outstr = join (" ",@out);
if ($outstr !~ /added changelog|Merge branch|git-svn-id:/i) {
print @out;
}
undef @out;
if ($ignore < 2) {
$ignore = 0;
}
if ($line =~ /^commit/) {
$ignore = 1;
}
if ($line =~ /^Merge|Conflicts/) {
$ignore = 2;
}
my $date = qx /date --date="$1"/; chomp $date;
push @out, "------------------------------------------------------------------\n";
push @out, "$date - $name\@suse.de\n";
undef $date;
$ignore = 0;
$count = 0;
} else {
$line =~ s/^ +//;
if ($line =~ /^-/) {
push @out, $line;
$indent = $indent_l1;
} elsif (($line =~ /^[a-zA-Z]/) && ($count == 1)) {
push @out, "- ".$line;
$indent = $indent_l1;
} elsif ($line =~ /^[\*,\+]/) {
push @out, $indent_l1.$line;
$indent = $indent_l2;
if (($ignore < 2) && ($line =~ /^Author: .*<(.*)@.*>/)) {
$name = $1;
$ignore = 1;
}
next if ($ignore);

if ($line =~ /^Date: (.*) [\+-].*/) {
if (@out) {
my $outstr = join (" ",@out);
if ($outstr !~ /added changelog|Merge branch|git-svn-id:/i) {
print @out;
}
undef @out;
}
my $date = qx /date --date="$1"/; chomp $date;
push @out, "------------------------------------------------------------------\n";
push @out, "$date - $name\@suse.de\n";
undef $date;
$ignore = 0;
$count = 0;
} else {
push @out, $indent.$line;
$line =~ s/^ +//;
if ($line =~ /^-/) {
push @out, $line;
$indent = $indent_l1;
} elsif (($line =~ /^[a-zA-Z]/) && ($count == 1)) {
push @out, "- ".$line;
$indent = $indent_l1;
} elsif ($line =~ /^[\*,\+]/) {
push @out, $indent_l1.$line;
$indent = $indent_l2;
} else {
push @out, $indent.$line;
}
$count++;
}
$count++;
}
}
Loading

0 comments on commit 9c67715

Please sign in to comment.