[Title] Fixed package sync bug

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 3f786c5125f234660b71c6180cd93d5c03c033b7..08295f0914992bbbddc9586257e445024d90b296 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -493,14 +493,6 @@ class BuildJob < CommonJob
 
 
        def progress
-               if not @log.nil? then
-                       if @project.nil? or @project.get_latest_log_cnt.nil? then
-                               return "--% (#{log.cnt.to_s} lines) "
-                       else
-                               return ( ( @log.cnt * 100 ) / @project.get_latest_log_cnt ).to_s + "%"
-                       end
-               end
-               # if log is nil then can't figure progress out
                return ""
        end
 

diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index c22c1b95ba9ee090dc9546ca904ff71df312ece1..97fc30bbebc7a99475f6bbb0e897811a0495c970 100644 (file)
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -49,8 +49,6 @@ class CommonProject
                else
                        @path = "#{@server.path}/projects/#{@dist_name}/#{@name}"
                end
-               @extra_infos = {}
-               read_ext_info
        end
 
 
@@ -82,45 +80,6 @@ class CommonProject
        end
 
 
-       def write_ext_info
-               # write to file
-               info_file = "#{@path}/extra"
-               File.open( info_file, "w" ) do |f|
-                       @extra_infos.each do  |key,value|
-                               f.puts "#{key} : #{value}"
-                       end
-               end
-       end
-
-
-       # set extra info
-       def read_ext_info
-               info_file = "#{@path}/extra"
-               if not File.exists? info_file then return end
-               File.open( info_file, "r" ) do |f|
-                       while (not f.gets and line = f.gets.split(":"))
-                               if not line[1].nil? then
-                                       @extra_infos[line[0].strip] = line[1].strip
-                               end
-                       end
-               end
-       end
-
-
-       def set_log_cnt( cnt )
-               @extra_infos["Latest_log_count"] = cnt.to_s
-       end
-
-
-       def get_latest_log_cnt
-               result = @extra_infos["Latest_log_count"]
-               if not result.nil? then
-                       return result.to_i
-               end
-               return nil
-       end
-
-
        def set_source_info(info)
                @source_info = info
        end

diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb
index dfd0da55eda4898c1655508df44d8557c8cd5356..8b97de497481d72495d0c2e8c8559857b4f36a67 100644 (file)
--- a/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@ -64,7 +64,6 @@ class GitBuildJob < BuildJob
                        @project.save_source_info( @pkginfo.get_version(), @git_commit)
                        @project.save_package_info_from_manifest( @pkginfo.get_version(),
                                "#{@source_path}/package/pkginfo.manifest", @os)
-                       @project.set_log_cnt( @log.cnt )
                        @project.write_ext_info
 
                        # clean up

diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb
index 523a0bb6c45bc1091a7ae6fecfcbd734eb768684..0aa83bccbe51ee4d6df5e18806857d7ffb6d5880 100644 (file)
--- a/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@ -89,15 +89,15 @@ class PackageSyncAction < Action
                # check update
                pkgs = check_package_update
 
+               # request to register
+               registered_jobs = []
+
                # if updates are found, download them
                downloaded_files = []
                pkgs.each do  |pkg|
                        pkg_name=pkg[0]; os=pkg[1]; prj=pkg[2]
 
                        downloaded_files = @pkgsvr_client.download(pkg_name, os, false)
-
-                       # request to register
-                       registered_jobs = []
                        downloaded_files.each do  |file_path|
                                @server.log.info "Creating new job for registering \"#{file_path}\""
                                new_job = prj.create_new_job_from_local_file( file_path )

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 8d6652318a0ba5e683180afb59cec6cea052dcfc..83bb3477e3bd6be4f5c243a5ca84a53a2dca755e 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -221,10 +221,6 @@ class RegisterPackageJob < CommonJob
                else
                        # clean up
                        @server.cleaner.clean(@id)
-                       if not @project.nil? then
-                               @project.set_log_cnt( @log.cnt )
-                               @project.write_ext_info
-                       end
                end
 
                # close logger
@@ -349,14 +345,6 @@ class RegisterPackageJob < CommonJob
 
 
        def progress
-               if not @log.nil? then
-                       if @project.nil? or @project.get_latest_log_cnt.nil? then
-                               return "--% (#{log.cnt.to_s} lines) "
-                       else
-                               return ( ( @log.cnt * 100 ) / @project.get_latest_log_cnt ).to_s + "%"
-                       end
-               end
-               # if log is nil then can't figure progress out
                return ""
        end