Browse Source

apt-get update works

Author: jgg
Date: 1998-11-11 23:45:08 GMT
apt-get update works
debian/1.8.y
Arch Librarian 18 years ago
parent
commit
0919e3f940
  1. 4
      apt-pkg/acquire.cc
  2. 7
      apt-pkg/pkgcachegen.cc
  3. 219
      cmdline/acqprogress.cc
  4. 36
      cmdline/acqprogress.h
  5. 38
      cmdline/apt-get.cc
  6. 2
      cmdline/makefile
  7. 16
      doc/Bugs

4
apt-pkg/acquire.cc

@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: acquire.cc,v 1.12 1998/11/11 07:30:55 jgg Exp $
// $Id: acquire.cc,v 1.13 1998/11/11 23:45:08 jgg Exp $
/* ######################################################################
Acquire - File Acquiration
@ -322,7 +322,7 @@ bool pkgAcquire::Run()
for (Queue *I = Queues; I != 0; I = I->Next)
I->Shutdown();
return _error->PendingError();
return !_error->PendingError();
}
/*}}}*/
// Acquire::Bump - Called when an item is dequeued /*{{{*/

7
apt-pkg/pkgcachegen.cc

@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: pkgcachegen.cc,v 1.20 1998/10/20 02:39:21 jgg Exp $
// $Id: pkgcachegen.cc,v 1.21 1998/11/11 23:45:28 jgg Exp $
/* ######################################################################
Package Cache Generator - Generator for the cache structure.
@ -385,7 +385,7 @@ bool pkgSrcCacheCheck(pkgSourceList &List)
return false;
string CacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
string ListDir = _config->FindFile("Dir::State::lists");
string ListDir = _config->FindDir("Dir::State::lists");
// Count the number of missing files
int Missing = 0;
@ -592,8 +592,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress)
if (SrcOk == false)
{
string SCacheFile = _config->FindFile("Dir::Cache::srcpkgcache");
string ListDir = _config->FindFile("Dir::State::lists");
string ListDir = _config->FindDir("Dir::State::lists");
FileFd SCacheF(SCacheFile,FileFd::WriteEmpty);
FileFd CacheF(CacheFile,FileFd::WriteEmpty);
DynamicMMap Map(CacheF,MMap::Public);

219
cmdline/acqprogress.cc

@ -0,0 +1,219 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: acqprogress.cc,v 1.1 1998/11/11 23:45:52 jgg Exp $
/* ######################################################################
Acquire Progress - Command line progress meter
##################################################################### */
/*}}}*/
// Include files /*{{{*/
#include "acqprogress.h"
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
#include <stdio.h>
#include <strutl.h>
/*}}}*/
// AcqTextStatus::AcqTextStatus - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
AcqTextStatus::AcqTextStatus(unsigned int ScreenWidth,unsigned int Quiet) :
ScreenWidth(ScreenWidth), Quiet(Quiet)
{
}
/*}}}*/
// AcqTextStatus::Start - Downloading has started /*{{{*/
// ---------------------------------------------------------------------
/* */
void AcqTextStatus::Start()
{
pkgAcquireStatus::Start();
BlankLine[0] = 0;
ID = 1;
};
/*}}}*/
// AcqTextStatus::IMSHit - Called when an item got a HIT response /*{{{*/
// ---------------------------------------------------------------------
/* */
void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
{
if (Quiet > 1)
return;
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
cout << "Hit " << Itm.Description;
if (Itm.Owner->FileSize != 0)
cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
cout << endl;
Update = true;
};
/*}}}*/
// AcqTextStatus::Fetch - An item has started to download /*{{{*/
// ---------------------------------------------------------------------
/* This prints out the short description and the expected size */
void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
{
Update = true;
if (Itm.Owner->Complete == true)
return;
Itm.Owner->ID = ID++;
if (Quiet > 1)
return;
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
cout << "Get:" << hex << Itm.Owner->ID << dec << ' ' << Itm.Description;
if (Itm.Owner->FileSize != 0)
cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
cout << endl;
};
/*}}}*/
// AcqTextStatus::Done - Completed a download /*{{{*/
// ---------------------------------------------------------------------
/* We don't display anything... */
void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
{
Update = true;
};
/*}}}*/
// AcqTextStatus::Fail - Called when an item fails to download /*{{{*/
// ---------------------------------------------------------------------
/* We print out the error text */
void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
{
if (Quiet > 1)
return;
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
cout << "Err " << Itm.Description << endl;
cout << " " << Itm.Owner->ErrorText << endl;
Update = true;
};
/*}}}*/
// AcqTextStatus::Stop - Finished downloading /*{{{*/
// ---------------------------------------------------------------------
/* This prints out the bytes downloaded and the overall average line
speed */
void AcqTextStatus::Stop()
{
pkgAcquireStatus::Stop();
if (Quiet > 1)
return;
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
if (FetchedBytes != 0)
cout << "Fetched " << SizeToStr(FetchedBytes) << " in " <<
TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) <<
"/s)" << endl;
}
/*}}}*/
// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
// ---------------------------------------------------------------------
/* This draws the current progress. Each line has an overall percent
meter and a per active item status meter along with an overall
bandwidth and ETA indicator. */
void AcqTextStatus::Pulse(pkgAcquire *Owner)
{
if (Quiet > 0)
return;
pkgAcquireStatus::Pulse(Owner);
enum {Long = 0,Medium,Short} Mode = Long;
char Buffer[300];
char *End = Buffer + sizeof(Buffer);
char *S = Buffer;
// Put in the percent done
sprintf(S,"%ld%%",long(double(CurrentBytes*100.0)/double(TotalBytes)));
for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
I = Owner->WorkerStep(I))
{
S += strlen(S);
// There is no item running
if (I->CurrentItem == 0)
{
if (I->Status.empty() == false)
snprintf(S,End-S," [%s]",I->Status.c_str());
continue;
}
// Add in the short description
if (I->CurrentItem->Owner->ID != 0)
snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,
I->CurrentItem->ShortDesc.c_str());
else
snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
S += strlen(S);
// Show the short mode string
if (I->CurrentItem->Owner->Mode != 0)
{
snprintf(S,End-S," %s",I->CurrentItem->Owner->Mode);
S += strlen(S);
}
// Add the current progress
if (Mode == Long)
snprintf(S,End-S," %u",I->CurrentSize);
else
{
if (Mode == Medium || I->TotalSize == 0)
snprintf(S,End-S," %s",SizeToStr(I->CurrentSize).c_str());
}
S += strlen(S);
// Add the total size and percent
if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
{
if (Mode == Short)
snprintf(S,End-S," %u%%",
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
else
snprintf(S,End-S,"/%s %u%%",SizeToStr(I->TotalSize).c_str(),
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
}
S += strlen(S);
snprintf(S,End-S,"]");
}
// Put in the ETA and cps meter
if (CurrentCPS != 0)
{
char Tmp[300];
unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
sprintf(Tmp," %s/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
unsigned int Len = strlen(Buffer);
unsigned int LenT = strlen(Tmp);
if (Len + LenT < ScreenWidth)
{
memset(Buffer + Len,' ',ScreenWidth - Len);
strcpy(Buffer + ScreenWidth - LenT,Tmp);
}
}
Buffer[ScreenWidth] = 0;
// Draw the current status
if (strlen(Buffer) == strlen(BlankLine))
cout << '\r' << Buffer << flush;
else
cout << '\r' << BlankLine << '\r' << Buffer << flush;
memset(BlankLine,' ',strlen(Buffer));
BlankLine[strlen(Buffer)] = 0;
Update = false;
}
/*}}}*/

36
cmdline/acqprogress.h

@ -0,0 +1,36 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: acqprogress.h,v 1.1 1998/11/11 23:45:55 jgg Exp $
/* ######################################################################
Acquire Progress - Command line progress meter
##################################################################### */
/*}}}*/
#ifndef ACQPROGRESS_H
#define ACQPROGRESS_H
#include <apt-pkg/acquire.h>
class AcqTextStatus : public pkgAcquireStatus
{
unsigned int ScreenWidth;
char BlankLine[300];
unsigned long ID;
unsigned long Quiet;
public:
virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
virtual void Fetch(pkgAcquire::ItemDesc &Itm);
virtual void Done(pkgAcquire::ItemDesc &Itm);
virtual void Fail(pkgAcquire::ItemDesc &Itm);
virtual void Start();
virtual void Stop();
void Pulse(pkgAcquire *Owner);
AcqTextStatus(unsigned int ScreenWidth,unsigned int Quiet);
};
#endif

38
cmdline/apt-get.cc

@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: apt-get.cc,v 1.5 1998/10/24 04:58:08 jgg Exp $
// $Id: apt-get.cc,v 1.6 1998/11/11 23:45:56 jgg Exp $
/* ######################################################################
apt-get - Cover for dpkg
@ -32,9 +32,12 @@
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/acquire-item.h>
#include <config.h>
#include "acqprogress.h"
#include <fstream.h>
/*}}}*/
@ -445,8 +448,36 @@ bool InstallPackages(pkgDepCache &Cache,bool ShwKept)
// DoUpdate - Update the package lists /*{{{*/
// ---------------------------------------------------------------------
/* */
bool DoUpdate(CommandLine &CmdL)
bool DoUpdate(CommandLine &)
{
// Get the source list
pkgSourceList List;
if (List.ReadMainList() == false)
return false;
// Create the download object
AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
pkgAcquire Fetcher(&Stat);
// Populate it with the source selection
pkgSourceList::const_iterator I;
for (I = List.begin(); I != List.end(); I++)
{
new pkgAcqIndex(&Fetcher,I);
if (_error->PendingError() == true)
return false;
}
// Run it
if (Fetcher.Run() == false)
return false;
// Prepare the cache.
CacheFile Cache;
if (Cache.Open() == false)
return false;
return true;
}
/*}}}*/
// DoUpgrade - Upgrade all packages /*{{{*/
@ -829,7 +860,8 @@ int main(int argc,const char *argv[])
{
if (strcmp(CmdL.FileList[0],Map[I].Match) == 0)
{
Map[I].Handler(CmdL);
if (Map[I].Handler(CmdL) == false && _error->PendingError() == false)
_error->Error("Handler silently failed");
break;
}
}

2
cmdline/makefile

@ -14,5 +14,5 @@ include $(PROGRAM_H)
# The apt-config program
PROGRAM=apt-get
SLIBS = -lapt-pkg
SOURCE = apt-get.cc
SOURCE = apt-get.cc acqprogress.cc
include $(PROGRAM_H)

16
doc/Bugs

@ -39,6 +39,7 @@
Status: The 0.3.0 ftp method should probably use the configuration mechanism
to control this desired behavoir.
#28373: apt package is missing information on ftp.conf
#29293: apt: Docs reference apt(8) but apt(8) not provided.
Summary: The man pages have references to several non-existent items,
ftp.conf is only one of them.
Status: Fix the man pages. This certainly will be done in 0.3.0
@ -87,7 +88,14 @@
Status: There is no place for this in the current apt-get design,
probably won't make the GUI either.
Wee, the new acquire code allows this, it now prints out 'Hit'
#26019: apt may report wrong line speed
#26433: apt: claims to fetch things it doesn't actually fetch (wishlist)
#28778: apt: apt's fetched message is wrong for update of packages files
Summary: APT includes the fetch time from the local cache in its
calculations
Status: Probably will be fixed with new acquire code
And it actually was fixed with the new acquire code
-- Silly things
#26592: apt: Problems with ftpd in SunOS 5.6
Summary: SunOS ftpd does not support the SIZE command
@ -100,12 +108,6 @@
#23934: apt-get source <package>
#27190: apt: installing source packages (wishlist)
Status: Impossible to do without an index file for all source archives.
#26019: apt may report wrong line speed
#26433: apt: claims to fetch things it doesn't actually fetch (wishlist)
#28778: apt: apt's fetched message is wrong for update of packages files
Summary: APT includes the fetch time from the local cache in its
calculations
Status: Probably will be fixed with new acquire code
#26663: rsync file access
Status: Unlikely, rsync does not provide the necessary support to be
a terribly good method. I do not intend any 'split mode'

Loading…
Cancel
Save