The branch, iwj has been created
at ded146cbed75ce5872a31663eee299eae040de5b (commit)
- Shortlog ------------------------------------------------------------
commit ded146cbed75ce5872a31663eee299eae040de5b
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 13:14:48 2008 +0000
Fix missing angle bracket in Swedish po file.
commit 1266ec954c7639eb6c26df84a1fa771936270cbf
Merge: 335c924bc22013ff5d0a266ef6cd4ae641a7e0a5
295b35f197ccc4fa28f097845b2314c5ded1169f
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 12:52:25 2008 +0000
Merge branch 'triggers-merge-base' of ../dpkg-alioth into triggers
Not built or tested yet, but committing early.
Conflicts:
debian/changelog
debian/control
debian/dpkg.install
lib/dbmodify.c
lib/showpkg.c
lib/tarfn.c
src/Makefile.am
src/archives.c
src/configure.c
commit 295b35f197ccc4fa28f097845b2314c5ded1169f
Merge: 116cc8d1c9d8d583746b0b575645bd3399607dcb
13c3738f707aa705c8b0f395d6fbcd2da770f364
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 12:20:32 2008 +0000
Merge /work/Dpkg-git/dpkg.base into triggers-merge-base
Conflicts:
ChangeLog
debian/changelog
commit 116cc8d1c9d8d583746b0b575645bd3399607dcb
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 12:08:13 2008 +0000
Fix formatting of a few files. Closes: #375711.
Cherry pick of e189995f22a55160420a339f22c30c3356985010
from triggers branch.
Conflicts:
commit be73044f3714040a41c9fa677ee347a195c3ae6e
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 10:58:44 2008 +0000
Properly fix struct stat compilation warning
This reverts commit 9bcc24992c7f61ba5ad230f9214554d90dde574f.
Instead, we #include <sys/stat.h>.
commit 4138fce81ba3bcc0349798dc46e4468afc408d13
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Mar 8 00:08:12 2008 +0000
Revert "Use NULL instead of 0"
This reverts commit 02680ecbbbf6da2b023891a11b38ecce5346dbbd.
As previously discussed, many uses of 0 are essential and replacing
them with NULL is wrong. And changing the coding style of substantial
existing bodies of code is bad too.
For simplicity, I have had git revert this commit rather than
unpicking it.
Conflicts fixed up in:
src/main.c
utils/start-stop-daemon.c
ChangeLog remains unchanged, as it's silly to maintain.
commit 335c924bc22013ff5d0a266ef6cd4ae641a7e0a5
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Mar 7 23:45:16 2008 +0000
Use %zu for printing pathlen (a size_t)
commit 0851023855a4317f2f13ce159878f37e4c099ec2
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 31 15:37:48 2007 +0000
* Run prerms during removal even if the package is in a trig* state.
commit 2364dc897290c8111161cd64d81f375327a469b4
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 24 22:35:01 2007 +0100
Slightly improve usage message for --no-triggers (thanks Raphael)
commit 33325aca5470bd04cb4bc770b9d8e323831688e6
Merge: da517d03a69942016d3e90fd6fbbf462645109e4
13c3738f707aa705c8b0f395d6fbcd2da770f364
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 24 18:24:10 2007 +0100
Merge ../dpkg.base
commit 13c3738f707aa705c8b0f395d6fbcd2da770f364
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 24 18:23:36 2007 +0100
Reapply "Remove duplicate nested conditional" etc.
This patch reapplies 826db4452b743ddf206662dc17cec5f097836933
following the reversion of ca909d6711804e51f48415d31aa2fc630943cd03.
commit 2791b4ca7f567e46a2fef779aa864afd4ccbe3d2
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 24 18:19:27 2007 +0100
Revert "Fix .... failed remove resulting in installed state"
This reverts commit ca909d6711804e51f48415d31aa2fc630943cd03.
commit 5565fa44ca4432f40f50abb0f7cb1d9e1f791e29
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Wed Oct 24 18:14:33 2007 +0100
Revert to untangle ``Remove duplicate nested conditional ...''
This reverts commit 826db4452b743ddf206662dc17cec5f097836933.
I will reapply it after reverting Brian Carlson's conflicting change.
commit da517d03a69942016d3e90fd6fbbf462645109e4
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Sep 21 19:21:38 2007 +0100
dpkg (1.14.5ubuntu16) gutsy; urgency=low
* Fix some portability problems revealed by compiler warnings:
- missing <dpkg.h> in tarfn.c, implicit declaration of m_malloc
- missing cast for %ld ohshite at info.c:98
- unused yyunput (missing %option nounput) in trigdeferred.l
-- Ian Jackson <[EMAIL PROTECTED]> Fri, 21 Sep 2007 19:03:36 +0100
commit 5f257738544e96542948c959b426ce7ef7b69cd7
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Thu Sep 20 18:40:47 2007 +0100
dpkg (1.14.5ubuntu15) gutsy; urgency=low
* Bugfixes to fd cleanup handling:
- avoid closing fsys tarfile pipe twice even in normal
operation - normally EBADF but might sometimes close some other
desired fd and cause hideous doom. (LP: #137191.)
- avoid duplicate attempts to [f]close in obscure error
situations which might conceiveably close wrong fds
- cast &fd to void* when passing to push_cleanup cu_closefd
- fix parse.c:parsedb to use ehflag_normaltidy in a sane way
- when passing &fd to push_cleanup cu_closefd, make fd always static
* Bugfix in trigger deferred file processing: reset lexer start state
when calling yyrestart (has no effect except after parsing/reading
errors in the deferred file).
* Fix some error handling bugs in tarfn.c:
- Avoid freeing uninitialised h.[Link]Name (can cause crash if .deb
becomes unreadable while we start up). (LP: #138887.)
- Use m_malloc instead of malloc (and ditch ad-hoc error handling).
-- Ian Jackson <[EMAIL PROTECTED]> Thu, 20 Sep 2007 18:12:20 +0100
commit 1620746b018cec348e2b505673bc277430d9a801
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Thu Sep 20 14:33:48 2007 +0100
dpkg (1.14.5ubuntu14) gutsy; urgency=low
* Change syntax of `processing:...' status fd outputs so
as to avoid crashing apt's lame parser.
-- Ian Jackson <[EMAIL PROTECTED]> Tue, 18 Sep 2007 17:14:31 +0100
commit 9ed9425849777645e0eb9a34795a03a3bf3e5b40
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Tue Sep 18 14:32:18 2007 +0100
+ dpkg (1.14.5ubuntu13) gutsy; urgency=low
+
+ * Changes to --status-fd and logging, motivated by the need to
+ fix apt's progress reporting in the presence of triggers:
+ - Call log_action for trigger processing and configuration.
+ - Produce processing: output on --status-fd for start of
+ processing operations (from log_action).
+ - Consolidate clone-and-hack --status-fd output writing into
+ routine statusfd_send[v].
+ - Improve documentation of --status-fd output.
+ - Add log message at start of archivefiles() and packages()
+ (which will assist debugging).
+ - For upgrade, call log_message after printing to stderr,
+ as is done elsewhere.
+ In the longer term --status-fd output ought probably to be made
+ identical to the log output which is richer and more sanely
+ formatted.
+
+ -- Ian Jackson <[EMAIL PROTECTED]> Tue, 18 Sep 2007 14:13:07 +0100
+
commit 45b5781ae99fc7289cd4041ac37e95971098b5e7
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Aug 25 16:38:42 2007 +0100
remove unused variable f_verbose
commit ee4bd47c7a74266295d50cc405111f8bc46f3eb2
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Sat Aug 25 16:36:32 2007 +0100
add %nounput to trigdeferred.l
avoid warning about unused function
and may increase speed
commit 502affdf41e7845d05c1c9cb456082b0dd99fa6a
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Aug 24 16:42:43 2007 +0100
+ dpkg (1.14.5ubuntu10) gutsy; urgency=low
+
+ Triggers improvements:
+ * Fix bug where diversions and triggers incorporated only on normal
+ error unwind from do_script (rather than on abnormal unwind). The
+ effect of the bug was to temporarily disregard diversion changes made
+ by failing maintscripts and to erroneously suppress reflexive trigger
+ activations.
+ * Trigger cycle detection works properly: does not record details of
+ irrelevant packages, and prints error messages correctly and without
+ referencing uninitialised tcn->next.
+ * Provide DPKG_RUNNING_VERSION environment variable so that maintscripts
+ can know what features are going to work - in this case, whether
+ reflexive trigger activation will be honoured.
+ * New debugging flags and corresponding debug statements.
+
+ -- Ian Jackson <[EMAIL PROTECTED]> Fri, 24 Aug 2007 16:38:01 +0100
commit fb7f439cfc5d24e5cf3264b31412bb144ce34037
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Tue Aug 21 15:50:12 2007 +0100
+ dpkg (1.14.5ubuntu9~~) unstable; urgency=low
+
+ * Triggers: Transitional interest recording works properly regardless
+ of the status of the interested package. (LP: #133172.)
+ To fix systems which have had the broken version work we have to
+ rename triggers/Deferred to triggers/Unincorp. The error
+ messages, comments, etc. will be improved later.
+ * Triggers: Make it possible for postinst of a package to trigger
+ itself. (Thanks to Colin Watson for relevant discussions.)
+
+ -- Ian Jackson <[EMAIL PROTECTED]> Tue, 21 Aug 2007 14:12:54 +0100
+
commit 1ab67965301b022eefa5f176f57daf6650d0e238
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Aug 17 19:14:56 2007 +0100
triggers initial implementation as of 1.14.5ubuntu8
commit 8c02ed94d1088630927ea1b222cb5ee30dbcf75b
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Aug 17 19:14:44 2007 +0100
triggers initial implementation as of 1.14.5ubuntu8
commit e189995f22a55160420a339f22c30c3356985010
Author: Ian Jackson <[EMAIL PROTECTED]>
Date: Fri Aug 17 18:33:58 2007 +0100
Fix formatting a few files
-----------------------------------------------------------------------
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
