fixing naming of authorization file

ahendrix · Jun 19, 2012 · 811eff4 · 811eff4
1 parent f54745c
commit 811eff4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README b/README
@@ -1 +1 @@
-README
+To use this it will look for server.yaml in $ROS_HOME/catkin-debs for credentials like rosci. 
diff --git a/scripts/create_all.py b/scripts/create_all.py
@@ -35,7 +35,7 @@ def parse_options():
 def doit(repo_map, package_names_by_url, distros, fqdn, jobs_graph, rosdistro, commit = False):
     jenkins_instance = None
     if args.commit:
-        jenkins_instance = jenkins_support.JenkinsConfig_to_handle(jenkins_support.load_server_config_file(jenkins_support.get_default_catkin_deps_config()))
+        jenkins_instance = jenkins_support.JenkinsConfig_to_handle(jenkins_support.load_server_config_file(jenkins_support.get_default_catkin_debs_config()))
 
 
     # What ROS distro are we configuring?

diff --git a/scripts/create_debjob.py b/scripts/create_debjob.py
@@ -96,7 +96,7 @@ def parse_options():
 
     jenkins_instance = None
     if args.commit:
-        jenkins_instance = jenkins_support.JenkinsConfig_to_handle(jenkins_support.load_server_config_file(jenkins_support.get_default_catkin_deps_config()))
+        jenkins_instance = jenkins_support.JenkinsConfig_to_handle(jenkins_support.load_server_config_file(jenkins_support.get_default_catkin_debs_config()))
 
     results = buildfarm.debjobs.doit(url, pkg_by_url[url], target_distros, args.fqdn, dependencies, args.rosdistro, args.package_name, args.commit, jenkins_instance)
     buildfarm.debjobs.summarize_results(*results)

diff --git a/src/buildfarm/jenkins_support.py b/src/buildfarm/jenkins_support.py
@@ -61,9 +61,9 @@ def JenkinsConfig_to_handle(server_config):
     return jenkins.Jenkins(server_config.url, server_config.username, server_config.password)
 
 
-def get_default_catkin_deps_config():
+def get_default_catkin_debs_config():
     import rospkg.environment
-    return os.path.join(rospkg.environment.get_ros_home(), 'catkin-deps', 'server.yaml')
+    return os.path.join(rospkg.environment.get_ros_home(), 'catkin-debs', 'server.yaml')
 
 
 def load_server_config_file(server_config_file):
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		README
		To use this it will look for server.yaml in $ROS_HOME/catkin-debs for credentials like rosci.