From 0a11862b4edcaedfc25dc25d46500bba64f43367 Mon Sep 17 00:00:00 2001 From: "donghyuk.yang" Date: Fri, 31 Aug 2012 16:21:50 +0900 Subject: [PATCH] [Title] Sort by modified time when removing cached package files [Type] [Module] [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- src/pkg_server/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb index 2794805..2c2fde8 100644 --- a/src/pkg_server/client.rb +++ b/src/pkg_server/client.rb @@ -251,7 +251,7 @@ class Client private def remove_downloaded_pkgs(pkg_name, os) pkg_file_prefix = "#{@download_path}/#{pkg_name}_*_#{os}.zip" - pkg_files = Dir.glob(pkg_file_prefix).sort {|x,y| y <=> x } + pkg_files = Dir[pkg_file_prefix].sort_by { |f| File.mtime(f) }.reverse if not pkg_files.nil? and pkg_files.length >= 4 then Utils.execute_shell("rm -rf #{pkg_files[3..-1].join(" ")}") @@ -288,7 +288,7 @@ class Client private def remove_snapshots() listing_prefix = "#{@snapshots_path}/*" - dirs = Dir.glob(listing_prefix).sort {|x,y| y <=> x} + dirs = Dir[listing_prefix].sort_by { |f| File.mtime(f) }.reverse if not dirs.nil? and dirs.length >= 20 then Utils.execute_shell("rm -rf #{dirs[19..-1].join(" ")}") -- 2.34.1