r4119 - dists/trunk/scripts

[Bastian Blank]

Author: waldi
Date: 2005-09-01 07:48:03 +0000 (Thu, 01 Sep 2005)
New Revision: 4119

Modified:
   dists/trunk/scripts/prune-non-free
Log:
prune-non-free: Remove automatic version detection. It is not able to correctly
resolve debian versions for rc upstream versions.


Modified: dists/trunk/scripts/prune-non-free
===================================================================
--- dists/trunk/scripts/prune-non-free	2005-09-01 07:21:35 UTC (rev 4118)
+++ dists/trunk/scripts/prune-non-free	2005-09-01 07:48:03 UTC (rev 4119)
@@ -134,14 +134,6 @@
 	tf.path
 end
 
-def kversion(file)
-	tarball = File.basename(file)
-	unless tarball =~ /^linux-([0-9\.]+)\.tar.*$/
-		raise "cannot determine kernel version from '#{tarball}'!"
-	end
-	$1
-end
-
 def zip_type(tarball)
 	if tarball =~ /\.gz$/
 		'z'
@@ -264,10 +256,10 @@
 	FileUtils.mv(name + '.new', name)
 end
 
-raise "Usage: #{$0} <kernel tarball>" unless ARGV.length == 1
+raise "Usage: #{$0} <kernel tarball> <debian version>" unless ARGV.length == 2
 
 # Create source directories
-version = kversion(ARGV[0])
+version = ARGV[1]
 raise "Error: unable to determine tree from version string #{version}!" unless version =~ /^(\d+\.\d+)\./
 tree = $1
 free_dir = "linux-#{tree}-#{version}"