firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gsutil argument order. (#14808)

Browse Source
This commit is contained in:
Greg Spencer 2018-02-22 09:03:10 -08:00 committed by GitHub
parent 382ee4baa4
commit 0b6c1938cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/bots/prepare_package.dart
View File

@ -487,14 +487,13 @@ class ArchivePublisher {
if (dest.endsWith('.json')) { if (dest.endsWith('.json')) {
mimeType = 'application/json'; mimeType = 'application/json';
} }
final List<String> args = <String>['cp']; final List<String> args = <String>[];
// Use our preferred MIME type for the files we care about // Use our preferred MIME type for the files we care about
// and let gsutil figure it out for anything else. // and let gsutil figure it out for anything else.
if (mimeType != null) { if (mimeType != null) {
args.addAll(<String>['-h', 'Content-Type:$mimeType']); args.addAll(<String>['-h', 'Content-Type:$mimeType']);
} }
args.add(src); args.addAll(<String>['cp', src, dest]);
args.add(dest);
return _runGsUtil(args); return _runGsUtil(args);
} }
} }

4
dev/bots/test/prepare_package_test.dart
View File

@ -239,10 +239,10 @@ void main() {
'''; ''';
final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{ final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{
'gsutil rm $gsArchivePath': null, 'gsutil rm $gsArchivePath': null,
'gsutil cp -h Content-Type:$archiveMime $archivePath $gsArchivePath': null, 'gsutil -h Content-Type:$archiveMime cp $archivePath $gsArchivePath': null,
'gsutil cat $gsJsonPath': <ProcessResult>[new ProcessResult(0, 0, releasesJson, '')], 'gsutil cat $gsJsonPath': <ProcessResult>[new ProcessResult(0, 0, releasesJson, '')],
'gsutil rm $gsJsonPath': null, 'gsutil rm $gsJsonPath': null,
'gsutil cp -h Content-Type:application/json $jsonPath $gsJsonPath': null, 'gsutil -h Content-Type:application/json cp $jsonPath $gsJsonPath': null,
}; };
processManager.fakeResults = calls; processManager.fakeResults = calls;
final File outputFile = new File(path.join(tempDir.absolute.path, archiveName)); final File outputFile = new File(path.join(tempDir.absolute.path, archiveName));