Permalink
Browse files

Rename get_debug_packages_directory() to get_compiled_debug_packages_…

…directory()
  • Loading branch information...
1 parent 5dbf3d3 commit 0d243d8a424aa79ae3617ceaff1eac1b7dd9efa2 Ozan Çağlayan committed Feb 18, 2011
Showing with 6 additions and 6 deletions.
  1. +1 −1 buildfarm/pisiinterface.py
  2. +2 −2 buildfarm/utils.py
  3. +1 −1 hooks/20-create-latest-repositories
  4. +2 −2 tools/buildfarm-run
@@ -26,7 +26,7 @@ def __init__(self, stdout=None, stderr=None, output_dir = conf.workdir):
# Override these so that pisi searches for .pisi files in the right locations
self.options.output_dir = output_dir
- self.options.debug_packages_dir = utils.get_debug_packages_directory()
+ self.options.debug_packages_dir = utils.get_compiled_debug_packages_directory()
self.options.compiled_packages_dir = utils.get_compiled_packages_directory()
self.options.yes_all = True
View
@@ -59,7 +59,7 @@ def create_directories():
conf.repositorydir,
conf.logdir,
get_compiled_packages_directory(),
- get_debug_packages_directory(),
+ get_compiled_debug_packages_directory(),
get_local_repository_url(),
get_package_log_directory(),
]
@@ -87,7 +87,7 @@ def get_package_log_directory():
conf.subrepository,
conf.architecture)
-def get_debug_packages_directory():
+def get_compiled_debug_packages_directory():
return "%s-debug" % get_compiled_packages_directory()
def get_compiled_packages_directory():
@@ -12,7 +12,7 @@ def create_latest_repo_layout():
# e.g. /var/db/buildfarm/packages/corporate2/devel/x86_64
repo = utils.get_compiled_packages_directory()
- repo_debug = utils.get_debug_packages_directory()
+ repo_debug = utils.get_compiled_debug_packages_directory()
# latest repository
# e.g. /var/db/buildfarm/packages/corporate2/devel/x86_64-latest
View
@@ -124,7 +124,7 @@ def build_packages():
# Set index paths
paths = [utils.get_compiled_packages_directory()]
if ctx.config.values.build.generatedebug:
- paths.append(utils.get_debug_packages_directory())
+ paths.append(utils.get_compiled_debug_packages_directory())
for directory in paths:
pisi.api.index([utils.get_local_repository_url(), directory],
@@ -158,7 +158,7 @@ def move_packages(new_binary_packages, new_debug_packages):
move_package(package, utils.get_compiled_packages_directory())
for package in new_debug_packages:
- move_package(package, utils.get_debug_packages_directory())
+ move_package(package, utils.get_compiled_debug_packages_directory())
### Entry point ###

0 comments on commit 0d243d8

Please sign in to comment.