Changeset 1235


Ignore:
Timestamp:
Feb 27, 2011, 8:30:50 PM (9 years ago)
Author:
bruno
Message:
  • Fix a debian build bug due to directory change (backport from devel to 0.11.1)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 0.11.1/pb/bin/pb

    r1225 r1235  
    12771277                my $tmp = $_;
    12781278                next if ($tmp !~ /^dpkg-deb.*:/);
    1279                 $tmp =~ s|.*../(.*)_(.*).deb.*|$1|;
     1279                $tmp =~ s|.*\.\./(.*)_(.*).deb.*|$1|;
    12801280                $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
    12811281            }
    12821282            close(LOG);
     1283            chdir ".." || die "Unable to chdir to parent dir";
     1284            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
    12831285        } elsif ($pbos->{'type'} eq "ebuild") {
    12841286            my @ebuildfile;
     
    13531355                pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
    13541356            }
     1357            chdir ".." || die "Unable to chdir to parent dir";
     1358            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
    13551359        } elsif ($pbos->{'type'} eq "pkg") {
    13561360            # Solaris
     
    14101414            $made="$made $pbpkg-$pbver-$pbtag.sd";
    14111415
     1416            chdir ".." || die "Unable to chdir to parent dir";
    14121417            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
    14131418        } else {
     
    14511456        my $made2 = "";
    14521457        foreach my $f (split(/ /,$made)) {
    1453             $made2 .= "../$f " if ($f =~ /\.deb$/);
     1458            $made2 .= "$f " if ($f =~ /\.deb$/);
    14541459        }
    14551460        if (-x $chkcmd) {
    14561461            pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose");
    1457         } else {
    1458             pb_log(0,"deb packages generated: $made2\n");
    1459         }
     1462        }
     1463        pb_log(0,"deb packages generated: $made2\n");
    14601464    } else {
    14611465        pb_log(0,"No check done for $pbos->{'type'} yet\n");
Note: See TracChangeset for help on using the changeset viewer.