[Ngetsuite-cvs] ngetsuite/ngetsuite config.rb,1.5,1.6 downloader.rb,1.34,1.35 ngetcache.rb,1.11,1.12

[Johnjohn <jj...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5710/ngetsuite

Modified Files:
	config.rb downloader.rb ngetcache.rb 
Log Message:
new version of the nget cache
copy your ~/.nget4/.ngetrc to ~/.nget5, remove ~/.nget4 and update all
(don't forget to change your config if you need to)


Index: ngetcache.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/ngetcache.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ngetcache.rb	19 Jun 2004 13:27:49 -0000	1.11
--- ngetcache.rb	6 Jul 2004 10:41:21 -0000	1.12
***************
*** 87,91 ****
  		
  		raise BadNgetCache.new('invalid file format') unless @line =~ /^([^\t]*)\t(\d+) ([^\t]*)$/
! 		raise BadNgetCache.new('invalid file format or version number') unless $1 == 'NGET4' and $3 == '1'
  		@partscounttotal = $2.to_i
  		@partscountcurrent = 0
--- 87,91 ----
  		
  		raise BadNgetCache.new('invalid file format') unless @line =~ /^([^\t]*)\t(\d+) ([^\t]*)$/
! 		raise BadNgetCache.new('invalid file format or version number') unless ($1 == 'NGET4' or $1 == 'NGET5') and $3 == '1'
  		@partscounttotal = $2.to_i
  		@partscountcurrent = 0
***************
*** 120,124 ****
  		@lineno += 1
  		
! 		raise BadNgetCache.new('invalid file description') unless @line =~ /^(-?\d+)\t(\d+)(?:\t(\d+))?\t([^\t]*)\t([^\t]*)\t(-?\d+)\t(-?\d+)$/
  		file = CacheFile.new($1.to_i, $2.to_i, ($3.to_i if $3), $4, $5, $6.to_i, $7.to_i, Array.new, Array.new)
  	
--- 120,124 ----
  		@lineno += 1
  		
! 		raise BadNgetCache.new('invalid file description') unless @line =~ /^(-?\d+)\t(\d+)(?:\t(\d+))?\t([^\t]*)\t([^\t]*)\t(-?\d+)\t(-?\d+)(?:\t(-?\d+)?)$/
  		file = CacheFile.new($1.to_i, $2.to_i, ($3.to_i if $3), $4, $5, $6.to_i, $7.to_i, Array.new, Array.new)
  	

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** downloader.rb	25 Jun 2004 11:10:04 -0000	1.34
--- downloader.rb	6 Jul 2004 10:41:21 -0000	1.35
***************
*** 184,188 ****
  			downloadexpr = "-r '#{@value}'"
  		end
! 		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -I -G #{@group} #{downloadexpr} 2>&1")
  		@t = Thread.new(@io, self){ |io, parent|
  			begin
--- 184,188 ----
  			downloadexpr = "-r '#{@value}'"
  		end
! 		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -G #{@group} #{downloadexpr} 2>&1")
  		@t = Thread.new(@io, self){ |io, parent|
  			begin

Index: config.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/config.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.rb	23 Feb 2004 17:08:08 -0000	1.5
--- config.rb	6 Jul 2004 10:41:21 -0000	1.6
***************
*** 17,21 ****
  nget = '/home/nget/bin/nget'
  yydecode = '/usr/bin/yydecode'
! cachedir = ENV['HOME'] + File::Separator + '.nget4'
  basedir = ENV['HOME'] + File::Separator + 'ngot'
  tempdir = ENV['TMP'] or ENV['TEMP'] or '/tmp'
--- 17,21 ----
  nget = '/home/nget/bin/nget'
  yydecode = '/usr/bin/yydecode'
! cachedir = ENV['HOME'] + File::Separator + '.nget5'
  basedir = ENV['HOME'] + File::Separator + 'ngot'
  tempdir = ENV['TMP'] or ENV['TEMP'] or '/tmp'