Re: Release-critical Bugreport for May 26, 2000

[Daniel Burrows <Daniel_Burrows@brown.edu>]

On Fri, May 26, 2000 at 09:48:06AM -0400, Daniel Burrows <Daniel_Burrows@brown.edu> was heard to say:
> On Fri, May 26, 2000 at 07:42:20AM -0500, BugScan reporter <bugscan@debian.org> was heard to say:
> > Package: aptitude (debian/main)
> > Maintainer: Adam Heath <doogie@debian.org>
> >   64518  aptitude aborts when apting local files
> 
>   On this right now.

  Ok, I believe that the attached patch (committed to CVS) fixes this in both
0.0.4a and 0.0.7.  Adam (or someone else, I'm not picky :) ), please apply it
and re-upload 0.0.4a.

  If you can apply the patch for #61315 at the same time, I would really
appreciate it; #61315 (which is just a dumb typo) could have bad implications
for people with read-only root partitions, and could allow someone to
accidentally run aptitude in update mode and apt-get in update mode at the
same time (this seems to work in my own tests but probably isn't a great idea)
-- IMO, of the two bugs, #61315 really should have been RC.

   Thanks,
  Daniel

-- 
/----------------- Daniel Burrows <Daniel_Burrows@brown.edu> -----------------\
|      If you're reading     |      "Do you know why the prisoner in the      |
|     this, you have too     |       tower watches the flight of birds?"      |
|       much free time.      |        -- Terry Pratchett, _Reaper_Man_        |
\----------------- The Turtle Moves! -- http://www.lspace.org ----------------/

? aptitude-0.0.3.tar.gz
? aptitude-0.0.5.tar.gz
? aptitude-0.0.6.tar.gz
? aptitude-0.0.6a.tar.gz
? aptitude-0.0.6.9.tar.gz
? aptitude-0.0.7.tar.gz
? src/Makefile.in
? src/Makefile
? src/.deps
? src/lock
? src/aptitude
? src/generic/Makefile
? src/generic/.deps
? src/generic/Makefile.in
? src/vscreen/Makefile
? src/vscreen/Makefile.in
? src/vscreen/.deps
? src/vscreen/config/Makefile.in
? src/vscreen/config/Makefile
? src/vscreen/config/.deps
Index: src/download_screen.cc
===================================================================
RCS file: /cvsroot/aptitude/aptitude/src/download_screen.cc,v
retrieving revision 1.30
diff -u -r1.30 download_screen.cc
--- src/download_screen.cc	2000/05/26 13:40:13	1.30
+++ src/download_screen.cc	2000/05/26 16:12:10
@@ -82,10 +82,21 @@
 void download_screen::Done(pkgAcquire::ItemDesc &itmdesc)
 {
   CRITICAL_ENTER
-  download_item *itm=get_itm(itmdesc);
 
-  itm->download_done(false);
-  itm->set_worker(NULL);
+  downloadmap::iterator found=active_items.find(itmdesc.Owner);
+  if(found==active_items.end())
+    {
+      download_item *newitm=new download_item(itmdesc);
+      newitm->download_done(false);
+      contents->add_child(newitm);
+      sync_bounds();
+    }
+  else
+    {
+      found->second->download_done(false);
+      found->second->set_worker(NULL);
+    }
+
   repaint();
   refresh();
   CRITICAL_EXIT