remove stray debugging code

(cherry picked from commit 3f5441bd773a6d63e4594c25733d56e5f9539c6f)
This commit is contained in:
wangzhiqiang 2022-10-29 11:02:07 +08:00 committed by openeuler-sync-bot
parent 5c4382fadb
commit aab81caacb
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From 1e084b3ac2ec8b4b448c2290ed4fa88e4c4212c4 Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Sat, 9 Oct 2021 15:52:16 -0400
Subject: [PATCH] Remove stray debugging code
---
NEWS | 6 ++++++
gptcl.cc | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 18f6f21..4009a5b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.0.9 (?/?/2021):
+-----------------
+
+- Removed stray debugging code that caused "partNum is {x}" to be printed
+ when changing a partition's name with sgdisk (-c/--change-name).
+
1.0.8 (6/9/2021):
-----------------
diff --git a/gptcl.cc b/gptcl.cc
index 65a99e9..ef7156e 100644
--- a/gptcl.cc
+++ b/gptcl.cc
@@ -212,7 +212,6 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
partNum = (int) GetInt(partName, 1) - 1;
if (partNum < 0)
partNum = newPartNum;
- cout << "partNum is " << partNum << "\n";
if ((partNum >= 0) && (partNum < (int) GetNumParts())) {
name = GetString(partName, 2);
if (SetName(partNum, (UnicodeString) name.c_str())) {
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: gdisk Name: gdisk
Version: 1.0.8 Version: 1.0.8
Release: 2 Release: 3
Summary: GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools Summary: GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools
License: GPLv2 License: GPLv2
URL: http://www.rodsbooks.com/gdisk URL: http://www.rodsbooks.com/gdisk
@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{version}.tar.gz
BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel BuildRequires:ncurses-devel util-linux-devel gcc-c++ popt-devel
Patch9000: 0001-fix-Werror-format-security-error.patch Patch9000: 0001-fix-Werror-format-security-error.patch
Patch9001: 0001-Remove-stray-debugging-code.patch
%description %description
GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools. GPT fdisk(consisting of the gdisk,sgdisk,cgdisk) is a set of text-mode partitioning tools.
@ -50,6 +51,9 @@ install -Dp -m 0644 fixparts.8 %{buildroot}%{_mandir}/man8/fixparts.8
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Sat Oct 29 2022 wangzhiqiang <wangzhiqiang95@huawei.com> - 1.0.8-3
- remove stray debugging code
* Tue Mar 8 02:11:35 UTC 2022 - Qiang Wei <qiang.wei@suse.com> - 1.0.8-2 * Tue Mar 8 02:11:35 UTC 2022 - Qiang Wei <qiang.wei@suse.com> - 1.0.8-2
- Fix compiler error for option -Werror=format-security - Fix compiler error for option -Werror=format-security