Browse Source

Partial fix to broken build after Invercargill API changes

Billy Barrow 1 month ago
parent
commit
c478ca6363
4 changed files with 8 additions and 8 deletions
  1. 1 1
      src/cli/Cli.vala
  2. 2 2
      src/cli/Install.vala
  3. 2 2
      src/lib/Resolver.vala
  4. 3 3
      src/lib/Transaction.vala

+ 1 - 1
src/cli/Cli.vala

@@ -13,7 +13,7 @@ public static int main(string[] args) {
     if(command == "manifest") {
         var m_args = new Invercargill.Vector<string>();
         m_args.add_all(Invercargill.Convert.ate(args));
-        m_args.remove(1);
+        m_args.remove_at(1);
         return manifest_main(m_args.to_array());
     }
     if(command == "info") {

+ 2 - 2
src/cli/Install.vala

@@ -20,7 +20,7 @@ private int install_main(string[] args) {
         printerr("\n");
     }
 
-    var cached_packages = new Set<Usm.CachedPackage>();
+    var cached_packages = new HashSet<Usm.CachedPackage>();
     for(int i = 2; i < args.length; i++) {
         var target = resolver.find_package(args[i]);
         var client = target.repository.get_client();
@@ -35,7 +35,7 @@ private int install_main(string[] args) {
 
     var transaction = new Usm.Transaction() {
         paths = paths,
-        to_remove = new Set<Usm.CachedPackage>(),
+        to_remove = new HashSet<Usm.CachedPackage>(),
         to_install = cached_packages,
         state = state
     };

+ 2 - 2
src/lib/Resolver.vala

@@ -5,7 +5,7 @@ namespace Usm {
     public class Resolver {
 
         private Dictionary<Repository, RepositoryListing> listings = new Dictionary<Repository, RepositoryListing>();
-        private Set<AbstractPackage> supplied = new Set<AbstractPackage>();
+        private Set<AbstractPackage> supplied = new HashSet<AbstractPackage>();
 
         private Enumerable<AbstractPackage> available_packages() {
             return 
@@ -66,7 +66,7 @@ namespace Usm {
 
     }
 
-    public class PackageSet : Set<AbstractPackage> {
+    public class PackageSet : HashSet<AbstractPackage> {
 
         public void add_from_file(string path) throws Error {
             add(new AbstractPackage.from_package(path));

+ 3 - 3
src/lib/Transaction.vala

@@ -72,8 +72,8 @@ namespace Usm {
             
             // Installation strategy
             install_lots = new Vector<Vector<CachedPackage>>();
-            var touched = new Set<CachedPackage>();
-            var available_resources = new Set<ResourceRef>();
+            var touched = new HashSet<CachedPackage>();
+            var available_resources = new HashSet<ResourceRef>();
             var round = 0;
             while(true) {
                 strategise_current_task = round * to_install.count();
@@ -114,7 +114,7 @@ namespace Usm {
 
             // Removal strategy
             remove_order = new Vector<CachedPackage>();
-            touched = new Set<CachedPackage>();
+            touched = new HashSet<CachedPackage>();
             Set<CachedPackageManifest> remaining_to_remove;
             try {
                 remaining_to_remove = to_remove