[Title] Fixed cyclic "require" dependency

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 08295f0914992bbbddc9586257e445024d90b296..dd90a845c0945f23f69c93736aae9a40e1d47159 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -36,7 +36,6 @@ require "PackageManifest.rb"
 require "Version.rb"
 require "Builder.rb"
 require "RemoteBuilder.rb"
-require "BuildServer.rb"
 require "JobLog.rb"
 require "mail.rb"
 require "utils.rb"

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 25628877aa3b01fa603448886250889f904a6854..aa7d64fcac6875d964b8f992f8526995f5755c1b 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -31,7 +31,6 @@ require 'fileutils'
 require 'dbi'
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require "SocketJobRequestListener.rb"
-require "RemoteBuildJob.rb"
 require "JobManager.rb"
 require "JobClean.rb"
 require "RemoteBuildServer.rb"

diff --git a/src/build_server/JobClean.rb b/src/build_server/JobClean.rb
index c3dfe4f777e55c6b945e31edd00dd96628e851cd..85968394278969c9c9877b68412037e96fde0d89 100644 (file)
--- a/src/build_server/JobClean.rb
+++ b/src/build_server/JobClean.rb
@@ -30,7 +30,6 @@ require "fileutils"
 require "thread"
 $LOAD_PATH.unshift File.dirname(__FILE__)
 $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common"
-require "BuildServer.rb"
 require "Action.rb"
 require "ScheduledActionHandler.rb"
 

diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb
index 5b31daf48b7e5da32c6799bd3d7cb839a70e8db3..5385184f79455696c157a2be3aa6a713b356f94e 100644 (file)
--- a/src/build_server/MultiBuildJob.rb
+++ b/src/build_server/MultiBuildJob.rb
@@ -36,7 +36,6 @@ require "PackageManifest.rb"
 require "Version.rb"
 require "Builder.rb"
 require "RemoteBuilder.rb"
-require "BuildServer.rb"
 require "JobLog.rb"
 require "mail.rb"
 require "CommonJob.rb"

diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb
index 0aa83bccbe51ee4d6df5e18806857d7ffb6d5880..c15ff42411e74fa5c9f2af5a2fa45bbafd4bbd39 100644 (file)
--- a/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@ -30,7 +30,6 @@ require "fileutils"
 require "thread"
 $LOAD_PATH.unshift File.dirname(__FILE__)
 $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common"
-require "BuildServer.rb"
 require "Action.rb"
 require "ScheduledActionHandler.rb"
 

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 83bb3477e3bd6be4f5c243a5ca84a53a2dca755e..24e1feda7411a49edd9b4aad07e787825e1c9d26 100644 (file)
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -34,7 +34,6 @@ $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/plkg_server"
 require "client.rb"
 require "PackageManifest.rb"
 require "Version.rb"
-require "BuildServer.rb"
 require "JobLog.rb"
 require "mail.rb"
 require "utils.rb"

diff --git a/src/build_server/ReverseBuildChecker.rb b/src/build_server/ReverseBuildChecker.rb
index 8222b38da6f87a04165bc9a38fb246ee45f19a18..ce8edc6a049997b08e143ea1e2fe9e1ba643b638 100644 (file)
--- a/src/build_server/ReverseBuildChecker.rb
+++ b/src/build_server/ReverseBuildChecker.rb
@@ -32,11 +32,8 @@ $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common"
 $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/pkg_server"
 require "utils.rb"
 require "client.rb"
-require "BuildServer.rb"
 require "JobLog.rb"
 require "PackageManifest.rb"
-require "BuildJob.rb"
-require "RegisterPackageJob.rb"
 
 class ReverseBuildChecker
 

diff --git a/src/pkg_server/DistSync.rb b/src/pkg_server/DistSync.rb
index 0fa6dca5a9bb4055dd3822a754c857a5c06c47f1..a79ea4be011544c238bd3dbc7a3908290cf4d76d 100644 (file)
--- a/src/pkg_server/DistSync.rb
+++ b/src/pkg_server/DistSync.rb
@@ -30,7 +30,6 @@ require "fileutils"
 require "thread"
 $LOAD_PATH.unshift File.dirname(__FILE__)
 $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common"
-require "packageServer.rb"
 require "Action.rb"
 require "ScheduledActionHandler.rb"