Update to 2.7.0 (#1486741)
This commit is contained in:
parent
2bdef9008e
commit
2185eb3409
4 changed files with 7 additions and 31 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
/Uranium-2.5.0.tar.gz
|
||||
/Uranium-2.6.0.tar.gz
|
||||
/Uranium-2.6.1.tar.gz
|
||||
/Uranium-2.7.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
From e122aae1a2dfa510c6708db99998756bbdddeced Mon Sep 17 00:00:00 2001
|
||||
From: Jaime van Kessel <nallath@gmail.com>
|
||||
Date: Wed, 28 Jun 2017 16:43:28 +0200
|
||||
Subject: [PATCH] Fixed the incorrect number removal check for unique name
|
||||
|
||||
---
|
||||
UM/Settings/ContainerRegistry.py | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/UM/Settings/ContainerRegistry.py b/UM/Settings/ContainerRegistry.py
|
||||
index dc4a25bcc..084ec04ae 100644
|
||||
--- a/UM/Settings/ContainerRegistry.py
|
||||
+++ b/UM/Settings/ContainerRegistry.py
|
||||
@@ -351,8 +351,9 @@ def uniqueName(self, original: str) -> str:
|
||||
|
||||
if not name: #Wait, that deleted everything!
|
||||
name = "Profile"
|
||||
- elif not self.findContainers(id = name, ignore_case = True) and not self.findContainers(name = name):
|
||||
- return name
|
||||
+ elif not self.findContainers(id = original.strip(), ignore_case = True) and not self.findContainers(name = original.strip()):
|
||||
+ # Check if the stripped version of the name is unique (note that this can still have the number in it)
|
||||
+ return original.strip()
|
||||
|
||||
unique_name = name
|
||||
i = 1
|
||||
|
|
@ -1,14 +1,11 @@
|
|||
Name: python-uranium
|
||||
Version: 2.6.1
|
||||
Release: 3%{?dist}
|
||||
Version: 2.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A Python framework for building desktop applications
|
||||
License: AGPLv3+
|
||||
URL: https://github.com/Ultimaker/Uranium
|
||||
Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz
|
||||
|
||||
# https://github.com/Ultimaker/Uranium/issues/265
|
||||
Patch0: Uranium-issue265.patch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: /usr/bin/doxygen
|
||||
BuildRequires: /usr/bin/msgmerge
|
||||
|
|
@ -116,6 +113,9 @@ popd
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 30 2017 Miro Hrončok <mhroncok@redhat.com> - 2.7.0-1
|
||||
- Update to 2.7.0 (#1486741)
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Uranium-2.6.1.tar.gz) = 2badf35ca4409a1232c19e8e0046f4153d271f76d60beb45cc138aee6380191df228b6eef083d78d2801066f852ef1364d47dbea02316d63f150724f9428724f
|
||||
SHA512 (Uranium-2.7.0.tar.gz) = 2521ce58e0f333ca20d9f28bae48ccc65ba77ab4923c8b19213906c168fa251c6abd7be9192cf286b60a28dd9f3ee0687ceb0a5c493d09897e37696464dc5ab8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue