public:
- /** \brief Insert the given fetch request into this queue. */
- void Enqueue(ItemDesc &Item);
- // Put an item into this queue
++ /** \brief Insert the given fetch request into this queue.
++ *
++ * \return \b true if the queuing was successful. May return
++ * \b false if the Item is already in the queue
++ */
+ bool Enqueue(ItemDesc &Item);
+
+ /** \brief Remove all fetch requests for the given item from this queue.
+ *
+ * \return \b true if at least one request was removed from the queue.
+ */
bool Dequeue(Item *Owner);
- // Find a Queued item
+ /** \brief Locate an item in this queue.
+ *
+ * \param URI A URI to match against.
+ * \param Owner A pkgAcquire::Worker to match against.
+ *
+ * \return the first item in the queue whose URI is #URI and that
+ * is being downloaded by #Owner.
+ */
QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+
+ /** Presumably this should start downloading an item?
+ *
+ * \todo Unimplemented. Implement it or remove?
+ */
bool ItemStart(QItem *Itm,unsigned long Size);
+
+ /** \brief Remove the given item from this queue and set its state
+ * to pkgAcquire::Item::StatDone.
+ *
+ * If this is the only queue containing the item, the item is also
+ * removed from the main queue by calling pkgAcquire::Dequeue.
+ *
+ * \param Itm The item to remove.
+ *
+ * \return \b true if no errors are encountered.
+ */
bool ItemDone(QItem *Itm);
+ /** \brief Start the worker process associated with this queue.
+ *
+ * If a worker process is already associated with this queue,
+ * this is equivalent to calling Cycle().
+ *
+ * \return \b true if the startup was successful.
+ */
bool Startup();
+
+ /** \brief Shut down the worker process associated with this queue.
+ *
+ * \param Final If \b true, then the process is stopped unconditionally.
+ * Otherwise, it is only stopped if it does not need cleanup
+ * as indicated by the pkgAcqMethod::NeedsCleanup member of
+ * its configuration.
+ *
+ * \return \b true.
+ */
bool Shutdown(bool Final);
+
+ /** \brief Send idle items to the worker process.
+ *
+ * Fills up the pipeline by inserting idle items into the worker's queue.
+ */
bool Cycle();
+
+ /** \brief Check for items that could be enqueued.
+ *
+ * Call this after an item placed in multiple queues has gone from
+ * the pkgAcquire::Item::StatFetching state to the
+ * pkgAcquire::Item::StatIdle state, to possibly refill an empty queue.
+ * This is an alias for Cycle().
+ *
+ * \todo Why both this and Cycle()? Are they expected to be
+ * different someday?
+ */
void Bump();
+ /** \brief Create a new Queue.
+ *
+ * \param Name The name of the new queue.
+ * \param Owner The download process that owns the new queue.
+ */
Queue(string Name,pkgAcquire *Owner);
+
+ /** Shut down all the worker processes associated with this queue
+ * and empty the queue.
+ */
~Queue();
};
-apt (0.6.47) UNRELEASED; urgency=low
++apt (0.7.1) experimental; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ - only increase the score of installed applications if they
+ are not obsolete
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ * methods/cdrom.cc:
+ - only umount if it was mounted by the method before
+ * po/gl.po:
+ - fix error translation that causes trouble to lsb_release
+ * apt-pkg/acquire-item.cc:
+ - if decompression of a index fails, delete the index
- * [ABI] apt-pkg/acquire.{cc,h}:
++ * apt-pkg/acquire.{cc,h}:
+ - deal better with duplicated sources.list entries (avoid
+ double queuing of URLs) - this fixes hangs in bzip/gzip
+ * merged from Christian Perrier:
+ * mr.po: New Marathi translation Closes: #416806
+ * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * tl.po: Updated by Eric Pareja Closes: #416638
+ * gl.po: Updated by Jacobo Tarrio
+ Closes: #412828
+ * da.po: Updated by Claus Hindsgaul
+ Closes: #409483
+ * fr.po: Remove a non-breakable space for usability
+ issues. Closes: #408877
+ * ru.po: Updated Russian translation. Closes: #405476
+ * *.po: Unfuzzy after upstream typo corrections
+ * apt-pkg/policy.cc:
+ - allow multiple packages (thanks to David Foerster)
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
++
++ -- Michael Vogt <mvo@debian.org> Wed, 2 May 2007 13:43:44 +0200
++
+apt (0.7.0) experimental; urgency=low
+
+ * Package that contains tall the new features
+ * Removed all #pragma interface/implementation
+ * Branch that contains tall the new features:
+ * translated package descriptions
+ * task install support
+ * automatic dependency removal (thanks to Daniel Burrows)
+ * merged support for the new dpkg "Breaks" field
+ (thanks to Ian Jackson)
+ * handle network failures more gracefully on "update"
+ * support for unattended-upgrades (via unattended-upgrades
+ package)
+ * added apt-transport-https method
+
+ -- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
- apt (0.6.46.5) UNRELEASED; urgency=low
-
- * apt-pkg/algorithm.cc:
- - use clog for all debugging
- - only increase the score of installed applications if they
- are not obsolete
- - fix resolver bug on removal triggered by weak-dependencies
- with or-groups
- * methods/http.cc:
- - send apt version in User-Agent
- * apt-pkg/deb/debrecords.cc:
- - fix SHA1Hash() return value
+ apt (0.6.46.4-0.1) unstable; urgency=emergency
+
+ * NMU
+ * Fix broken use of awk in apt-key that caused removal of the wrong keys
+ from the keyring. Closes: #412572
- -- Michael Vogt <mvo@debian.org> Thu, 14 Dec 2006 11:31:41 +0100
+ -- Joey Hess <joeyh@debian.org> Mon, 26 Feb 2007 16:00:22 -0500
apt (0.6.46.4) unstable; urgency=high
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
++#: apt-pkg/pkgcachegen.cc:819
#, c-format
msgid "Unable to write to %s"
msgstr ""
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
+#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
- #: apt-pkg/pkgcachegen.cc:947
++#: apt-pkg/pkgcachegen.cc:947 apt-pkg/pkgcachegen.cc:752
++#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
++#: apt-pkg/pkgcachegen.cc:949
msgid "Reading package lists"
msgstr ""
msgid "Wrong CD-ROM"
msgstr ""
- #: methods/cdrom.cc:164
-#: methods/cdrom.cc:166
++#: methods/cdrom.cc:164 methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
- #: methods/cdrom.cc:169
-#: methods/cdrom.cc:171
++#: methods/cdrom.cc:169 methods/cdrom.cc:171
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
++#: methods/cdrom.cc:179
msgid "File not found"
msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
++#: methods/http.cc:958
msgid "Problem hashing file"
msgstr ""
msgid "Read error from %s process"
msgstr ""
- #: methods/http.cc:375
-#: methods/http.cc:377
++#: methods/http.cc:375 methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
- #: methods/http.cc:521
-#: methods/http.cc:523
++#: methods/http.cc:521 methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
- #: methods/http.cc:529
-#: methods/http.cc:531
++#: methods/http.cc:529 methods/http.cc:530
msgid "Bad header line"
msgstr ""
- #: methods/http.cc:548 methods/http.cc:555
-#: methods/http.cc:550 methods/http.cc:557
++#: methods/http.cc:548 methods/http.cc:555 methods/http.cc:549
++#: methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
- #: methods/http.cc:584
-#: methods/http.cc:586
++#: methods/http.cc:584 methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
- #: methods/http.cc:599
-#: methods/http.cc:601
++#: methods/http.cc:599 methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
- #: methods/http.cc:601
-#: methods/http.cc:603
++#: methods/http.cc:601 methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
- #: methods/http.cc:625
-#: methods/http.cc:627
++#: methods/http.cc:625 methods/http.cc:626
msgid "Unknown date format"
msgstr ""
- #: methods/http.cc:772
-#: methods/http.cc:774
++#: methods/http.cc:772 methods/http.cc:773
msgid "Select failed"
msgstr ""
- #: methods/http.cc:777
-#: methods/http.cc:779
++#: methods/http.cc:777 methods/http.cc:778
msgid "Connection timed out"
msgstr ""
- #: methods/http.cc:800
-#: methods/http.cc:802
++#: methods/http.cc:800 methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
- #: methods/http.cc:831
-#: methods/http.cc:833
++#: methods/http.cc:831 methods/http.cc:832
msgid "Error writing to file"
msgstr ""
- #: methods/http.cc:859
-#: methods/http.cc:861
++#: methods/http.cc:859 methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
- #: methods/http.cc:873
-#: methods/http.cc:875
++#: methods/http.cc:873 methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
- #: methods/http.cc:875
-#: methods/http.cc:877
++#: methods/http.cc:875 methods/http.cc:876
msgid "Error reading from server"
msgstr ""
- #: methods/http.cc:1106
-#: methods/http.cc:1108
++#: methods/http.cc:1106 methods/http.cc:1107
msgid "Bad header data"
msgstr ""
- #: methods/http.cc:1123
-#: methods/http.cc:1125
++#: methods/http.cc:1123 methods/http.cc:1124
msgid "Connection failed"
msgstr ""
- #: methods/http.cc:1214
-#: methods/http.cc:1216
++#: methods/http.cc:1214 methods/http.cc:1215
msgid "Internal error"
msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
- #: apt-pkg/algorithms.cc:245
-#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245 apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
- #: apt-pkg/algorithms.cc:1075
-#: apt-pkg/algorithms.cc:1066
++#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1104
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
- #: apt-pkg/algorithms.cc:1077
-#: apt-pkg/algorithms.cc:1068
++#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1106
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
#. only show the ETA if it makes sense
#. two days
--#: apt-pkg/acquire.cc:823
++#: apt-pkg/acquire.cc:823 apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
--#: apt-pkg/acquire.cc:825
++#: apt-pkg/acquire.cc:825 apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
--#: apt-pkg/acquire-worker.cc:377
++#: apt-pkg/acquire-worker.cc:377 apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
--#: apt-pkg/policy.cc:269
++#: apt-pkg/policy.cc:269 apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
--#: apt-pkg/policy.cc:291
++#: apt-pkg/policy.cc:291 apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
--#: apt-pkg/policy.cc:299
++#: apt-pkg/policy.cc:299 apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:681
-#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681 apt-pkg/pkgcachegen.cc:682
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
- #: apt-pkg/pkgcachegen.cc:765
-#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765 apt-pkg/pkgcachegen.cc:767
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
++#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
msgid "IO Error saving source cache"
msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
- #: apt-pkg/acquire-item.cc:1402
++#: apt-pkg/acquire-item.cc:1402 apt-pkg/acquire-item.cc:409
++#: apt-pkg/acquire-item.cc:666 apt-pkg/acquire-item.cc:1416
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/acquire-item.cc:1097
+msgid "There are no public key available for the following key IDs:\n"
msgstr ""
- #: apt-pkg/acquire-item.cc:1210
-#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210 apt-pkg/acquire-item.cc:1224
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
- #: apt-pkg/acquire-item.cc:1269
-#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269 apt-pkg/acquire-item.cc:1283
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
- #: apt-pkg/acquire-item.cc:1305
-#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305 apt-pkg/acquire-item.cc:1319
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
- #: apt-pkg/acquire-item.cc:1392
-#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392 apt-pkg/acquire-item.cc:1406
msgid "Size mismatch"
msgstr ""
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:649
+#: apt-pkg/cdrom.cc:673
#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
msgstr ""
- #: apt-pkg/cdrom.cc:737
-#: apt-pkg/cdrom.cc:714
++#: apt-pkg/cdrom.cc:737 apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr ""
- #: apt-pkg/cdrom.cc:753
-#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:753 apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
- #: apt-pkg/cdrom.cc:757
-#: apt-pkg/cdrom.cc:734
++#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr ""
- #: apt-pkg/cdrom.cc:783
-#: apt-pkg/cdrom.cc:758
++#: apt-pkg/cdrom.cc:783 apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr ""
- #: apt-pkg/cdrom.cc:792
-#: apt-pkg/cdrom.cc:767
++#: apt-pkg/cdrom.cc:792 apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr ""
- #: apt-pkg/cdrom.cc:832
-#: apt-pkg/cdrom.cc:810
++#: apt-pkg/cdrom.cc:832 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM..."
msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
- #: apt-pkg/acquire-item.cc:1097
+
++#: apt-pkg/acquire-item.cc:1097 apt-pkg/acquire-item.cc:1111
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
++
++#: apt-pkg/pkgcache.cc:226
++msgid "Breaks"
++msgstr ""
projects / apt.git / commitdiff
