|
 |
0b05ab |
From 545c41e6750d5e28743a7da9e43175302c4fa812 Mon Sep 17 00:00:00 2001
|
|
|
0b05ab |
From: David Lehman <dlehman@redhat.com>
|
|
|
0b05ab |
Date: Thu, 4 Apr 2019 13:52:54 -0400
|
|
|
0b05ab |
Subject: [PATCH 1/4] Remove profanity from an old comment.
|
|
|
0b05ab |
|
|
|
0b05ab |
---
|
|
|
0b05ab |
blivet/blivet.py | 2 +-
|
|
|
0b05ab |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0b05ab |
|
|
|
0b05ab |
diff --git a/blivet/blivet.py b/blivet/blivet.py
|
|
|
0b05ab |
index 8128347f..ff4410ae 100644
|
|
|
0b05ab |
--- a/blivet/blivet.py
|
|
|
0b05ab |
+++ b/blivet/blivet.py
|
|
|
0b05ab |
@@ -875,7 +875,7 @@ def safe_device_name(self, name):
|
|
|
0b05ab |
|
|
|
0b05ab |
LVM limits lv names to 128 characters. I don't know the limits for
|
|
|
0b05ab |
the other various device types, so I'm going to pick a number so
|
|
|
0b05ab |
- that we don't have to have an entire fucking library to determine
|
|
|
0b05ab |
+ that we don't have to have an entire library to determine
|
|
|
0b05ab |
device name limits.
|
|
|
0b05ab |
"""
|
|
|
0b05ab |
max_len = 96 # No, you don't need longer names than this. Really.
|
|
|
0b05ab |
|
|
|
0b05ab |
From 7395fb481b7b7a5054a3ba12e07f40ba1c8d926a Mon Sep 17 00:00:00 2001
|
|
|
0b05ab |
From: David Lehman <dlehman@redhat.com>
|
|
|
0b05ab |
Date: Mon, 22 Apr 2019 17:44:42 -0400
|
|
|
0b05ab |
Subject: [PATCH 2/4] Add a target to create an archive of the unit tests.
|
|
|
0b05ab |
|
|
|
0b05ab |
---
|
|
|
0b05ab |
Makefile | 4 ++++
|
|
|
0b05ab |
1 file changed, 4 insertions(+)
|
|
|
0b05ab |
|
|
|
0b05ab |
diff --git a/Makefile b/Makefile
|
|
|
0b05ab |
index 76817278..f9b2066e 100644
|
|
|
0b05ab |
--- a/Makefile
|
|
|
0b05ab |
+++ b/Makefile
|
|
|
0b05ab |
@@ -120,6 +120,10 @@ archive: po-pull
|
|
|
0b05ab |
git checkout -- po/$(PKGNAME).pot
|
|
|
0b05ab |
@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
|
|
|
0b05ab |
|
|
|
0b05ab |
+tests-archive:
|
|
|
0b05ab |
+ git archive --format=tar --prefix=$(PKGNAME)-$(VERSION)/ $(VERSION_TAG) tests/ | gzip -9 > $(PKGNAME)-$(VERSION)-tests.tar.gz
|
|
|
0b05ab |
+ @echo "The test archive is in $(PKGNAME)-$(VERSION)-tests.tar.gz"
|
|
|
0b05ab |
+
|
|
|
0b05ab |
local: po-pull
|
|
|
0b05ab |
@make -B ChangeLog
|
|
|
0b05ab |
$(PYTHON) setup.py -q sdist --dist-dir .
|
|
|
0b05ab |
|
|
|
0b05ab |
From 28959739b46d22698c05f34494d2d9c67f37f0c4 Mon Sep 17 00:00:00 2001
|
|
|
0b05ab |
From: David Lehman <dlehman@redhat.com>
|
|
|
0b05ab |
Date: Mon, 22 Apr 2019 17:45:19 -0400
|
|
|
0b05ab |
Subject: [PATCH 3/4] Add spec file logic to include unit tests in SRPM.
|
|
|
0b05ab |
|
|
|
0b05ab |
---
|
|
|
0b05ab |
python-blivet.spec | 4 +++-
|
|
|
0b05ab |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
0b05ab |
|
|
|
0b05ab |
diff --git a/python-blivet.spec b/python-blivet.spec
|
|
|
0b05ab |
index 668e0913..23fa07f6 100644
|
|
|
0b05ab |
--- a/python-blivet.spec
|
|
|
0b05ab |
+++ b/python-blivet.spec
|
|
|
0b05ab |
@@ -29,6 +29,7 @@ License: LGPLv2+
|
|
|
0b05ab |
%global realname blivet
|
|
|
0b05ab |
%global realversion %{version}%{?prerelease}
|
|
|
0b05ab |
Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz
|
|
|
0b05ab |
+Source1: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}-tests.tar.gz
|
|
|
0b05ab |
|
|
|
0b05ab |
# Versions of required components (done so we make sure the buildrequires
|
|
|
0b05ab |
# match the requires versions of things).
|
|
|
0b05ab |
@@ -165,7 +166,8 @@ configuration.
|
|
|
0b05ab |
%endif
|
|
|
0b05ab |
|
|
|
0b05ab |
%prep
|
|
|
0b05ab |
-%autosetup -n %{realname}-%{realversion} -p1
|
|
|
0b05ab |
+%autosetup -n %{realname}-%{realversion} -N
|
|
|
0b05ab |
+%autosetup -n %{realname}-%{realversion} -b1 -p1
|
|
|
0b05ab |
|
|
|
0b05ab |
%build
|
|
|
0b05ab |
%{?with_python2:make PYTHON=%{__python2}}
|
|
|
0b05ab |
|
|
|
0b05ab |
From 305c9b52ee5682baf53be660c501b7b263029699 Mon Sep 17 00:00:00 2001
|
|
|
0b05ab |
From: David Lehman <dlehman@redhat.com>
|
|
|
0b05ab |
Date: Fri, 26 Apr 2019 16:39:35 -0400
|
|
|
0b05ab |
Subject: [PATCH 4/4] Include tests archive where appropriate in make targets.
|
|
|
0b05ab |
|
|
|
0b05ab |
---
|
|
|
0b05ab |
Makefile | 3 +++
|
|
|
0b05ab |
1 file changed, 3 insertions(+)
|
|
|
0b05ab |
|
|
|
0b05ab |
diff --git a/Makefile b/Makefile
|
|
|
0b05ab |
index f9b2066e..552550a6 100644
|
|
|
0b05ab |
--- a/Makefile
|
|
|
0b05ab |
+++ b/Makefile
|
|
|
0b05ab |
@@ -119,6 +119,7 @@ archive: po-pull
|
|
|
0b05ab |
rm -rf $(PKGNAME)-$(VERSION)
|
|
|
0b05ab |
git checkout -- po/$(PKGNAME).pot
|
|
|
0b05ab |
@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
|
|
|
0b05ab |
+ @make tests-archive
|
|
|
0b05ab |
|
|
|
0b05ab |
tests-archive:
|
|
|
0b05ab |
git archive --format=tar --prefix=$(PKGNAME)-$(VERSION)/ $(VERSION_TAG) tests/ | gzip -9 > $(PKGNAME)-$(VERSION)-tests.tar.gz
|
|
|
0b05ab |
@@ -128,6 +129,8 @@ local: po-pull
|
|
|
0b05ab |
@make -B ChangeLog
|
|
|
0b05ab |
$(PYTHON) setup.py -q sdist --dist-dir .
|
|
|
0b05ab |
@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
|
|
|
0b05ab |
+ git ls-files tests/ | tar -T- -czf $(PKGNAME)-$(VERSION)-tests.tar.gz
|
|
|
0b05ab |
+ @echo "The test archive is in $(PKGNAME)-$(VERSION)-tests.tar.gz"
|
|
|
0b05ab |
|
|
|
0b05ab |
rpmlog:
|
|
|
0b05ab |
@git log --pretty="format:- %s (%ae)" $(RELEASE_TAG).. |sed -e 's/@.*)/)/'
|