Changeset 2648 in ProjectBuilder

Timestamp:

Aug 20, 2020, 9:37:44 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix #189 by versioning repo files on the localhost to avoid collision

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -3014 +3014 @@
         for my $f ("dists/$pbos2->{'version'}/$projcomponent/binary-$debarch/Release","dists/$pbos2->{'version'}/$projcomponent/binary-all/Release","dists/$pbos2->{'version'}/$projcomponent/source/Release","dists/$pbos2->{'version'}/Release") {
             my $debdir = dirname($cptarget);
-            pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $debdir/$f . 2> /dev/null","Getting deb $f file from $debdir");
-            pb_sign_file("$ENV{'PBBUILDDIR'}/Release");
-            pb_system("$cpcmd $ENV{'PBBUILDDIR'}/Release.gpg $debdir/$f.gpg 2> /dev/null","Putting deb $f.gpg file to $debdir");
+            pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $debdir/$f $pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-Release 2> /dev/null","Getting deb $f file from $debdir");
+            pb_sign_file("$ENV{'PBBUILDDIR'}/$pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-Release");
+            pb_system("$cpcmd $ENV{'PBBUILDDIR'}/$pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-Release.gpg $debdir/$f.gpg 2> /dev/null","Putting deb $f.gpg file to $debdir");
             my ($void,$debfile) = split(/:/,$debdir);
             pb_system("$shcmdbase \"chmod 644 $debfile/$f.gpg\"","Set mode to 644 for $debfile/$f.gpg");
@@ -3023 +3023 @@
 
     if (($cmt =~ /Packages/) && ($pbos2->{'type'} eq "rpm")) {
-        pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $cptarget/repodata/repomd.xml . 2> /dev/null","Getting repomd.xml file from $cptarget/repodata");
-        pb_sign_file("$ENV{'PBBUILDDIR'}/repomd.xml");
-        pb_system("$cpcmd $ENV{'PBBUILDDIR'}/repomd.xml.gpg $cptarget/repodata/repomd.xml.asc 2> /dev/null","Putting back repomd.xml.asc file to $cptarget/repodata");
+        pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $cptarget/repodata/repomd.xml $pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-repomd.xml 2> /dev/null","Getting repomd.xml file from $cptarget/repodata");
+        pb_sign_file("$ENV{'PBBUILDDIR'}/$pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-repomd.xml");
+        pb_system("$cpcmd $ENV{'PBBUILDDIR'}/$pbos2->{'name'}-$pbos2->{'version'}-$pbos2->{'arch'}-repomd.xml.gpg $cptarget/repodata/repomd.xml.asc 2> /dev/null","Putting back repomd.xml.asc file to $cptarget/repodata");
         my ($void,$rpdir) = split(/:/,$cptarget);
         pb_system("$shcmdbase \"chmod 644 $rpdir/repodata/repomd.xml.asc\"","Set mode to 644 for $rpdir/repodata/repomd.xml.asc");