Accepting request 358371 from home:jubalh:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/358371
OBS-URL: https://build.opensuse.org/package/show/Base:System/powertop?expand=0&rev=40
This commit is contained in:
Michael Vetter 2016-02-09 16:33:29 +00:00 committed by Git OBS Bridge
parent 555f54bc91
commit d680628c92
3 changed files with 7 additions and 42 deletions

View File

@ -1,40 +0,0 @@
---
src/parameters/persistent.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Index: powertop-2.0/src/parameters/persistent.cpp
===================================================================
--- powertop-2.0.orig/src/parameters/persistent.cpp
+++ powertop-2.0/src/parameters/persistent.cpp
@@ -129,9 +129,6 @@ void save_parameters(const char *filenam
// printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size());
- if (!global_power_valid())
- return;
-
pathname = get_param_directory(filename);
file.open(pathname, ios::out);
@@ -140,12 +137,15 @@ void save_parameters(const char *filenam
return;
}
- map<string, int>::iterator it;
-
- for (it = param_index.begin(); it != param_index.end(); it++) {
- int index;
- index = it->second;
- file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
+ if (global_power_valid())
+ {
+ map<string, int>::iterator it;
+
+ for (it = param_index.begin(); it != param_index.end(); it++) {
+ int index;
+ index = it->second;
+ file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
+ }
}
file.close();
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 8 14:44:26 UTC 2016 - mvetter@suse.com
- Remove patch powertop-1.98-always-create-params.patch:
* No mention why this is needed. I don't see any reason for
having it.
-------------------------------------------------------------------
Thu Feb 4 10:09:28 UTC 2016 - mpluskal@suse.com

View File

@ -26,7 +26,6 @@ Group: System/Monitoring
Url: https://01.org/powertop/
Source0: https://01.org/sites/default/files/downloads/%{name}/%{name}-%{version}.tar.gz
Source1: powertop.service
Patch2: powertop-1.98-always-create-params.patch
Patch5: powertop-no-date.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@ -51,7 +50,6 @@ doing in terms of power savings.
%prep
%setup -q
%patch2 -p1
%patch5 -p1
# Delete objects files left in tarball