From fa2bca9de5acabcfcf782702450937a978b48c37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Nov 2006 07:16:12 +0100 Subject: * changelog updated to match latest debian upload --- debian/changelog | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 887d2f254..5cdfc9d02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,24 @@ apt (0.6.46.3) unstable; urgency=low - make progress reporting robust against multiline error messages - -- + * Merged from Christian Perrier bzr branch: + - ca.po: Updated to 514t + - be.po: Updated to 514t + - it.po: Updated to 514t + - hu.po: Updated to 514t + - zh_TW.po: Updated to 514t + - ar.po: Updated to 293t221u. + - ru.po: Updated to 514t. Closes: #392466 + - nb.po: Updated to 514t. Closes: #392466 + - pt.po: Updated to 514t. Closes: #393199 + - fr.po: One spelling error corrected: s/accèder/accéder + - km.po: Updated to 514t. + - ko.po: Updated to 514t. + - bg.po: Updated to 514t. + - de.po: Updated to 514t. + - en_GB.po: Updated to 514t. + + -- Michael Vogt Thu, 2 Nov 2006 11:37:58 +0100 apt (0.6.46.2) unstable; urgency=low -- cgit v1.2.3 From 14127f180b86c2290abf3653cd4b4d5972a1177e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Nov 2006 08:04:38 +0100 Subject: * mention apt-secure in apt.8 and apt-apt.8 --- debian/changelog | 6 ++++++ doc/apt-get.8.xml | 2 +- doc/apt.8 | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5cdfc9d02..24e10dcd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.46.4) unstable; urgency=low + + * add apt-secure.8 to "See also" section + + -- + apt (0.6.46.3) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b98d58737..451806e7b 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -467,7 +467,7 @@ See Also &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, - &apt-conf;, &apt-config;, + &apt-conf;, &apt-config;, &apt-secure; The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto. diff --git a/doc/apt.8 b/doc/apt.8 index 3fb214a3b..671fe9c5b 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -33,6 +33,7 @@ None. .BR apt-get (8), .BR apt.conf (5), .BR sources.list (5) +.BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. .SH BUGS -- cgit v1.2.3 From 65d71b381cc326bdf5310d8a2ea5b3f0d0307f63 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Nov 2006 08:12:02 +0100 Subject: * added missing "," --- doc/apt-get.8.xml | 2 +- doc/apt.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 451806e7b..17f663a35 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -467,7 +467,7 @@ See Also &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, - &apt-conf;, &apt-config;, &apt-secure; + &apt-conf;, &apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto. diff --git a/doc/apt.8 b/doc/apt.8 index 671fe9c5b..6f39c5387 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -32,7 +32,7 @@ None. .BR apt-cache (8), .BR apt-get (8), .BR apt.conf (5), -.BR sources.list (5) +.BR sources.list (5), .BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. -- cgit v1.2.3 From c70496f94c8a16072b0b7a7906dec4b1aa4f306e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Nov 2006 12:07:06 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg --- apt-pkg/deb/dpkgpm.cc | 23 ++++++++++++++++------- debian/changelog | 5 ++++- doc/examples/configure-index | 4 ++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c7a6b921f..3204fc1bb 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -711,14 +711,23 @@ bool pkgDPkgPM::Go(int OutStatusFd) // Check for an error code. if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) { - RunScripts("DPkg::Post-Invoke"); - if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) - return _error->Error("Sub-process %s received a segmentation fault.",Args[0]); - - if (WIFEXITED(Status) != 0) - return _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + // if it was set to "keep-dpkg-runing" then we won't return + // here but keep the loop going and just report it as a error + // for later + bool stopOnError = _config->FindB("Dpkg::StopOnError",true); - return _error->Error("Sub-process %s exited unexpectedly",Args[0]); + if(stopOnError) + RunScripts("DPkg::Post-Invoke"); + + if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) + _error->Error("Sub-process %s received a segmentation fault.",Args[0]); + else if (WIFEXITED(Status) != 0) + _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + else + _error->Error("Sub-process %s exited unexpectedly",Args[0]); + + if(stopOnError) + return false; } } diff --git a/debian/changelog b/debian/changelog index 24e10dcd5..8da0d6471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ apt (0.6.46.4) unstable; urgency=low - * add apt-secure.8 to "See also" section + * added apt-secure.8 to "See also" section + * apt-pkg/deb/dpkgpm.cc: + - added "Dpkg::StopOnError" variable that controls if apt + will abort on errors from dpkg -- diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0f0abc30c..73e20aa43 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -237,6 +237,10 @@ DPkg // Control the size of the command line passed to dpkg. MaxBytes 1024; MaxArgs 350; + + // controls if apt will apport on the first dpkg error or if it + // tries to install as many packages as possible + StopOnError "true"; } /* Options you can set to see some debugging text They correspond to names -- cgit v1.2.3 From 4ab24e53db1d39cd26072f03795efd0f6425a369 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Nov 2006 15:06:28 +0100 Subject: * apt-pkg/deb/debsrcrecords.{cc,h}: - make the buffer dynmaic --- apt-pkg/deb/debsrcrecords.cc | 28 +++++++++------------------- apt-pkg/deb/debsrcrecords.h | 10 +++++----- debian/changelog | 2 ++ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index cac36c2e6..17645a5ac 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -18,6 +18,8 @@ #include #include #include + +using std::max; /*}}}*/ // SrcRecordParser::Binaries - Return the binaries field /*{{{*/ @@ -34,31 +36,19 @@ const char **debSrcRecordParser::Binaries() if (Bins.empty() == true || Bins.length() >= 102400) return 0; - // Workaround for #236688. Only allocate a new buffer if the field - // is large, to avoid a performance penalty - char *BigBuf = NULL; - char *Buf; - if (Bins.length() > sizeof(Buffer)) - { - BigBuf = new char[Bins.length()]; - Buf = BigBuf; - } - else + if (Bins.length() > BufSize) { - Buf = Buffer; + delete [] Buffer; + // allocate new size based on buffer (but never smaller than 4000) + BufSize = max((unsigned long)4000, max(Bins.length()+1,2*BufSize)); + Buffer = new char[BufSize]; } - strcpy(Buf,Bins.c_str()); - if (TokSplitString(',',Buf,StaticBinList, + strcpy(Buffer,Bins.c_str()); + if (TokSplitString(',',Buffer,StaticBinList, sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false) - { - if (BigBuf != NULL) - delete BigBuf; return 0; - } - if (BigBuf != NULL) - delete BigBuf; return (const char **)StaticBinList; } /*}}}*/ diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index f899993df..f4e2cb46c 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -24,9 +24,10 @@ class debSrcRecordParser : public pkgSrcRecords::Parser FileFd Fd; pkgTagFile Tags; pkgTagSection Sect; - char Buffer[10000]; char *StaticBinList[400]; unsigned long iOffset; + char *Buffer; + unsigned long BufSize; public: @@ -49,10 +50,9 @@ class debSrcRecordParser : public pkgSrcRecords::Parser }; virtual bool Files(vector &F); - debSrcRecordParser(string File,pkgIndexFile const *Index) : - Parser(Index), - Fd(File,FileFd::ReadOnly), - Tags(&Fd,102400) {}; + debSrcRecordParser(string File,pkgIndexFile const *Index) + : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), + Buffer(0), BufSize(0) {} }; #endif diff --git a/debian/changelog b/debian/changelog index 8da0d6471..a3cb3028a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.6.46.4) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg + * apt-pkg/deb/debsrcrecords.{cc,h}: + - make the Buffer dynmaic -- -- cgit v1.2.3 From d295f24c56451438dd77a8e0b7abd7ed4c85d7a4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Dec 2006 13:06:07 +0100 Subject: * apt-pkg/deb/debsrcrecords.cc: - fix off-by-one problem --- apt-pkg/deb/debsrcrecords.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 17645a5ac..e1c6427e8 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -36,7 +36,7 @@ const char **debSrcRecordParser::Binaries() if (Bins.empty() == true || Bins.length() >= 102400) return 0; - if (Bins.length() > BufSize) + if (Bins.length() >= BufSize) { delete [] Buffer; // allocate new size based on buffer (but never smaller than 4000) -- cgit v1.2.3 From 0752f8fd5ef0bef11721f2c96211fa852aab316d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Dec 2006 14:27:02 +0100 Subject: * changelog updated --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a3cb3028a..29e64bad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ apt (0.6.46.4) unstable; urgency=low - added "Dpkg::StopOnError" variable that controls if apt will abort on errors from dpkg * apt-pkg/deb/debsrcrecords.{cc,h}: - - make the Buffer dynmaic + - make the Buffer grow dynmaically (closes: #400874) -- -- cgit v1.2.3 From f88137b8972f57c52bbadf54a80932f225562a95 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Dec 2006 14:30:19 +0100 Subject: * changelog updates --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 29e64bad7..ac13357ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ apt (0.6.46.4) unstable; urgency=low will abort on errors from dpkg * apt-pkg/deb/debsrcrecords.{cc,h}: - make the Buffer grow dynmaically (closes: #400874) + * Merged from Christian Perrier bzr branch: + - uk.po: New Ukrainian translation: 483t28f3u + - el.po: Update to 503t9f2u + - de.po: Updates and corrections. -- -- cgit v1.2.3