[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    quality/krazy2/lib/Krazy
From:       Allen Winter <winter () kde ! org>
Date:       2009-12-24 15:58:27
Message-ID: 1261670307.836890.22447.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1065876 by winterz:

fix computing if this is a valid project path in a known KDE svn directory.
of course, this totally breaks if your KDE source code lives outside
of the KDE svn, for example in a git place.

not sure what to do about that yet.


 M  +10 -12    Utils.pm  


--- trunk/quality/krazy2/lib/Krazy/Utils.pm #1065875:1065876
@@ -72,18 +72,16 @@
 sub topProject {
   my($in) = @_;
   my($apath) = abs_path($in);
-  $apath =~ s+/kdebase/apps/+/kdebase-apps/+;
-  $apath =~ s+/kdebase/runtime/+/kdebase-runtime/+;
-  $apath =~ s+/kdebase/workspace/+/kdebase-workspace/+;
-  my($top) = $apath;
-  $top =~ s+/$ModRegex/.*++;
-  return "" if ( $top eq $apath );
-  my($module) = $apath;
-  $module =~ s+$top/++;
-  return "" if ( $module eq $top ); # not in a KDE module
-  my($subdir);
-  ($module,$subdir) = split("/",$module);
-  return "$top/$module/$subdir";
+
+  my($module) = topModule($in);
+  return "" if (!$module);
+  $apath =~ s+^$module/++;
+
+  my($subdir,$project);
+  ($subdir,$project) = split("/",$apath);
+  return "" if (!$subdir || !$project);
+
+  return "$module/$subdir/$project";
 }
 
 # Exit a checker with the number of issues
[prev in list] [next in list] [prev in thread] [next in thread]