Fix log renaming to log_warning
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
This commit is contained in:
parent
e3520fa484
commit
be6c94e4f1
2 changed files with 75 additions and 1 deletions
70
0001-logging-rename-omitted-log-to-log_warning.patch
Normal file
70
0001-logging-rename-omitted-log-to-log_warning.patch
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
From c9915e40c85d91d7434557419a5f9fde160e1e07 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kutlak <mkutlak@redhat.com>
|
||||
Date: Wed, 30 Aug 2017 11:16:15 +0200
|
||||
Subject: [PATCH] logging: rename omitted log() to log_warning()
|
||||
|
||||
Some of the log() functions were omitted in commit f33b8731efedd7382e4f11d83e618a06d92a23ab.
|
||||
|
||||
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
||||
---
|
||||
src/daemon/abrt-handle-upload.in | 2 +-
|
||||
src/plugins/abrt-action-find-bodhi-update | 2 +-
|
||||
src/plugins/abrt-action-install-debuginfo.in | 2 +-
|
||||
src/plugins/abrt-action-ureport | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/daemon/abrt-handle-upload.in b/src/daemon/abrt-handle-upload.in
|
||||
index f31d3a1..469c2ae 100755
|
||||
--- a/src/daemon/abrt-handle-upload.in
|
||||
+++ b/src/daemon/abrt-handle-upload.in
|
||||
@@ -12,7 +12,7 @@ import shutil
|
||||
import datetime
|
||||
import grp
|
||||
|
||||
-from reportclient import set_verbosity, error_msg_and_die, error_msg, log
|
||||
+from reportclient import set_verbosity, error_msg_and_die, error_msg, log_warning
|
||||
|
||||
GETTEXT_PROGNAME = "abrt"
|
||||
import locale
|
||||
diff --git a/src/plugins/abrt-action-find-bodhi-update b/src/plugins/abrt-action-find-bodhi-update
|
||||
index 3bb96fc..0cae6cc 100755
|
||||
--- a/src/plugins/abrt-action-find-bodhi-update
|
||||
+++ b/src/plugins/abrt-action-find-bodhi-update
|
||||
@@ -40,7 +40,7 @@ import sys
|
||||
from argparse import ArgumentParser
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
-from reportclient import (_, log, log1, set_verbosity, verbose, RETURN_OK,
|
||||
+from reportclient import (_, log_warning, log1, set_verbosity, verbose, RETURN_OK,
|
||||
RETURN_FAILURE, error_msg)
|
||||
import report
|
||||
|
||||
diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in
|
||||
index f2abf43..6269c22 100644
|
||||
--- a/src/plugins/abrt-action-install-debuginfo.in
|
||||
+++ b/src/plugins/abrt-action-install-debuginfo.in
|
||||
@@ -11,7 +11,7 @@ import errno
|
||||
import getopt
|
||||
import reportclient
|
||||
from subprocess import Popen, PIPE
|
||||
-from reportclient import verbose, log, log1, log2, set_verbosity, error_msg_and_die, error_msg
|
||||
+from reportclient import verbose, log_warning, log1, log2, set_verbosity, error_msg_and_die, error_msg
|
||||
import time
|
||||
from reportclient.debuginfo import DebugInfoDownload, filter_installed_debuginfos, build_ids_to_path, clean_up
|
||||
import problem
|
||||
diff --git a/src/plugins/abrt-action-ureport b/src/plugins/abrt-action-ureport
|
||||
index a7484c8..089eeb0 100755
|
||||
--- a/src/plugins/abrt-action-ureport
|
||||
+++ b/src/plugins/abrt-action-ureport
|
||||
@@ -11,7 +11,7 @@ import getopt
|
||||
import augeas
|
||||
|
||||
from report import dd_opendir, DD_FAIL_QUIETLY_ENOENT, run_event_on_problem_dir
|
||||
-from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log
|
||||
+from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log_warning
|
||||
|
||||
GETTEXT_PROGNAME = "abrt"
|
||||
import locale
|
||||
--
|
||||
2.9.5
|
||||
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
Summary: Automatic bug detection and reporting tool
|
||||
Name: abrt
|
||||
Version: 2.10.4
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: https://abrt.readthedocs.org/
|
||||
|
|
@ -71,6 +71,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta
|
|||
|
||||
# don't remove this patch, packages in rawhide are not signed!
|
||||
Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch
|
||||
Patch1: 0001-logging-rename-omitted-log-to-log_warning.patch
|
||||
|
||||
# '%%autosetup -S git' -> git
|
||||
BuildRequires: git
|
||||
|
|
@ -1169,6 +1170,9 @@ killall abrt-dbus >/dev/null 2>&1 || :
|
|||
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
|
||||
|
||||
%changelog
|
||||
* Wed Aug 30 2017 Martin Kutlak <mkutlak@redhat.com> 2.10.4-2
|
||||
- logging: rename omitted log() to log_warning()
|
||||
|
||||
* Mon Aug 28 2017 Matej Habrnal <mhabrnal@redhat.com> 2.10.4-1
|
||||
- Translation updates
|
||||
- logging: rename log() to log_warning()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue