From 78e807a94d1ade78e59fbfb67c1d2dac5bdc9c8b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Oct 2007 02:56:13 -0400 Subject: [PATCH 01/16] releasing version 0.2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c6a9bcc..38e5f18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -mr (0.2) UNRELEASED; urgency=low +mr (0.2) unstable; urgency=low * Fix line number display for config file parse errors. * Fix a bug in inheritance of default settings in chained .mrconfig files. * Add the -s options. - -- Joey Hess Tue, 16 Oct 2007 02:13:31 -0400 + -- Joey Hess Tue, 16 Oct 2007 02:39:08 -0400 mr (0.1) unstable; urgency=low -- 2.39.2 From 194bb5040919fed9dcd46deb355e9d366339e7f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Oct 2007 14:29:28 -0400 Subject: [PATCH 02/16] update --- TODO | 6 ++++-- debian/changelog | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index 2ed4be3..69fab7d 100644 --- a/TODO +++ b/TODO @@ -10,7 +10,9 @@ [src/bar] renamedfrom = src/foo/bar - (Support multple renames of a single repo?) + (How to support multple renames of a single repo? List multiple + renamedfrom dirs?) * a way to detect repos in a tree that are not registered, and warn - about or even auto-register them + about or even auto-register them. (svn externals make this quite + difficult!) diff --git a/debian/changelog b/debian/changelog index 38e5f18..a4a0174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ mr (0.2) unstable; urgency=low * Fix line number display for config file parse errors. * Fix a bug in inheritance of default settings in chained .mrconfig files. - * Add the -s options. + * Add the -s option. -- Joey Hess Tue, 16 Oct 2007 02:39:08 -0400 -- 2.39.2 From 64c0bf1b271f950b0dab844848aeda0c124e23f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Oct 2007 14:30:57 -0400 Subject: [PATCH 03/16] simplify, not going to track my own file for this as it's increasingly not a good example :-) --- mrconfig | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/mrconfig b/mrconfig index d93bac2..ab8cb14 100644 --- a/mrconfig +++ b/mrconfig @@ -77,22 +77,6 @@ update = echo "skipping cvs update (too slow)" status = echo "skipping cvs status (too ugly)" skip = ! mylaptop || ! wantsrc -[src/packages/uqm] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm -skip = ! wantsrc - -[src/packages/uqm-content] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-content -skip = ! wantsrc - -[src/packages/uqm-voice] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-voice -skip = ! wantsrc - -[src/packages/uqm-music] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-music -skip = ! wantsrc - # My home directory, which I keep in svn. [] checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey @@ -102,11 +86,3 @@ update = svn update && svnfix [mail] checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail skip = ! private - -[doc] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/doc -skip = ! private - -[lib/text] -checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/text -skip = ! wantmedia -- 2.39.2 From e5dd85021198561461d46c50b41a927ef9e6050a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Oct 2007 19:51:42 -0400 Subject: [PATCH 04/16] * Add a check to make sure the expected directory exists after checkout. --- debian/changelog | 6 ++++++ mr | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index a4a0174..b7c4b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mr (0.3) UNRELEASED; urgency=low + + * Add a check to make sure the expected directory exists after checkout. + + -- Joey Hess Tue, 16 Oct 2007 19:51:14 -0400 + mr (0.2) unstable; urgency=low * Fix line number display for config file parse errors. diff --git a/mr b/mr index 4e3d738..310f99a 100755 --- a/mr +++ b/mr @@ -462,6 +462,12 @@ sub action { #{{{ } } else { + if ($action eq 'checkout' && ! -d $dir) { + print STDERR "mr $action: $dir missing after checkout\n";; + push @failed, $dir; + return; + } + push @ok, $dir; } -- 2.39.2 From 8a871c8ffe86c8c415e360f28e1a38be610438ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Oct 2007 21:17:14 -0400 Subject: [PATCH 05/16] typo --- mrconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrconfig b/mrconfig index ab8cb14..59ab018 100644 --- a/mrconfig +++ b/mrconfig @@ -8,7 +8,7 @@ gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi # Tests used in the skips below. # - wantsrc checks whether I probably want a full source checkout (quite # large) -# - wantmedia checks whethere I probably want various large media files +# - wantmedia checks whether I probably want various large media files # here. # - private are hosts I trust private data to # - mylaptop only succeeds if it's on my main development laptop, which -- 2.39.2 From b33e29ce2ef806666f8bf7bee68abd97aa191076 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Oct 2007 12:46:09 -0400 Subject: [PATCH 06/16] * mr register will now write to whatever config file is specified with -c --- debian/changelog | 3 ++- mr | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7c4b1a..1eee9f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mr (0.3) UNRELEASED; urgency=low * Add a check to make sure the expected directory exists after checkout. + * mr register will now write to whatever config file is specified with -c - -- Joey Hess Tue, 16 Oct 2007 19:51:14 -0400 + -- Joey Hess Wed, 17 Oct 2007 12:45:28 -0400 mr (0.2) unstable; urgency=low diff --git a/mr b/mr index 310f99a..50564f7 100755 --- a/mr +++ b/mr @@ -188,7 +188,7 @@ environment, where any additional parameters you pass are available in directory, since the repository isn't checked out yet. All other commands are run inside the repository, though not necessarily at the top of it. The "MR_REPO" environment variable is set to the path to the top of the -repository. +repository, and "MR_CONFIG" is set to the topmost .mrconfig file used. A few parameters have special meanings: @@ -247,8 +247,8 @@ use strict; use Getopt::Long; use Cwd qw(getcwd abs_path); +$ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig"; my $directory=getcwd(); -my $config="$ENV{HOME}/.mrconfig"; my $verbose=0; my $stats=0; my %config; @@ -258,7 +258,7 @@ my %alias; Getopt::Long::Configure("no_permute"); my $result=GetOptions( "d|directory=s" => sub { $directory=abs_path($_[1]) }, - "c|config=s" => \$config, + "c|config=s" => \$ENV{MR_CONFIG}, "v|verbose" => \$verbose, "s|stats" => \$stats, ); @@ -269,7 +269,7 @@ if (! $result || @ARGV < 1) { } loadconfig(\*DATA); -loadconfig($config); +loadconfig($ENV{MR_CONFIG}); #use Data::Dumper; #print Dumper(\%config); @@ -309,7 +309,7 @@ elsif ($action eq 'config') { my $section=shift; if ($section=~/^\//) { # try to convert to a path relative to $config's dir - my ($dir)=$config=~/^(.*\/)[^\/]+$/; + my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/; if ($section=~/^\Q$dir\E(.*)/) { $section=$1; } @@ -333,7 +333,7 @@ elsif ($action eq 'config') { } } } - modifyconfig($config, $section, %changefields) if %changefields; + modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields; exit 0; } elsif ($action eq 'register') { @@ -811,21 +811,21 @@ register = error "cannot determine svn url" fi echo "Registering svn url: $url" - mr config "$(pwd)" checkout="svn co $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir" elif [ -d .git ]; then url=$(LANG=C git-config --get remote.origin.url) if [ -z "$url" ]; then error "cannot determine git url" fi echo "Registering git url: $url" - mr config "$(pwd)" checkout="git clone $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir" elif [ -d .bzr ]; then url=$(cat .bzr/branch/parent) if [ -z "$url" ]; then error "cannot determine bzr url" fi echo "Registering bzr url: $url" - mr config "$(pwd)" checkout="bzr clone $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir" else error "unable to register this repo type" fi -- 2.39.2 From 9a651e120c51251ab679934557923114ac141ed2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Oct 2007 12:47:17 -0400 Subject: [PATCH 07/16] * Typo files from madduck. --- debian/changelog | 1 + mr | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1eee9f5..16f5cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mr (0.3) UNRELEASED; urgency=low * Add a check to make sure the expected directory exists after checkout. * mr register will now write to whatever config file is specified with -c + * Typo files from madduck. -- Joey Hess Wed, 17 Oct 2007 12:45:28 -0400 diff --git a/mr b/mr index 50564f7..d7905b6 100755 --- a/mr +++ b/mr @@ -34,7 +34,7 @@ a set of repositories as if they were one combined respository. It supports any combination of subversion, git, cvs, and bzr repositories, and support for other revision control systems can easily be added. -B cds into and operates on all registered repsitories at or below your +B cds into and operates on all registered repositories at or below your working directory. Or, if you are in a subdirectory of a repository that contains no other registered repositories, it will stay in that directory, and work on only that repository, @@ -87,7 +87,7 @@ List the repositories that mr will act on. =item register Register an existing repository in the mrconfig file. By default, the -epository in the current directory is registered, or you can specify a +repository in the current directory is registered, or you can specify a directory to register. =item config @@ -218,7 +218,7 @@ should avoid chaining from repositories with untrusted committers.) If the "deleted" parameter is set and its command returns nonzero, then B will treat the repository as deleted. It won't ever actually delete -the repository, but it will warn if it sees the repsoitory's directory. +the repository, but it will warn if it sees the repository's directory. This is useful when one mrconfig file is shared amoung multiple machines, to keep track of and remember to delete old repositories. -- 2.39.2 From c4cd5eba9e41a024e9eb8fc2f62cf4f37723b97e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Oct 2007 12:49:19 -0400 Subject: [PATCH 08/16] releasing version 0.3 --- debian/changelog | 4 ++-- mr | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16f5cb8..88335fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -mr (0.3) UNRELEASED; urgency=low +mr (0.3) unstable; urgency=low * Add a check to make sure the expected directory exists after checkout. * mr register will now write to whatever config file is specified with -c * Typo files from madduck. - -- Joey Hess Wed, 17 Oct 2007 12:45:28 -0400 + -- Joey Hess Wed, 17 Oct 2007 12:48:55 -0400 mr (0.2) unstable; urgency=low diff --git a/mr b/mr index d7905b6..d170e67 100755 --- a/mr +++ b/mr @@ -90,6 +90,9 @@ Register an existing repository in the mrconfig file. By default, the repository in the current directory is registered, or you can specify a directory to register. +By default it registers it to the ~/.mrconfig file. To make it write to a +different file, use the -c option. + =item config Adds, modifies, removes, or prints a value from the mrconfig file. The next -- 2.39.2 From 02d332602145b6e3e3e28dbfd5078fcf04c27446 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 13:33:05 -0400 Subject: [PATCH 09/16] * Fix mr register to work when -c is specified using a relative path and is used to register a sibdirectory. --- debian/changelog | 7 +++++++ mr | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 88335fb..17eea27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mr (0.4) UNRELEASED; urgency=low + + * Fix mr register to work when -c is specified using a relative path and + is used to register a sibdirectory. + + -- Joey Hess Thu, 18 Oct 2007 13:32:21 -0400 + mr (0.3) unstable; urgency=low * Add a check to make sure the expected directory exists after checkout. diff --git a/mr b/mr index d170e67..e735b67 100755 --- a/mr +++ b/mr @@ -261,7 +261,7 @@ my %alias; Getopt::Long::Configure("no_permute"); my $result=GetOptions( "d|directory=s" => sub { $directory=abs_path($_[1]) }, - "c|config=s" => \$ENV{MR_CONFIG}, + "c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) }, "v|verbose" => \$verbose, "s|stats" => \$stats, ); -- 2.39.2 From 87aeee89afd99df4c3d15ba53e18ecf66deb96dd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 13:58:44 -0400 Subject: [PATCH 10/16] * Signal handling for commands run by mr, including handling of SIGINT to stop mr. --- debian/changelog | 4 ++- mr | 64 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17eea27..8b8fdcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ mr (0.4) UNRELEASED; urgency=low * Fix mr register to work when -c is specified using a relative path and is used to register a sibdirectory. + * Signal handling for commands run by mr, including handling of SIGINT + to stop mr. - -- Joey Hess Thu, 18 Oct 2007 13:32:21 -0400 + -- Joey Hess Thu, 18 Oct 2007 13:57:41 -0400 mr (0.3) unstable; urgency=low diff --git a/mr b/mr index e735b67..d4c3b25 100755 --- a/mr +++ b/mr @@ -250,6 +250,11 @@ use strict; use Getopt::Long; use Cwd qw(getcwd abs_path); +$SIG{INT}=sub { + print STDERR "mr: interrupted\n"; + exit 2; +}; + $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig"; my $directory=getcwd(); my $verbose=0; @@ -398,10 +403,19 @@ sub action { #{{{ my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted}; print "mr $action: running deleted test >>$test<<\n" if $verbose; my $ret=system($test); - if ($ret >> 8 == 0) { - print STDERR "mr error: $dir should be deleted yet still exists\n\n"; - push @failed, $dir; - return; + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: deleted test received signal ".($? & 127)."\n"; + } + if ($ret >> 8 == 0) { + print STDERR "mr error: $dir should be deleted yet still exists\n\n"; + push @failed, $dir; + return; + } } } } @@ -427,10 +441,20 @@ sub action { #{{{ "my_action(){ $config{$topdir}{$subdir}{skip}\n }; my_action '$action'"; print "mr $action: running skip test >>$test<<\n" if $verbose; my $ret=system($test); - if ($ret >> 8 == 0) { - print "mr $action: $dir skipped per config file\n" if $verbose; - push @skipped, $dir; - return; + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: skip test received signal ".($? & 127)."\n"; + exit 1; + } + if ($ret >> 8 == 0) { + print "mr $action: $dir skipped per config file\n" if $verbose; + push @skipped, $dir; + return; + } } } @@ -455,6 +479,13 @@ sub action { #{{{ print STDERR "mr $action: running >>$command<<\n" if $verbose; my $ret=system($command); if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: received signal ".($? & 127)."\n"; + } print STDERR "mr $action: failed ($ret)\n" if $verbose; push @failed, $dir; if ($ret >> 8 != 0) { @@ -601,9 +632,20 @@ sub loadconfig { #{{{ $knownactions{$parameter}=1; if ($parameter eq 'chain' && length $dir && $section ne "DEFAULT" && - -e $dir.$section."/.mrconfig" && - system($value) >> 8 == 0) { - push @toload, $dir.$section."/.mrconfig"; + -e $dir.$section."/.mrconfig") { + my $ret=system($value); + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: chain test interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: chain test received signal ".($? & 127)."\n"; + } + } + else { + push @toload, $dir.$section."/.mrconfig"; + } } } } -- 2.39.2 From c9232098307b1ba10076781bfc7794d133c2236e Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 18 Oct 2007 17:30:30 +0200 Subject: [PATCH 11/16] ensure parent dir exists prior to checkout Signed-off-by: martin f. krafft --- mr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mr b/mr index d4c3b25..b2cb388 100755 --- a/mr +++ b/mr @@ -426,7 +426,12 @@ sub action { #{{{ push @skipped, $dir; return; } + $dir=~s/^(.*)\/[^\/]+\/?$/$1/; + if (! -d $dir) { + print "mr $action: creating parent directory $dir\n" if $verbose; + mkdir $dir; + } } elsif ($action eq 'update') { if (! -d $dir) { -- 2.39.2 From c8088cf4d74fb8f48e8acf1784912727cdbc53fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 14:09:27 -0400 Subject: [PATCH 12/16] add changelog entry and use mkdir -p --- debian/changelog | 1 + mr | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8b8fdcc..7a56883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mr (0.4) UNRELEASED; urgency=low is used to register a sibdirectory. * Signal handling for commands run by mr, including handling of SIGINT to stop mr. + * Ensure parent dir exists prior to checkout. (madduck) -- Joey Hess Thu, 18 Oct 2007 13:57:41 -0400 diff --git a/mr b/mr index b2cb388..8e845a9 100755 --- a/mr +++ b/mr @@ -428,9 +428,10 @@ sub action { #{{{ } $dir=~s/^(.*)\/[^\/]+\/?$/$1/; + if (! -d $dir) { print "mr $action: creating parent directory $dir\n" if $verbose; - mkdir $dir; + my $ret=system("mkdir", "-p", $dir); } } elsif ($action eq 'update') { -- 2.39.2 From cf4614e158494228ec12b2ef5b8598a79beea4cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 14:14:50 -0400 Subject: [PATCH 13/16] fixup comment --- mr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mr b/mr index 8e845a9..1e5c2fd 100755 --- a/mr +++ b/mr @@ -316,7 +316,7 @@ elsif ($action eq 'config') { } my $section=shift; if ($section=~/^\//) { - # try to convert to a path relative to $config's dir + # try to convert to a path relative to the config file my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/; if ($section=~/^\Q$dir\E(.*)/) { $section=$1; -- 2.39.2 From 60b5987c6fd0e98be1b9a32560731953d7cc8827 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 14:29:24 -0400 Subject: [PATCH 14/16] improve changelog --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a56883..8ba90b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ mr (0.4) UNRELEASED; urgency=low - * Fix mr register to work when -c is specified using a relative path and - is used to register a sibdirectory. + * Fix mr register of a subdir also work with -c. * Signal handling for commands run by mr, including handling of SIGINT to stop mr. * Ensure parent dir exists prior to checkout. (madduck) -- 2.39.2 From da4251ccfad6a4ea83fcc21a70f7f7dd26e5fa55 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 14:57:21 -0400 Subject: [PATCH 15/16] * Output list of failed repos to stderr when -s is used. --- debian/changelog | 3 ++- mr | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ba90b0..bfac297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ mr (0.4) UNRELEASED; urgency=low * Signal handling for commands run by mr, including handling of SIGINT to stop mr. * Ensure parent dir exists prior to checkout. (madduck) + * Output list of failed repos to stderr when -s is used. - -- Joey Hess Thu, 18 Oct 2007 13:57:41 -0400 + -- Joey Hess Thu, 18 Oct 2007 14:56:58 -0400 mr (0.3) unstable; urgency=low diff --git a/mr b/mr index 1e5c2fd..95a7fe8 100755 --- a/mr +++ b/mr @@ -537,7 +537,7 @@ if ($stats) { print "mr $action: (skipped: ".join(" ", @skipped).")\n"; } if (@failed) { - print "mr $action: (failed: ".join(" ", @failed).")\n"; + print STDERR "mr $action: (failed: ".join(" ", @failed).")\n"; } } if (@failed) { -- 2.39.2 From 8cfc9de1be353fe0ddf3f5dbd9d5b46f6d99abb1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Oct 2007 15:01:17 -0400 Subject: [PATCH 16/16] * Fix a bug caused by a stupid typo. --- debian/changelog | 3 ++- mr | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bfac297..8fa6c09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ mr (0.4) UNRELEASED; urgency=low to stop mr. * Ensure parent dir exists prior to checkout. (madduck) * Output list of failed repos to stderr when -s is used. + * Fix a bug caused by a stupid typo. - -- Joey Hess Thu, 18 Oct 2007 14:56:58 -0400 + -- Joey Hess Thu, 18 Oct 2007 15:00:00 -0400 mr (0.3) unstable; urgency=low diff --git a/mr b/mr index 95a7fe8..e41264c 100755 --- a/mr +++ b/mr @@ -362,7 +362,7 @@ foreach my $topdir (sort keys %config) { my $d=$directory; $dir.="/" unless $dir=~/\/$/; $d.="/" unless $d=~/\/$/; - next if $dir ne $directory && $dir !~ /^\Q$directory\E/; + next if $dir ne $d && $dir !~ /^\Q$d\E/; push @repos, [$dir, $topdir, $subdir]; } } -- 2.39.2