Merge pull request #1486 from d-loose/arch-compatibility

fix(packagekit): check arch compatibility in resolve
ubuntu · Nov 10, 2023 · fb7779d · fb7779d
2 parents be4b88e + 2569742
commit fb7779d
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 20 deletions.
diff --git a/lib/src/packagekit/packagekit_service.dart b/lib/src/packagekit/packagekit_service.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:dbus/dbus.dart';
 import 'package:flutter/material.dart';
@@ -130,13 +131,27 @@ class PackageKitService {
         action: (transaction) => transaction.removePackages([packageId]),
       );
 
+  static Future<String> _getNativeArchitecture() async {
+    final snapArch = Platform.environment['SNAP_ARCH'];
+    if (snapArch != null) {
+      return snapArch;
+    }
+
+    final result = await Process.run('/usr/bin/dpkg', ['--print-architecture']);
+    return result.stdout as String;
+  }
+
   /// Resolves a single package name provided by `name`.
-  Future<PackageKitPackageInfo?> resolve(String name) async {
+  Future<PackageKitPackageInfo?> resolve(
+    String name, [
+    @visibleForTesting String? architecture,
+  ]) async {
+    final arch = architecture ?? await _getNativeArchitecture();
     PackageKitPackageInfo? info;
     await _createTransaction(
       action: (transaction) => transaction.resolve([name]),
       listener: (event) {
-        if (event is PackageKitPackageEvent) {
+        if (event is PackageKitPackageEvent && event.packageId.arch == arch) {
           info = event;
         }
       },

diff --git a/test/packagekit_service_test.dart b/test/packagekit_service_test.dart
@@ -104,22 +104,61 @@ void main() {
     expect(packageKit.getTransaction(id), isNull);
   });
 
-  test('resolve', () async {
-    const mockInfo = PackageKitPackageEvent(
-      info: PackageKitInfo.available,
-      packageId: PackageKitPackageId(name: 'foo', version: '1.0'),
-      summary: 'summary',
-    );
-    final mockTransaction = createMockPackageKitTransaction(
-      events: [mockInfo],
-    );
-    final mockClient = createMockPackageKitClient(transaction: mockTransaction);
-    final packageKit =
-        PackageKitService(dbus: createMockDbusClient(), client: mockClient);
-    await packageKit.activateService();
-    final info = await packageKit.resolve('foo');
-    verify(mockTransaction.resolve(['foo'])).called(1);
-    expect(info, equals(mockInfo));
+  group('resolve', () {
+    test('unique package', () async {
+      const mockInfo = PackageKitPackageEvent(
+        info: PackageKitInfo.available,
+        packageId: PackageKitPackageId(
+          name: 'foo',
+          version: '1.0',
+          arch: 'amd64',
+        ),
+        summary: 'summary',
+      );
+      final mockTransaction = createMockPackageKitTransaction(
+        events: [mockInfo],
+      );
+      final mockClient =
+          createMockPackageKitClient(transaction: mockTransaction);
+      final packageKit =
+          PackageKitService(dbus: createMockDbusClient(), client: mockClient);
+      await packageKit.activateService();
+      final info = await packageKit.resolve('foo', 'amd64');
+      verify(mockTransaction.resolve(['foo'])).called(1);
+      expect(info, equals(mockInfo));
+    });
+
+    test('multiple architectures', () async {
+      final mockTransaction = createMockPackageKitTransaction(
+        events: const [
+          PackageKitPackageEvent(
+            info: PackageKitInfo.available,
+            packageId: PackageKitPackageId(
+              name: 'foo',
+              version: '1.0',
+              arch: 'amd64',
+            ),
+            summary: 'summary',
+          ),
+          PackageKitPackageEvent(
+            info: PackageKitInfo.available,
+            packageId: PackageKitPackageId(
+              name: 'foo',
+              version: '1.0',
+              arch: 'i386',
+            ),
+            summary: 'summary',
+          )
+        ],
+      );
+      final mockClient =
+          createMockPackageKitClient(transaction: mockTransaction);
+      final packageKit =
+          PackageKitService(dbus: createMockDbusClient(), client: mockClient);
+      await packageKit.activateService();
+      final info = await packageKit.resolve('foo', 'amd64');
+      expect(info!.packageId.arch, equals('amd64'));
+    });
   });
 
   test('cancel', () async {

diff --git a/test/test_utils.mocks.dart b/test/test_utils.mocks.dart
@@ -2446,11 +2446,17 @@ class MockPackageKitService extends _i1.Mock implements _i8.PackageKitService {
       ) as _i14.Future<int>);
 
   @override
-  _i14.Future<_i10.PackageKitPackageEvent?> resolve(String? name) =>
+  _i14.Future<_i10.PackageKitPackageEvent?> resolve(
+    String? name, [
+    String? architecture,
+  ]) =>
       (super.noSuchMethod(
         Invocation.method(
           #resolve,
-          [name],
+          [
+            name,
+            architecture,
+          ],
         ),
         returnValue: _i14.Future<_i10.PackageKitPackageEvent?>.value(),
       ) as _i14.Future<_i10.PackageKitPackageEvent?>);