]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - pakfire/patches/0009-Fix-two-coding-errors.patch
Merge remote-tracking branch 'stevee/ulogd-update'
[people/ms/ipfire-3.x.git] / pakfire / patches / 0009-Fix-two-coding-errors.patch
1 From 949ba4bfa1055343b39d988c7b26c1f73ce28ac2 Mon Sep 17 00:00:00 2001
2 From: Michael Tremer <michael.tremer@ipfire.org>
3 Date: Mon, 30 Apr 2012 23:41:22 +0200
4 Subject: [PATCH 09/16] Fix two coding errors.
5
6 ---
7 python/pakfire/chroot.py | 2 ++
8 python/pakfire/repository/remote.py | 2 +-
9 2 files changed, 3 insertions(+), 1 deletion(-)
10
11 diff --git a/python/pakfire/chroot.py b/python/pakfire/chroot.py
12 index 521759b..9862dc7 100644
13 --- a/python/pakfire/chroot.py
14 +++ b/python/pakfire/chroot.py
15 @@ -92,6 +92,8 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True
16 if logger:
17 logger.debug("Executing command: %s in %s" % (command, chrootPath or "/"))
18
19 + child = None
20 +
21 try:
22 # Create new child process
23 child = subprocess.Popen(
24 diff --git a/python/pakfire/repository/remote.py b/python/pakfire/repository/remote.py
25 index dade232..6d2cdc7 100644
26 --- a/python/pakfire/repository/remote.py
27 +++ b/python/pakfire/repository/remote.py
28 @@ -112,7 +112,7 @@ class RepositoryRemote(base.RepositoryFactory):
29 )
30
31 def clean(self):
32 - RepositoryFactory.clean(self)
33 + base.RepositoryFactory.clean(self)
34
35 # Remove all files in the files cache.
36 self.cache.destroy()
37 --
38 1.7.10.4
39