diff options
| author | stanly <stanly@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:49 +0300 |
| commit | cde218e65dfef5ce03a48d641fd8f7913cf17b2d (patch) | |
| tree | d3349caea4095825a55b5ba24fe758067b29ce6f /build/ymake_conf.py | |
| parent | 9f813499b4ef585cb3c2bb93de93ef003daf4fc4 (diff) | |
| download | ydb-cde218e65dfef5ce03a48d641fd8f7913cf17b2d.tar.gz | |
Restoring authorship annotation for <stanly@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/ymake_conf.py')
| -rwxr-xr-x | build/ymake_conf.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 30219eb85e..0730447c48 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -646,7 +646,7 @@ class Build(object): else: def find_svn(): for i in range(0, 3): - for path in (['.svn', 'wc.db'], ['.svn', 'entries'], ['.git', 'logs', 'HEAD']): + for path in (['.svn', 'wc.db'], ['.svn', 'entries'], ['.git', 'logs', 'HEAD']): path_parts = [os.pardir] * i + path full_path = os.path.join(self.arcadia.root, *path_parts) # HACK(somov): No "normpath" here. ymake fails with the "source file name is outside the build tree" error @@ -654,14 +654,14 @@ class Build(object): if os.path.exists(full_path): out_path = os.path.join('${ARCADIA_ROOT}', *path_parts) return '${input;hide:"%s"}' % out_path - - # Special processing for arc repository since .arc may be a symlink. - dot_arc = os.path.realpath(os.path.join(self.arcadia.root, '.arc')) - full_path = os.path.join(dot_arc, 'TREE') - if os.path.exists(full_path): - out_path = os.path.join('${ARCADIA_ROOT}', os.path.relpath(full_path, self.arcadia.root)) - return '${input;hide:"%s"}' % out_path - + + # Special processing for arc repository since .arc may be a symlink. + dot_arc = os.path.realpath(os.path.join(self.arcadia.root, '.arc')) + full_path = os.path.join(dot_arc, 'TREE') + if os.path.exists(full_path): + out_path = os.path.join('${ARCADIA_ROOT}', os.path.relpath(full_path, self.arcadia.root)) + return '${input;hide:"%s"}' % out_path + return '' emit_with_ignore_comment('SVN_DEPENDS', find_svn()) |