Ubuntu
ureadahead package

Merge lp:~fehwalker/ubuntu/raring/ureadahead/fix-559525-1131404 into lp:ubuntu/raring/ureadahead

  1. Raring (13.04)
  2. fix-559525-1131404
  3. Merge into raring
Proposed by Bryan Fullerton
Status: Merged
Merged at revision: 29
Proposed branch: lp:~fehwalker/ubuntu/raring/ureadahead/fix-559525-1131404
Merge into: lp:ubuntu/raring/ureadahead
Diff against target: 42 lines (+12/-1)
3 files modified
debian/changelog (+9/-0)
src/trace.c (+2/-0)
src/ureadahead.c (+1/-1)
To merge this branch: bzr merge lp:~fehwalker/ubuntu/raring/ureadahead/fix-559525-1131404
Reviewer Review Type Date Requested Status
Serge Hallyn Approve
Ubuntu branches Pending
Review via email: mp+151351@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks, this looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-02-12 02:35:03 +0000
+++ debian/changelog 2013-03-02 07:52:22 +0000
@@ -1,3 +1,12 @@
1ureadahead (0.100.0-14ubuntu2) UNRELEASED; urgency=low
2
3 * src/ureadahead.c: correct help text for --sort command line argument
4 (LP: #1131404)
5 * src/trace.c: add /var/log to the paths ignored
6 (LP: #559525)
7
8 -- Bryan Fullerton <fehwalker@gmail.com> Sat, 02 Mar 2013 02:44:49 -0500
9
1ureadahead (0.100.0-14) raring; urgency=low10ureadahead (0.100.0-14) raring; urgency=low
211
3 * Use dh-autoreconf to ensure (among other things) that config.guess and12 * Use dh-autoreconf to ensure (among other things) that config.guess and
413
=== modified file 'src/trace.c'
--- src/trace.c 2013-01-11 12:05:17 +0000
+++ src/trace.c 2013-03-02 07:52:22 +0000
@@ -610,6 +610,8 @@
610 return TRUE;610 return TRUE;
611 if (! strncmp (pathname, "/var/run/", 9))611 if (! strncmp (pathname, "/var/run/", 9))
612 return TRUE;612 return TRUE;
613 if (! strncmp (pathname, "/var/log/", 9))
614 return TRUE;
613 if (! strncmp (pathname, "/var/lock/", 10))615 if (! strncmp (pathname, "/var/lock/", 10))
614 return TRUE;616 return TRUE;
615617
616618
=== modified file 'src/ureadahead.c'
--- src/ureadahead.c 2009-11-09 18:38:51 +0000
+++ src/ureadahead.c 2013-03-02 07:52:22 +0000
@@ -132,7 +132,7 @@
132 NULL, "SECONDS", &timeout, nih_option_int },132 NULL, "SECONDS", &timeout, nih_option_int },
133 { 0, "dump", N_("dump the current pack file"),133 { 0, "dump", N_("dump the current pack file"),
134 NULL, NULL, &dump_pack, NULL },134 NULL, NULL, &dump_pack, NULL },
135 { 0, "sort", N_("how to sort the pack file when dumping [default: path]"),135 { 0, "sort", N_("how to sort the pack file when dumping [default: open]"),
136 NULL, "SORT", &sort_pack, sort_option },136 NULL, "SORT", &sort_pack, sort_option },
137137
138 NIH_OPTION_LAST138 NIH_OPTION_LAST

Subscribers

People subscribed via source and target branches