Merge lp:~mterry/update-notifier/use-no-update into lp:update-notifier/ubuntu

Proposed by Michael Terry
Status: Merged
Approved by: Barry Warsaw
Approved revision: no longer in the source branch.
Merged at revision: 717
Proposed branch: lp:~mterry/update-notifier/use-no-update
Merge into: lp:update-notifier/ubuntu
Diff against target: 25 lines (+2/-2)
2 files modified
data/backend_helper.py (+1/-1)
src/update.c (+1/-1)
To merge this branch: bzr merge lp:~mterry/update-notifier/use-no-update
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Review via email: mp+108377@code.launchpad.net

Description of the change

Once https://code.launchpad.net/~mterry/update-manager/update-at-start/+merge/108369 is merged, you will want to merge this branch to avoid the new update-on-start behavior of update-manager.

To post a comment you must log in.
708. By Michael Vogt

* data/apt_check.py:
  - modernize a bit for the 0.8 API

709. By Michael Vogt

releasing version 0.119ubuntu13

710. By Steve Langasek

make autogen.sh set -e, so that missing dependencies trigger a build failure

711. By Steve Langasek

Explicitly check for our source-build-dependencies in the bzr-builddeb hook, to
avoid misbuilt source packages

712. By Brian Murray

autogen.sh: change PKG_NAME

713. By Brian Murray

data/package-data-downloader: replace tabs with whitespace

714. By Brian Murray

data/package-data-downloader: fix some overzealous replacement of tabs with whitespace

715. By Brian Murray

data/package-data-downloader: fix spacing in get_hook_file_names

716. By Steve Langasek

merge python3 support

Revision history for this message
Barry Warsaw (barry) wrote :

This looks fine, but I'm not going to merge it since I set your u-m merge proposal to needs-fixing.

review: Approve
717. By Michael Terry

pass --no-update to update-manager when we call it, to avoid the now-mandatory cache update on launch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/backend_helper.py'
--- data/backend_helper.py 2011-08-10 13:54:37 +0000
+++ data/backend_helper.py 2012-06-01 16:24:21 +0000
@@ -21,7 +21,7 @@
21# show updates21# show updates
22def show_updates():22def show_updates():
23 """ show updates using update-manager """23 """ show updates using update-manager """
24 cmd = ["update-manager"]24 cmd = ["update-manager", "--no-update"]
25 res = subprocess.call(cmd)25 res = subprocess.call(cmd)
26 return (res == 0)26 return (res == 0)
2727
2828
=== modified file 'src/update.c'
--- src/update.c 2011-10-05 19:09:13 +0000
+++ src/update.c 2012-06-01 16:24:21 +0000
@@ -650,7 +650,7 @@
650 if (auto_launch_now(priv)) 650 if (auto_launch_now(priv))
651 {651 {
652 g_spawn_command_line_async("nice ionice -c3 update-manager "652 g_spawn_command_line_async("nice ionice -c3 update-manager "
653 "--no-focus-on-map", NULL);653 "--no-update --no-focus-on-map", NULL);
654 }654 }
655 return TRUE;655 return TRUE;
656 }656 }

Subscribers

People subscribed via source and target branches

to all changes: