id is the column in bug which has the bug number, not id

[debbugs.git] / bin / debbugs-loadsql

diff --git a/bin/debbugs-loadsql b/bin/debbugs-loadsql
index 302d3d649f8d0880be1d5af7091d00af14c8b0b7..9597447aaf0997c8e01efbd0ee2848fbce462d41 100755 (executable)
--- a/bin/debbugs-loadsql
+++ b/bin/debbugs-loadsql
@@ -357,10 +357,11 @@ sub add_versions {
             $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;
+            last if not defined $sp;
             my $sv = $s->resultset('SrcVer')->find({src_pkg=>$sp,
                                                     ver => $versions[$i][1],
                                                    });
+           last if not defined $sv;
             if (defined $ancestor_sv and defined $sv and not defined $sv->based_on()) {
                 $sv->update({based_on => $ancestor_sv})
             }
@@ -560,8 +561,10 @@ sub add_logs {
                       next;
                   }
                   if ($options{quick}) {
-                      my $rs = $s->resultset('Bug')->search({bug=>$bug})->single();
-                      next if defined $rs and $stat->mtime <= $rs->last_modified()->epoch();
+                      my $rs = $s->resultset('Bug')->
+                         search({id=>$bug})->single();
+                      next if defined $rs and
+                         $stat->mtime <= $rs->last_modified()->epoch();
                   }
                   eval {
                       load_bug_log(db => $s,