Changeset 2107 in ProjectBuilder

Timestamp:

Jul 21, 2016, 3:37:12 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Use a dedicated pbos var when dealing with deb Release file

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/Changelog.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -2723 +2723 @@
     
     # If target is deb family then sign Release file for Packages
-    if (($cmt =~ /Packages/) && ($pbos->{'type'} eq "deb")) {
-        my $debarch = pb_get_debarch($pbos);
-        my $projcomponent = pb_get_debpc($pbos);
-        for my $f ("dists/$pbos->{'version'}/$projcomponent/binary-$debarch/Release","dists/$pbos->{'version'}/$projcomponent/source/Release","dists/$pbos->{'version'}/Release") {
+    my $pbos2 = pb_distro_get_context($v);
+    if (($cmt =~ /Packages/) && ($pbos2->{'type'} eq "deb")) {
+        my $debarch = pb_get_debarch($pbos2);
+        my $projcomponent = pb_get_debpc($pbos2);
+        for my $f ("dists/$pbos2->{'version'}/$projcomponent/binary-$debarch/Release","dists/$pbos2->{'version'}/$projcomponent/source/Release","dists/$pbos2->{'version'}/Release") {
             pb_system("cd $ENV{'PBBUILDDIR'} ; $cpcmd $cptarget/$f . 2> /dev/null","Getting deb $f file from $cptarget");
             pb_sign_file("$ENV{'PBBUILDDIR'}/Release");

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -111 +111 @@
     $ndate = &UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    # usefule mostly for test versions
+    # useful mostly for test versions
     $pbver .= $pbextdir;
     if ($dtype eq "rpm") {
@@ -189 +189 @@
         print $OUTPUT "$pbrealpkg ($ver2) unstable; urgency=low\n";
         print $OUTPUT "\n";
-        }
+    }
 
     $tmp = <INPUT>;