Maintain existing scm type for source directories.

With some git module IDs in the XML ending up the same as still-used
Subversion modules, it makes more sense to maintain the existing status
of present source directories instead of trying to use the wrong scm
tool.

Later I need to add detection for e.g. "MIGRATED" files to influence scm
type detection, but this works a bit better for now.
wilder
Michael Pyne 15 years ago
parent 4f1ca73485
commit fb5d26a640
  1. 12
      kdesrc-build

@ -3194,7 +3194,7 @@ sub default_module_options
my @nonKDEgitModules = qw(
qt-copy kdesupport dbusmenu-qt
kdemultimedia kdeartwork kdeutils kdegraphics kdegames
kdetoys kdeedu kdenetwork
kdetoys kdeedu kdenetwork kdesdk
);
if (not list_has(@nonKDEgitModules, $module)) {
@ -5304,16 +5304,16 @@ sub handle_updates
my $count;
eval {
if (module_scm_type($module) eq 'git') {
# Handle git module update
$count = update_module_git_checkout($module);
}
elsif (-e "$fullpath/.svn")
if (-e "$fullpath/.svn")
{
# Warn user if the current repo URL is different than expected.
check_module_validity($module);
$count = update_module_path($module, @options);
}
elsif (module_scm_type($module) eq 'git') {
# Handle git module update
$count = update_module_git_checkout($module);
}
else
{
$count = checkout_module_path($module, @options);

Loading…
Cancel
Save