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

List:       kde-commits
Subject:    extragear/multimedia/amarok/supplementary_scripts/neon
From:       Harald Sitter <sitter.harald () gmail ! com>
Date:       2008-05-06 13:56:03
Message-ID: 1210082163.700694.8203.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804582 by sitter:

make the new checkouteval method behave properly - I really think fetching \
                runtime/pics from anonsvn is a pretty stupid thing to do
...suggestions?...


 M  +0 -19     fetcher.rb  
 M  +10 -14    libneon.rb  


--- trunk/extragear/multimedia/amarok/supplementary_scripts/neon/fetcher.rb \
#804581:804582 @@ -52,35 +52,16 @@
 def KdeBaseRuntime()
   comp = "kdebase-runtime"
 
-  def KdeBaseRuntimeCrapOut()
-    if @cofailed
-      return
-    end
-  end
-
   CheckOut(comp, "KDE/kdebase/runtime", nil, "no")
 
   CheckOutEval(comp, "KDE/kdebase/runtime/cmake", "#{@dir}/cmake")
-  if @cofailed
-    return
-  end
 
   CheckOutEval(comp, "KDE/kdebase/runtime/phonon", "#{@dir}/phonon")
-  if @cofailed
-    return
-  end
 
   CheckOutEval(comp, "KDE/kdebase/runtime/kstyles", "#{@dir}/kstyles")
-  if @cofailed
-    return
-  end
 
   CheckOutEval(comp, "KDE/kdebase/runtime/pics", "#{@dir}/pics")
-  if @cofailed
-    return
-  end
 
-
   #create CMakeLists.txt
   cmakefile = File.new( "#{@dir}/CMakeLists.txt", File::CREAT | File::RDWR | \
File::TRUNC )  cmakefile << "file(GLOB _po_files *.po)\n"
--- trunk/extragear/multimedia/amarok/supplementary_scripts/neon/libneon.rb \
#804581:804582 @@ -41,17 +41,21 @@
     Dir.chdir(BASEPATH)
   end
 
-  def CheckOutEval(comp, path, dir)
+  def CheckOutEval(comp, path, dir, recursive=nil)
+    unless recursive == "no"
+      cmd = "svn co"
+    else
+      cmd = "svn co -N"
+    end
     count = 0
-    `#{@cmd} svn://anonsvn.kde.org/home/kde/trunk/#{path} #{dir}`
+    `#{cmd} svn://anonsvn.kde.org/home/kde/trunk/#{path} #{dir}`
     while $? != 0
       unless count >= 20
         `svn co svn://anonsvn.kde.org/home/kde/trunk/#{path} #{dir}`
         count += 1
       else
-        puts "Neon::CheckOut svn co didn't exit properly in 20 tries, aborting \
                checkout of #{comp}."
-        @cofailed = true
-        return
+        puts "Neon::CheckOut svn co didn't exit properly in 20 tries, aborting."
+        exit 0
       end
     end
   end
@@ -80,18 +84,10 @@
   def CheckOut(comp, path, dir=nil, recursive=nil)
     puts "#{ThisMethod()} started with component: #{comp}"
     BaseDir()
-    unless recursive == "no"
-      @cmd = "svn co"
-    else
-      @cmd = "svn co -N"
-    end
     unless dir
       dir = "amarok-nightly-" + comp
     end
-    CheckOutEval(comp, path, dir)
-    if @cofailed
-      return
-    end
+    CheckOutEval(comp, path, dir, "#{recursive}")
     rev = `svn info #{dir}`.split("\n")[4].split(" ")[1]
     @dir = dir + "-" + rev
     FileUtils.mv(dir, @dir)


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