Subversion Repositories DevTools

Rev

Rev 7300 | Rev 7319 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7300 Rev 7301
Line 63... Line 63...
63 
#
 63 
#
64 
my $DPKG_NAME     = "";
 64 
my $DPKG_NAME     = "";
65 
my $DESC_NAME     = "";
 65 
my $DESC_NAME     = "";
66 
my $DPKG_VERSION  = "";
 66 
my $DPKG_VERSION  = "";
67 
my $DPKG_PRJ      = "";
 67 
my $DPKG_PRJ      = "";
- 
 
 68 
my $DPKG_SIGNATURE = "";
68 
my $DESCPKG_FILE  = "";
 69 
my $DESCPKG_FILE  = "";
69 
my $DESCPKG_TYPE  = "";
 70 
my $DESCPKG_TYPE  = "";
70 
my $CWD_DIR       = cwd;
 71 
my $CWD_DIR       = cwd;
71 
my $SRC_ROOT;
 72 
my $SRC_ROOT;
72 
my $DPKG_DIR;
 73 
my $DPKG_DIR;
Line 499... Line 500...
499 
    #
 500 
    #
500 
    if ($opt_tarmode)
 501 
    if ($opt_tarmode)
501 
    {
 502 
    {
502 
        $DPKG_DIR = catdir($DPKG_ROOT, '.dpkg_archive', 'fragments');
 503 
        $DPKG_DIR = catdir($DPKG_ROOT, '.dpkg_archive', 'fragments');
503 
    }
 504 
    }
- 
 
 505 
    elsif ( $DPKG_SIGNATURE )
- 
 
 506 
    {
- 
 
 507 
        $DPKG_DIR = catdir($DPKG_ROOT, $DPKG_NAME . $DPKG_PRJ, $DPKG_SIGNATURE );
- 
 
 508 
    }
504 
    else
 509 
    else
505 
    {
 510 
    {
506 
        $DPKG_DIR = catdir($DPKG_ROOT, $DPKG_NAME, $DPKG_VERSION );
 511 
        $DPKG_DIR = catdir($DPKG_ROOT, $DPKG_NAME, $DPKG_VERSION );
507 
    }
 512 
    }
508
513
Line 520... Line 525...
520 
    Information ("                *Non Standard archive") unless $opt_archive eq 'main';
 525 
    Information ("                *Non Standard archive") unless $opt_archive eq 'main';
521 
    Information ("Target dir    = [$DPKG_DIR]");
 526 
    Information ("Target dir    = [$DPKG_DIR]");
522 
    Information1("DPKG_NAME     = [$DPKG_NAME]");
 527 
    Information1("DPKG_NAME     = [$DPKG_NAME]");
523 
    Information1("DPKG_VERSION  = [$DPKG_VERSION]");
 528 
    Information1("DPKG_VERSION  = [$DPKG_VERSION]");
524 
    Information1("DPKG_PRJ      = [$DPKG_PRJ]");
 529 
    Information1("DPKG_PRJ      = [$DPKG_PRJ]");
- 
 
 530 
    Information1("DPKG_SIGNATURE= [$DPKG_SIGNATURE]") if $DPKG_SIGNATURE;
525 
    Information1("GBE_MACHTYPE  = [$GBE_MACHTYPE]");
 531 
    Information1("GBE_MACHTYPE  = [$GBE_MACHTYPE]");
526 
    Information1("GBE_HOSTNAME  = [$GBE_HOSTNAME]");
 532 
    Information1("GBE_HOSTNAME  = [$GBE_HOSTNAME]");
527 
    Information1("GBE_ABT       = [$GBE_ABT]");
 533 
    Information1("GBE_ABT       = [$GBE_ABT]");
528 
    Information1("USER          = [$USER]");
 534 
    Information1("USER          = [$USER]");
529 
    Information ("")                                if ( $opt_merge || $opt_delete || $opt_info || $opt_tarmode || $opt_testArchive || $opt_noBuild);
 535 
    Information ("")                                if ( $opt_merge || $opt_delete || $opt_info || $opt_tarmode || $opt_testArchive || $opt_noBuild);
Line 630... Line 636...
630 
    my $pkg_data = ReadDescpkg( $path );
 636 
    my $pkg_data = ReadDescpkg( $path );
631 
    Error("Failed to open file [$path].") unless $pkg_data;
 637 
    Error("Failed to open file [$path].") unless $pkg_data;
632 
 
 638 
 
633 
    $DESC_NAME    = $pkg_data->{'NAME'};
 639 
    $DESC_NAME    = $pkg_data->{'NAME'};
634 
    $DPKG_VERSION = $pkg_data->{'VERSION_FULL'};
 640 
    $DPKG_VERSION = $pkg_data->{'VERSION_FULL'};
- 
 
 641 
    $DPKG_SIGNATURE = $pkg_data->{'SIGNATURE'};
635 
}
 642 
}
636 
 
 643 
 
637 
#-------------------------------------------------------------------------------
 644 
#-------------------------------------------------------------------------------
638 
# Function        : TransferDescpkg
 645 
# Function        : TransferDescpkg
639 
#
 646 
#