Skip to content

Commit dc0ba1c

Browse files
Dogface2kDogface2k
authored
Packaging: accept normalized Marvin archive names (#13793)
* packaging: accept normalized Marvin archive name * packaging: accept normalized Marvin archives in RPMs Use [Mm]arvin-*.tar.gz when copying, listing and installing the Marvin archive in the EL8 and SUSE15 RPM specs. Keep legacy uppercase archive names supported. Tighten the Debian manifest to the same version-delimited pattern.
1 parent 72014a0 commit dc0ba1c

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎debian/cloudstack-marvin.install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
/usr/share/cloudstack-marvin/Marvin*.tar.gz
18+
/usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz

‎debian/cloudstack-marvin.postinst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
set -e
2121

2222
python3 -m pip install --upgrade pip
23-
python3 -m pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
23+
python3 -m pip install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz

‎debian/rules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ override_dh_auto_install:
177177

178178
# cloudstack-marvin
179179
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-marvin
180-
cp tools/marvin/dist/Marvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/
180+
cp tools/marvin/dist/[Mm]arvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/
181181

182182
# cloudstack-integration-tests
183183
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests

‎packaging/el8/cloud.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
392392

393393
# Marvin
394394
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
395-
cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
395+
cp tools/marvin/dist/[Mm]arvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
396396

397397
# integration-tests
398398
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -601,7 +601,7 @@ fi
601601

602602
%post marvin
603603
pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
604-
pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
604+
pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
605605

606606
#No default permission as the permission setup is complex
607607
%files management
@@ -711,7 +711,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
711711
%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
712712

713713
%files marvin
714-
%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
714+
%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
715715
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
716716
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
717717

‎packaging/suse15/cloud.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
390390

391391
# Marvin
392392
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
393-
cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
393+
cp tools/marvin/dist/[Mm]arvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
394394

395395
# integration-tests
396396
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -599,7 +599,7 @@ fi
599599

600600
%post marvin
601601
pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
602-
pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
602+
pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
603603

604604
#No default permission as the permission setup is complex
605605
%files management
@@ -709,7 +709,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
709709
%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
710710

711711
%files marvin
712-
%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
712+
%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
713713
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
714714
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
715715

0 commit comments

Comments
 (0)