From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 8 Aug 2017 23:41:19 +0000 (-0700)
Subject: use get_src_pkg_id when loading versions
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=44f9d39d67b0bc749038757e9a6291133ba266f6

use get_src_pkg_id when loading versions
---

diff --git a/bin/debbugs-loadsql b/bin/debbugs-loadsql
index ab1dd83..302d3d6 100755
--- a/bin/debbugs-loadsql
+++ b/bin/debbugs-loadsql
@@ -351,19 +351,20 @@ sub add_versions {
             my $sp;
             if (not defined $src_pkgs{$versions[$i][0]}) {
                 $src_pkgs{$versions[$i][0]} =
-                    $s->resultset('SrcPkg')->find_or_create({pkg => $versions[$i][0]});
+                    $s->resultset('SrcPkg')->
+		    get_src_pkg_id($versions[$i][0]);
             }
             $sp = $src_pkgs{$versions[$i][0]};
             # There's probably something wrong if the source package
             # doesn't exist, but we'll skip it for now
             next unless defined $sp;
-            my $sv = $s->resultset('SrcVer')->find({src_pkg=>$sp->id(),
+            my $sv = $s->resultset('SrcVer')->find({src_pkg=>$sp,
                                                     ver => $versions[$i][1],
                                                    });
             if (defined $ancestor_sv and defined $sv and not defined $sv->based_on()) {
-                $sv->update({based_on => $ancestor_sv->id()})
+                $sv->update({based_on => $ancestor_sv})
             }
-            $ancestor_sv = $sv;
+            $ancestor_sv = $sv->id();
         }
         $p->update() if $p;
     }