commit b9188c2a57af7594832038d2f66b8ad97d0b3de3
author Alexander Thomas <athom@google.com> Tue Dec 17 03:51:49 2024 -0800
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Dec 17 03:51:49 2024 -0800
tree 0f8d8b4775a871800209bf58dbc1ec3cc3ad56cb
parent e8dafedc2ddd0cbaf216c694312735069e317ab5

[infra] Fix package_deps.dart to handle empty directories

Previously, this failed if git left an empty directory in the pkg/
directory.

Change-Id: I05e25438aaa29e73c7c4e8e1a2d85dbc1c747fff
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401400
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Sigurd Meldgaard <sigurdm@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>

tools/package_deps/bin/package_deps.dart

diff --git a/tools/package_deps/bin/package_deps.dart b/tools/package_deps/bin/package_deps.dart
index ba3099c..e9df384 100644
--- a/tools/package_deps/bin/package_deps.dart
+++ b/tools/package_deps/bin/package_deps.dart
@@ -35,8 +35,8 @@
   final packages = <Package>[];
   for (var entity in Directory('pkg').listSync()) {
     if (entity is Directory) {
-      var package = Package(entity.path);
-      if (package.hasPubspec) {
+      if (_hasPubspec(entity)) {
+        var package = Package(entity.path);
         packages.add(package);
       }
     }
@@ -82,6 +82,9 @@
   }
 }
 
+bool _hasPubspec(Directory dir) =>
+    FileSystemEntity.isFileSync(path.join(dir.path, 'pubspec.yaml'));
+
 class Package implements Comparable<Package> {
   final String dir;
   final _regularDependencies = <String>{};
@@ -138,9 +141,6 @@
   @override
   String toString() => 'Package $dirName';
 
-  bool get hasPubspec =>
-      FileSystemEntity.isFileSync(path.join(dir, 'pubspec.yaml'));
-
   @override
   int compareTo(Package other) => dir.compareTo(other.dir);