Allow empty sections to be used in mrconfig files.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index b5d5c118b8d4ef9c9c470196e64f5214c330a3c4..7224a04ed2e170626436a89c9056e34c158ab0ff 100755 (executable)
--- a/mr
+++ b/mr
@@ -791,7 +791,9 @@ sub repodir {
        my $repo=shift;
        my $topdir=$repo->{topdir};
        my $subdir=$repo->{subdir};
        my $repo=shift;
        my $topdir=$repo->{topdir};
        my $subdir=$repo->{subdir};

-       return abs_path(($subdir =~/^\//) ? $subdir : $topdir.$subdir);
+       my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+       $ret=~s/\/\.$//;
+       return $ret;

 }
 
 # figure out which repos to act on
 }
 
 # figure out which repos to act on


@@ -1035,6 +1037,12 @@ sub loadconfig {
                                }
                        }
                        $section=expandenv($section) if $trusted;
                                }
                        }
                        $section=expandenv($section) if $trusted;

+                       if ($section ne 'ALIAS' &&
+                           ! exists $config{$dir}{$section} &&
+                           exists $config{$dir}{DEFAULT}) {
+                               # copy in defaults
+                               $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} };
+                       }

                }
                elsif (/^(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;
                }
                elsif (/^(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;


@@ -1071,12 +1079,6 @@ sub loadconfig {
                        if (! defined $section) {
                                die "$f line $.: parameter ($parameter) not in section\n";
                        }
                        if (! defined $section) {
                                die "$f line $.: parameter ($parameter) not in section\n";
                        }

-                       if ($section ne 'ALIAS' &&
-                           ! exists $config{$dir}{$section} &&
-                           exists $config{$dir}{DEFAULT}) {
-                               # copy in defaults
-                               $config{$dir}{$section}={ %{$config{$dir}{DEFAULT}} };
-                       }

                        if ($section eq 'ALIAS') {
                                $alias{$parameter}=$value;
                        }
                        if ($section eq 'ALIAS') {
                                $alias{$parameter}=$value;
                        }


@@ -1357,7 +1359,7 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();

-       my @curlargs = ("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig);
+       my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);

        push(@curlargs, "-k") if $insecure;
        my $curlstatus = system(@curlargs);
        die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
        push(@curlargs, "-k") if $insecure;
        my $curlstatus = system(@curlargs);
        die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;