Ignored missing release files

Author: jgg
Date: 1999-01-31 22:25:34 GMT
Ignored missing release files

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 0883c296d27edfaa00a5c951f384c4009573afc1..e64190078e0c080eb2154e92d9864f2970507aa9 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.cc,v 1.20 1999/01/30 08:08:54 jgg Exp $
+// $Id: acquire-item.cc,v 1.21 1999/01/31 22:25:34 jgg Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -64,12 +64,12 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
          StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
       {
         Status = StatIdle;
          StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
       {
         Status = StatIdle;

-        Owner->Dequeue(this);
+        Dequeue();

         return;
       }
       
       Status = StatError;
         return;
       }
       
       Status = StatError;

-      Owner->Dequeue(this);
+      Dequeue();

    }   
 }
                                                                        /*}}}*/
    }   
 }
                                                                        /*}}}*/


@@ -329,6 +329,23 @@ string pkgAcqIndexRel::Describe()
    return Location->ReleaseURI();
 }
                                                                        /*}}}*/
    return Location->ReleaseURI();
 }
                                                                        /*}}}*/

+// AcqIndexRel::Failed - Silence failure messages for missing rel files        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void pkgAcqIndexRel::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+{
+   // This is the retry counter
+   if (Cnf->LocalOnly == true || 
+       StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
+   {      
+      Status = StatIdle;
+      Dequeue();
+      return;
+   }
+   
+   Item::Failed(Message,Cnf);
+}
+                                                                       /*}}}*/

 
 // AcqArchive::AcqArchive - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 
 // AcqArchive::AcqArchive - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 8b6889c4d5bc47c1065f78d54a710341b1ec401c..4429b1ceb8cef4cf1ac516cf36ded10be729564a 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-item.h,v 1.14 1999/01/30 08:08:54 jgg Exp $
+// $Id: acquire-item.h,v 1.15 1999/01/31 22:25:34 jgg Exp $

 /* ######################################################################
 
    Acquire Item - Item to acquire
 /* ######################################################################
 
    Acquire Item - Item to acquire


@@ -36,6 +36,7 @@ class pkgAcquire::Item
    pkgAcquire *Owner;
    inline void QueueURI(ItemDesc &Item)
                  {Owner->Enqueue(Item);};
    pkgAcquire *Owner;
    inline void QueueURI(ItemDesc &Item)
                  {Owner->Enqueue(Item);};

+   inline void Dequeue() {Owner->Dequeue(this);};

    
    void Rename(string From,string To);
    
    
    void Rename(string From,string To);
    


@@ -97,6 +98,7 @@ class pkgAcqIndexRel : public pkgAcquire::Item
    
    public:
    
    
    public:
    

+   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);

    virtual void Done(string Message,unsigned long Size,string Md5Hash);   
    virtual string Custom600Headers();
    virtual string Describe();
    virtual void Done(string Message,unsigned long Size,string Md5Hash);   
    virtual string Custom600Headers();
    virtual string Describe();

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 99e8fd9c3ea4e8a68bff216ad94f9db84110d8af..7b23f308984acbabcdb1f018b4e4474b827a65b6 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acqprogress.cc,v 1.7 1999/01/27 02:48:53 jgg Exp $
+// $Id: acqprogress.cc,v 1.8 1999/01/31 22:25:34 jgg Exp $

 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 


@@ -93,8 +93,16 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    

-   cout << "Err " << Itm.Description << endl;
-   cout << "  " << Itm.Owner->ErrorText << endl;
+   if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
+   {
+      cout << "Ign " << Itm.Description << endl;
+   }
+   else
+   {
+      cout << "Err " << Itm.Description << endl;
+      cout << "  " << Itm.Owner->ErrorText << endl;
+   }
+   

    Update = true;
 };
                                                                        /*}}}*/
    Update = true;
 };
                                                                        /*}}}*/