Remove last traces of the long-obsolete SelfUpdateCVSTrees

fink · Sep 19, 2013 · c4f9b30 · c4f9b30
1 parent fc9b2ea
commit c4f9b30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/perlmod/Fink/SelfUpdate/CVS.pm b/perlmod/Fink/SelfUpdate/CVS.pm
@@ -256,7 +256,7 @@ sub setup_direct_cvs {
 		die "Downloading package descriptions from $vcs failed.\n";
 	}
 
-	my @trees = split(/\s+/, $config->param_default("SelfUpdateTrees", $config->param_default("SelfUpdateCVSTrees", $distribution)));
+	my @trees = split(/\s+/, $config->param_default("SelfUpdateTrees", $distribution));
 	chdir "fink" or die "Can't cd to fink\n";
 
 	for my $tree (@trees) {
@@ -387,7 +387,7 @@ sub do_direct_cvs {
 
 	# then, update the trees
 
-	my @trees = split(/\s+/, $config->param_default("SelfUpdateTrees", $config->param_default("SelfUpdateCVSTrees", $distribution)));
+	my @trees = split(/\s+/, $config->param_default("SelfUpdateTrees", $distribution));
 	for my $tree (@trees) {
 		$cmd = "$cvs ${verbosity} -z3 update -d -P ${tree}";
 		$cmd = "/usr/bin/su $username -c '$cmd'" if ($username);

diff --git a/postinstall.pl.in b/postinstall.pl.in
@@ -219,20 +219,11 @@ if (&execute("ln -s $distribution $distdir")) {
 # If SelfUpdateTrees is not defined, or just has a single entry, we update
 # the entry to $selfupdatetree.	 Otherwise, we append $selfupdatetree
 # to the entry (unless it is already present).
-# 
-# Note that SelfUpdateCVSTrees was used for a while before SelfUpdateTrees,
-# so we use that one if it is present and SelfUpdateTrees is absent.  (We
-# also zero out SelfUpdateCVSTrees at the end, to avoid future confusion.)
 my @alltrees = ();
 my $SUTrees = "";
 if (defined $config->param("SelfUpdateTrees")) {
 	$SUTrees = $config->param("SelfUpdateTrees") ;
 	@alltrees = split(/\s+/, $SUTrees);
-} else {
-	if (defined $config->param("SelfUpdateCVSTrees")) {
-		$SUTrees = $config->param("SelfUpdateCVSTrees");
-		@alltrees = split(/\s+/, $SUTrees);
-	}
 }
 if (scalar @alltrees eq "1") {
 	$SUTrees = "";
@@ -244,7 +235,6 @@ for my $tree (@alltrees) {
 my $SUTreesEntry = $SUTrees . " " . $selfupdatetree;
 $SUTreesEntry =~ s/(^\s+|\s+$)//g;
 $config->set_param("SelfUpdateTrees", $SUTreesEntry);
-$config->set_param("SelfUpdateCVSTrees", "");
 $config->save();
 
 # Now that we've symlinked to the new directory, we can copy over the