Merge lp:~vorlon/update-notifier/lp.876298 into lp:update-notifier

[Steve Langasek]

initial implementation of a hook to let packages queue delayed downloads

[lp:~vorlon/update-notifier/lp.876298]

654. By Steve Langasek on 2012-03-20

add proper exception handling so we can at least see unexpected exceptions;
this uncovered a buglet trying to push to sums without declaring it first...

655. By Steve Langasek on 2012-03-20

use 'with open()' to be more idiomatic

656. By Steve Langasek on 2012-03-20

print the filename as we download it, not as we parse it

657. By Steve Langasek on 2012-03-20

support localization of the new file

658. By Steve Langasek on 2012-03-20

src/update-notifier.c: when there are new hooks, check them whether or
not dpkg has run; this allows other packages to send us notifications
by ways other than running a package maintainer script.

659. By Steve Langasek on 2012-03-20

there's no reason to 'pass' if we have other handling in place for the
exception

660. By Steve Langasek on 2012-03-20

don't skip the script unless the *current* package is listed as failing the
checksum check.

[Steve Langasek (vorlon)]

This implementation has a problem. The file in /usr/share/package-data-downloads will always have the mtime that was set when the package was created. This means that if a user installs an out-of-date version of the package which successfully downloads the data it requests, then runs apt-get update and installs the current version, the hook will not trigger because the stamp file's date will still be newer than the mtime on the hook.

Still thinking how to fix this.

[Steve Langasek (vorlon)]

I think the best solution here is to just require packages to remove their own stamp files in the maintainer script when they want to ensure a new download; annoyingly manual, but anything else is either going to download too little, or way too much.

[lp:~vorlon/update-notifier/lp.876298]

661. By Steve Langasek on 2012-03-21

add support for reading proxy settings from apt

662. By Steve Langasek on 2012-03-21

Add proper error handling in case of download failure

663. By Steve Langasek on 2012-03-21

debian/update-notifier-common.cron.daily: add a cronjob to periodically
retry any failed downloads.

664. By Steve Langasek on 2012-03-21

add support for stampfiles for both permanent and temporary hook failures,
so we can keep track of what notifications we need to send to users.

665. By Steve Langasek on 2012-03-22

Add data/package-data-downloads-failed-permanently.in, so we can actually
notify the user of permanent errors.

666. By Steve Langasek on 2012-03-22

tune the language in the notification for the non-permanent failures, based on
improvements in the new one for permanent failures

667. By Steve Langasek on 2012-03-22

whoops, wrong variable

[Michael Vogt (mvo)]

Thanks Steve!

That looks very good, some small remarks:

+ regexp = re.compile(r"(.*).permanent-failure$")
+ for file in os.listdir(STAMPDIR):
+ match = regexp.match(file)
+ if match:
+ res.append(match.group(1))

Could be written as something like:
+ return glob.glob(STAMPDIR+"*.permanent-failure")

proxy_list = subprocess.check_output(['apt-config', 'shell',
214 + 'http', 'Acquire::http::Proxy',
215 + 'https', 'Acquire::https::Proxy',
216 + 'ftp', 'Acquire::ftp::Proxy'])
...
Could we written as:
import apt
http_proxy = apt.apt_pkg.config.get("Acquire::http::Proxy")
https_proxy = apt.apt_pkg.config.get("Acquire::https::Proxy")

I think its a good idea to use:
+ output = subprocess.check_output(["sha256sum", dest_file])
instead of the buildin hashlib as this is simpler

+ if line == " $packages\n":
Could be written as something like:
line = string.Template(line).substitute({'packages' : " ,".join(packages) + "\n"})

Note that this is all minor nitpicking. Having tests would be awsome of course, but
I can have a look at tihs tomorrow morning.

[Steve Langasek (vorlon)]

> Could be written as something like:
> + return glob.glob(STAMPDIR+"*.permanent-failure")

We do want to strip off the extension and directory name, though, to get just the name of the hook that's failed. So in the end, I'm not sure this is shorter/cleaner?

Committed the other two suggestions, thanks!

[lp:~vorlon/update-notifier/lp.876298]

668. By Steve Langasek on 2012-03-23

since we already depend on python-apt, just use it instead of shelling out to
apt-config.

669. By Steve Langasek on 2012-03-23

use string.Template per mvo's suggestion, instead of doing by-hand variable
substitution.

[Michael Vogt (mvo)]

Thanks a bunch, I don't have a strong opinion about the glob, here is the full alternative that we could
use, but either way is fine I think:
- res = []
- regexp = re.compile(r"(.*).permanent-failure$")
- for file in os.listdir(STAMPDIR):
- match = regexp.match(file)
- if match:
- res.append(match.group(1))
- return res
+ files = glob.glob(os.path.join(STAMPDIR, "*.permanent-failure"))
+ return [os.path.splitext(os.path.basename(path))[0] for path in files]

I work on lp:~mvo/update-notifier/lp.876298/ now to add some small tests and I did include this
change but feel free to not merge it if you like the previous version better, both work fine.

[Michael Vogt (mvo)]

I commited some basic tests to lp:~mvo/update-notifier/lp.876298/ mostly because I wanted to make sure that
I don't break stuff where I changed stuff. I also did some code changes and tried to cover them with tests
so that its safe. None of the code changes is really critical, look at them and pick the bits you like and
ignore the others :) I hope they all make sense but to a certain extend its a matter of preference. Taking
the tests would be nice though they should work regardless of the code changes I made.

Feedback very welcome, it would be really nice if we had a test for the process_download_requests() too,
but I have not looked what this involves, probably a bit of "from mock import Mock,patch" to patch some
of the methods like urlretrieve() that we want to have mocks.

Thanks again for your work on this feature, I think its highly useful!

[Steve Langasek (vorlon)]

On Fri, Mar 23, 2012 at 09:16:20AM -0000, Michael Vogt wrote:
> I commited some basic tests to lp:~mvo/update-notifier/lp.876298/ mostly
> because I wanted to make sure that I don't break stuff where I changed
> stuff. I also did some code changes and tried to cover them with tests so
> that its safe. None of the code changes is really critical, look at them
> and pick the bits you like and ignore the others :) I hope they all make
> sense but to a certain extend its a matter of preference. Taking the
> tests would be nice though they should work regardless of the code changes
> I made.

Thanks, I've merged these changes into trunk now. (Well, this is an
overloaded MP now, isn't it?)

> Feedback very welcome, it would be really nice if we had a test for the
> process_download_requests() too, but I have not looked what this involves,
> probably a bit of "from mock import Mock,patch" to patch some of the
> methods like urlretrieve() that we want to have mocks.

I haven't had a chance to look at adding these tests yet. :/

We also don't have counter-based aging of failures yet. I guess we need to
get that sorted before landing this feature?

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-10 13:46:45 +0000
+++ data/Makefile.am	2012-03-23 02:54:17 +0000
@@ -12,14 +12,27 @@
 dist_convert_DATA = update-notifier.convert
 
 helperdir = $(libdir)/update-notifier
-helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot backend_helper.py
+helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot backend_helper.py package-data-downloader
 
 notifydir = $(datadir)/update-notifier
 notify_SCRIPTS = notify-reboot-required
+notify_in_files = package-data-downloads-failed.in package-data-downloads-failed-permanently.in
+notify_DATA = $(notify_in_files:.in=)
 
 EXTRA_DIST= $(helper_SCRIPTS) \
 	    $(desktop_in_files) \
+	    $(notify_in_files) \
 	    $(gsettings_SCHEMAS:.xml=.xml.in)
 
 CLEANFILES = \
 	    $(gsettings_SCHEMAS)
+
+package-data-downloads-failed: package-data-downloads-failed.in
+	$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+	$(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -r -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+	sed -i -e's/^_//' $@
+
+package-data-downloads-failed-permanently: package-data-downloads-failed-permanently.in
+	$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+	$(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -r -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+	sed -i -e's/^_//' $@

=== added file 'data/package-data-downloader'
--- data/package-data-downloader	1970-01-01 00:00:00 +0000
+++ data/package-data-downloader	2012-03-23 02:54:17 +0000
@@ -0,0 +1,274 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+"""Process new requests to download per-package data"""
+# Copyright (C) 2012 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import sys
+import subprocess
+import re
+import traceback
+import urllib
+import debian.deb822
+import string
+import apt
+from datetime import timedelta
+
+DATADIR = "/usr/share/package-data-downloads/"
+STAMPDIR = "/var/lib/update-notifier/package-data-downloads/"
+NOTIFIER_SOURCE_FILE = "/usr/share/update-notifier/package-data-downloads-failed"
+NOTIFIER_FILE = "/var/lib/update-notifier/user.d/data-downloads-failed"
+NOTIFIER_PERMANENT_SOURCE_FILE = NOTIFIER_SOURCE_FILE + '-permanently'
+NOTIFIER_PERMANENT_FILE = NOTIFIER_FILE + '-permanently'
+
+failures = []
+permanent_failures = []
+
+def create_or_update_stampfile(file):
+	"""Create or update the indicated stampfile, and remove failure flags"""
+
+	try:
+		with open(file, 'w'):
+			pass
+	# Ignore errors
+	except Exception:
+		traceback.print_exc(file=sys.stderr)
+
+	os.utime(file, None)
+
+	for ext in ('.failed', '.permanent-failure'):
+		if os.path.exists(file + ext):
+			os.unlink(file + ext)
+
+
+def mark_hook_failed(hook_name, permanent=False):
+	"""Create a stampfile recording that a hook failed
+
+	We create separate stampfiles for failed hooks so we can
+	keep track of how long the hook has been failing and if the failure
+	should be considered permanent."""
+
+	if permanent:
+		filename = hook_name + '.permanent-failure'
+	else:
+		filename = hook_name + '.failed'
+
+	failure_file = os.path.join(STAMPDIR, filename)
+	try:
+		with open(failure_file, 'w'):
+			pass
+		
+	# Ignore errors
+	except Exception:
+		traceback.print_exc(file=sys.stderr)
+
+	for ext in ('', '.failed', '.permanent-failure'):
+		stampfile = hook_name + ext
+		if filename != stampfile \
+		   and os.path.exists(os.path.join(STAMPDIR, stampfile)):
+			os.unlink(os.path.join(STAMPDIR, stampfile))
+
+
+def hook_is_permanently_failed(hook_name):
+	"""Check if this hook has been marked as permanently failing.
+
+	If so, don't raise any more errors about it."""
+
+	failure_file = os.path.join(STAMPDIR, hook_name + '.permanent-failure')
+	return os.path.exists(failure_file)
+
+
+def hook_aged_out(hook_name):
+	"""Check if this hook has been failing consistently for >= 3 days"""
+
+	failure_file = os.path.join(STAMPDIR, hook_name + '.failed')
+	try:
+		hook_date = os.stat(failure_file).st_ctime
+		cur_time = os.times()[4]
+		d = timedelta(microseconds=cur_time-hook_date)
+		if d.days >= 3:
+			return True
+	except OSError:
+		pass
+	except Exception:
+		traceback.print_exc(file=sys.stderr)
+	return False
+
+
+def record_failure(hook):
+	"""Record that the named hook has failed"""
+	if hook_aged_out(hook):
+		permanent_failures.append(hook)
+	else:
+		failures.append(hook)
+
+
+def existing_permanent_failures():
+	"""Return the list of all previously recorded permanent failures"""
+
+	res = []
+	regexp = re.compile(r"(.*).permanent-failure$")
+	for file in os.listdir(STAMPDIR):
+		match = regexp.match(file)
+		if match:
+			res.append(match.group(1))
+	return res		
+
+
+def trigger_update_notifier(failures, permanent=False):
+	"""Tell update-notifier that there were failed packages"""
+
+	try:
+		if permanent:
+			input = open(NOTIFIER_PERMANENT_SOURCE_FILE, 'r')
+			output = open(NOTIFIER_PERMANENT_FILE, 'w')
+		else:
+			input = open(NOTIFIER_SOURCE_FILE, 'r')
+			output = open(NOTIFIER_FILE, 'w')
+	except Exception:
+		# Things failed and we can't even notify about it.  Break the
+		# trigger so that there's some error propagation, even if not
+		# the most pleasant sort.
+		traceback.print_exc(file=sys.stderr)
+		sys.exit(1)
+
+	packages = []
+	for failure in failures:
+		packages.append(os.path.basename(failure))
+
+	for line in input:
+		line = string.Template(line).substitute({'packages' : ", ".join(packages)})
+		output.write(line)
+	input.close()
+	output.close()
+
+
+def process_download_requests():
+	"""Process requests to download package data files
+
+	Iterate over /usr/share/package-data-downloads and download any
+	package data specified in the contained file, then hand off to
+	the indicated handler for further processing.
+
+	Successful downloads are recorded in
+	/var/lib/update-notifier/package-data-downloads to avoid unnecessary
+	repeat handling.
+
+	Failed downloads are reported to the user via the
+	update-notifier interface."""
+
+	# Get our proxy settings from apt
+	proxies = {}
+	try:
+		for proto in ('http','https','ftp'):
+			proxies[proto] = apt.apt_pkg.config.get("Acquire::"+proto+"::Proxy")
+			if not proxies[proto]:
+				proxies.pop(proto)
+
+		if proxies:
+			urllib._urlopener = urllib.URLopener(proxies)
+	except Exception:
+		pass
+
+	# Iterate through all the available hooks.  If we get a failure
+	# processing any of them (download failure, checksum failure, or
+	# failure to run the hook script), record it but continue processing
+	# the rest of the hooks since some of them may succeed.
+	for relfile in os.listdir(DATADIR):
+		# FIXME: ignore files ending in .dpkg-*
+		stampfile = os.path.join(STAMPDIR, relfile)
+		file = os.path.join(DATADIR, relfile)
+		try:
+			hook_date = os.stat(file).st_mtime
+			stamp_date = os.stat(stampfile).st_mtime
+			if hook_date < stamp_date:
+				continue
+		except Exception as e:
+			if not isinstance(e, OSError):
+				traceback.print_exc(file=sys.stderr)
+
+		hook = debian.deb822.Deb822()
+		files = []
+		sums = []
+		for para in hook.iter_paragraphs(open(file)):
+			if para.has_key('script'):
+				if not files:
+					record_failure(relfile)
+					break
+				command = [para['script']]
+
+				# Download each file and verify the sum
+				try:
+					for i in range(len(files)):
+						print files[i]
+						dest_file = urllib.urlretrieve(files[i])[0]
+						output = subprocess.check_output(["sha256sum", dest_file])
+						output = output.split(' ')[0]
+						if output == sums[i]:
+							command.append(dest_file)
+						else:
+							record_failure(relfile)
+							break
+					if relfile in failures:
+						break
+
+					result = subprocess.call(command)
+					if result:
+						# There's no sense redownloading if the script fails
+						permanent_failures.append(relfile)
+					else:
+						create_or_update_stampfile(stampfile)
+					break
+				except Exception:
+					traceback.print_exc(file=sys.stderr)
+
+				record_failure(relfile)
+				# The 'script' is always the last stanza
+				break
+
+			# Not in a 'script' stanza, so we should have some urls
+			try:
+				files.append(para['url'])
+				sums.append(para['sha256'])
+			except Exception as e:
+				if not isinstance(e, KeyError):
+					traceback.print_exc(file=sys.stderr)
+				record_failure(relfile)
+				break
+
+	# We only report about "permanent" failures when there are new ones,
+	# but we want the whole list of permanently-failing hooks so when
+	# we clobber the update-notifier file we don't lose information the
+	# user may not have seen yet
+	if permanent_failures:
+		new_failures = False
+		previous_failures = existing_permanent_failures()
+		for failure in permanent_failures:
+			if failure not in previous_failures:
+				mark_hook_failed(failure, permanent=True)
+				previous_failures.append(failure)
+				new_failures = True
+		if new_failures:
+			trigger_update_notifier(previous_failures, permanent=True)
+
+	if failures:
+		for failure in failures:
+			mark_hook_failed(failure)
+		trigger_update_notifier(failures)
+
+
+if __name__ == "__main__":
+	process_download_requests()

=== added file 'data/package-data-downloads-failed-permanently.in'
--- data/package-data-downloads-failed-permanently.in	1970-01-01 00:00:00 +0000
+++ data/package-data-downloads-failed-permanently.in	2012-03-23 02:54:17 +0000
@@ -0,0 +1,14 @@
+_Name: Data files for some packages could not be downloaded
+Priority: High
+_Description: 
+ The following packages requested additional data downloads after package
+ installation, but the data could not be downloaded or could not be
+ processed.
+ .
+ .
+   $packages
+ .
+ .
+ This is a permanent failure that leaves these packages unusable on your
+ system.  You may need to fix your Internet connection, then remove and
+ reinstall the packages to fix this problem.

=== added file 'data/package-data-downloads-failed.in'
--- data/package-data-downloads-failed.in	1970-01-01 00:00:00 +0000
+++ data/package-data-downloads-failed.in	2012-03-23 02:54:17 +0000
@@ -0,0 +1,15 @@
+_Name: Failure to download extra data files
+Priority: High
+Terminal: True
+Command: /usr/lib/update-notifier/package-data-downloader
+_Description: 
+ The following packages requested additional data downloads after package
+ installation, but the data could not be downloaded or could not be
+ processed.
+ .
+ .
+   $packages
+ .
+ .
+ The download will be attempted again later, or you can try the download
+ again now.  Running this command requires an active Internet connection.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-11 09:29:32 +0000
+++ debian/changelog	2012-03-23 02:54:17 +0000
@@ -1,3 +1,19 @@
+update-notifier (0.119ubuntu2) UNRELEASED; urgency=low
+
+  * data/package-data-downloader, data/package-data-downloads-failed.in,
+    data/package-data-downloads-failed-permanently.in,
+    debian/update-notifier-common.{postinst,triggers}: add a new handler and
+    dpkg trigger to let packages queue data for download after package
+    install, so that network connectivity problems don't make installs
+    and upgrades unreliable.  LP: #876298.
+  * debian/update-notifier-common.cron.daily: add a cronjob to periodically
+    retry any failed downloads.
+  * src/update-notifier.c: when there are new hooks, check them whether or
+    not dpkg has run; this allows other packages to send us notifications
+    by ways other than running a package maintainer script.
+
+ -- Steve Langasek <[e-mail]>  Mon, 19 Mar 2012 20:52:16 +0000
+
 update-notifier (0.119ubuntu1) precise; urgency=low
 
   * src/update-notifier.c: Consider both the "sudo" and "admin" groups as

=== modified file 'debian/control'
--- debian/control	2011-09-27 09:57:41 +0000
+++ debian/control	2012-03-23 02:54:17 +0000
@@ -41,7 +41,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
-         python-apt (>= 0.6.12)
+         python-apt (>= 0.6.12), python-debian
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Description: Files shared between update-notifier and other packages
  Apt setup files and reboot notification scripts shared between

=== added file 'debian/update-notifier-common.cron.daily'
--- debian/update-notifier-common.cron.daily	1970-01-01 00:00:00 +0000
+++ debian/update-notifier-common.cron.daily	2012-03-23 02:54:17 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Try to rerun any package data downloads that failed at package install time.
+/usr/lib/update-notifier/package-data-downloader

=== modified file 'debian/update-notifier-common.dirs'
--- debian/update-notifier-common.dirs	2012-01-18 08:35:33 +0000
+++ debian/update-notifier-common.dirs	2012-03-23 02:54:17 +0000
@@ -2,6 +2,8 @@
 etc/update-notifier
 var/lib/update-notifier
 var/lib/update-notifier/user.d
+var/lib/update-notifier/package-data-downloads
 etc/update-motd.d
 usr/share/update-notifier/plugins/cache-changed
 usr/share/update-notifier/upgrader-patches
+usr/share/package-data-downloads

=== modified file 'debian/update-notifier-common.install'
--- debian/update-notifier-common.install	2012-01-18 08:35:33 +0000
+++ debian/update-notifier-common.install	2012-03-23 02:54:17 +0000
@@ -6,6 +6,8 @@
 debian/98-reboot-required etc/update-motd.d
 debian/98-fsck-at-reboot etc/update-motd.d
 usr/share/update-notifier/notify-reboot-required
+usr/share/update-notifier/package-data-downloads-failed
+usr/share/update-notifier/package-data-downloads-failed-permanently
 usr/lib/update-notifier/
 usr/share/locale
 debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches

=== modified file 'debian/update-notifier-common.postinst'
--- debian/update-notifier-common.postinst	2010-11-17 19:51:40 +0000
+++ debian/update-notifier-common.postinst	2012-03-23 02:54:17 +0000
@@ -14,4 +14,15 @@
     rm -f /etc/update-motd.d/20-cpu-checker
 fi
 
+if [ "$1" = triggered ]; then
+	for trigger in $2; do
+		case $trigger in
+			/usr/share/package-data-downloads)
+				/usr/lib/update-notifier/package-data-downloader
+				;;
+		esac
+	done
+	exit 0
+fi
+
 #DEBHELPER#

=== added file 'debian/update-notifier-common.triggers'
--- debian/update-notifier-common.triggers	1970-01-01 00:00:00 +0000
+++ debian/update-notifier-common.triggers	2012-03-23 02:54:17 +0000
@@ -0,0 +1,1 @@
+interest /usr/share/package-data-downloads

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-07-14 07:37:31 +0000
+++ po/POTFILES.in	2012-03-23 02:54:17 +0000
@@ -17,3 +17,5 @@
 [type: gettext/glade]ui/reboot-dialog.ui
 data/com.ubuntu.update-notifier.gschema.xml.in
 data/update-notifier.desktop.in
+[type: gettext/rfc822deb] data/package-data-downloads-failed.in
+[type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2012-03-11 09:27:31 +0000
+++ src/update-notifier.c	2012-03-23 02:54:17 +0000
@@ -328,12 +328,6 @@
       if(un->update_finished_timer > 0) 
 	 g_source_remove(un->update_finished_timer);
       
-      // show pending hooks/reboots
-      if(un->hook_pending) {
-	 //g_print("checking hooks now\n");
-	 check_update_hooks(un->hook);
-	 un->hook_pending = FALSE;
-      }
       if(un->reboot_pending) {
 	 //g_print("checking reboot now\n");
 	 reboot_check (un->reboot);
@@ -350,6 +344,13 @@
       un->last_apt_action = 0;
    }
 
+   // show pending hooks
+   if(un->hook_pending) {
+      //g_print("checking hooks now\n");
+      check_update_hooks(un->hook);
+      un->hook_pending = FALSE;
+   }
+
    // apt-get update/install or dpkg is runing (and updates files in 
    // it's list/cache dir) or in /var/lib/dpkg/status
    if(un->apt_get_runing)