summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmain.py3
-rw-r--r--pager.py3
-rw-r--r--platform_utils_win32.py3
-rw-r--r--subcmds/forall.py3
-rw-r--r--subcmds/gitc_init.py3
-rw-r--r--tests/test_wrapper.py3
6 files changed, 12 insertions, 6 deletions
diff --git a/main.py b/main.py
index fead2049..abb99cc5 100755
--- a/main.py
+++ b/main.py
@@ -229,7 +229,8 @@ class _Repo(object):
229 if e.name: 229 if e.name:
230 print('error: project group must be enabled for project %s' % e.name, file=sys.stderr) 230 print('error: project group must be enabled for project %s' % e.name, file=sys.stderr)
231 else: 231 else:
232 print('error: project group must be enabled for the project in the current directory', file=sys.stderr) 232 print('error: project group must be enabled for the project in the current directory',
233 file=sys.stderr)
233 result = 1 234 result = 1
234 except SystemExit as e: 235 except SystemExit as e:
235 if e.code: 236 if e.code:
diff --git a/pager.py b/pager.py
index 7ad25770..167f003f 100644
--- a/pager.py
+++ b/pager.py
@@ -59,7 +59,8 @@ def _PipePager(pager):
59 global pager_process, old_stdout, old_stderr 59 global pager_process, old_stdout, old_stderr
60 assert pager_process is None, "Only one active pager process at a time" 60 assert pager_process is None, "Only one active pager process at a time"
61 # Create pager process, piping stdout/err into its stdin 61 # Create pager process, piping stdout/err into its stdin
62 pager_process = subprocess.Popen([pager], stdin=subprocess.PIPE, stdout=sys.stdout, stderr=sys.stderr) 62 pager_process = subprocess.Popen([pager], stdin=subprocess.PIPE, stdout=sys.stdout,
63 stderr=sys.stderr)
63 old_stdout = sys.stdout 64 old_stdout = sys.stdout
64 old_stderr = sys.stderr 65 old_stderr = sys.stderr
65 sys.stdout = pager_process.stdin 66 sys.stdout = pager_process.stdin
diff --git a/platform_utils_win32.py b/platform_utils_win32.py
index 8eb3d2c3..c59db523 100644
--- a/platform_utils_win32.py
+++ b/platform_utils_win32.py
@@ -152,7 +152,8 @@ def create_dirsymlink(source, link_name):
152 152
153 153
154def _create_symlink(source, link_name, dwFlags): 154def _create_symlink(source, link_name, dwFlags):
155 if not CreateSymbolicLinkW(link_name, source, dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE): 155 if not CreateSymbolicLinkW(link_name, source,
156 dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE):
156 # See https://github.com/golang/go/pull/24307/files#diff-b87bc12e4da2497308f9ef746086e4f0 157 # See https://github.com/golang/go/pull/24307/files#diff-b87bc12e4da2497308f9ef746086e4f0
157 # "the unprivileged create flag is unsupported below Windows 10 (1703, v10.0.14972). 158 # "the unprivileged create flag is unsupported below Windows 10 (1703, v10.0.14972).
158 # retry without it." 159 # retry without it."
diff --git a/subcmds/forall.py b/subcmds/forall.py
index dbf26f0b..d0e51920 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -127,7 +127,8 @@ without iterating through the remaining projects.
127 help="Execute the command only on projects matching regex or wildcard expression") 127 help="Execute the command only on projects matching regex or wildcard expression")
128 p.add_option('-i', '--inverse-regex', 128 p.add_option('-i', '--inverse-regex',
129 dest='inverse_regex', action='store_true', 129 dest='inverse_regex', action='store_true',
130 help="Execute the command only on projects not matching regex or wildcard expression") 130 help="Execute the command only on projects not matching regex or "
131 "wildcard expression")
131 p.add_option('-g', '--groups', 132 p.add_option('-g', '--groups',
132 dest='groups', 133 dest='groups',
133 help="Execute the command only on projects matching the specified groups") 134 help="Execute the command only on projects matching the specified groups")
diff --git a/subcmds/gitc_init.py b/subcmds/gitc_init.py
index 378f9236..30a9f7a5 100644
--- a/subcmds/gitc_init.py
+++ b/subcmds/gitc_init.py
@@ -62,7 +62,8 @@ use for this GITC client.
62 def Execute(self, opt, args): 62 def Execute(self, opt, args):
63 gitc_client = gitc_utils.parse_clientdir(os.getcwd()) 63 gitc_client = gitc_utils.parse_clientdir(os.getcwd())
64 if not gitc_client or (opt.gitc_client and gitc_client != opt.gitc_client): 64 if not gitc_client or (opt.gitc_client and gitc_client != opt.gitc_client):
65 print('fatal: Please update your repo command. See go/gitc for instructions.', file=sys.stderr) 65 print('fatal: Please update your repo command. See go/gitc for instructions.',
66 file=sys.stderr)
66 sys.exit(1) 67 sys.exit(1)
67 self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(), 68 self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
68 gitc_client) 69 gitc_client)
diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index 61636b26..4d2cf3fb 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -101,7 +101,8 @@ class RepoWrapperUnitTest(RepoWrapperTestCase):
101 self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test/extra'), 'test') 101 self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test/extra'), 'test')
102 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test'), 'test') 102 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test'), 'test')
103 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/'), 'test') 103 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/'), 'test')
104 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/extra'), 'test') 104 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/extra'),
105 'test')
105 self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/'), None) 106 self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/'), None)
106 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/'), None) 107 self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/'), None)
107 108