OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry                 Date:   03-Aug-2006 00:31:22
  Branch: HEAD                             Handle: 2006080223312200

  Modified files:
    openpkg-registry        registry-db.pl

  Log:
    cosmetics and remove sample data

  Summary:
    Revision    Changes     Path
    1.37        +10 -38     openpkg-registry/registry-db.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-db.pl
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 registry-db.pl
  --- openpkg-registry/registry-db.pl   25 Jul 2006 13:41:44 -0000      1.36
  +++ openpkg-registry/registry-db.pl   2 Aug 2006 22:31:22 -0000       1.37
  @@ -1,6 +1,6 @@
   [EMAIL PROTECTED]@/bin/perl
   ##
  -##  registry-db.pl - OpenPKG registration database setup and maintenance
  +##  registry-db.pl - OpenPKG Registry - DataBase utility
   ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
   ##  Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
   ##
  @@ -30,16 +30,16 @@
   use DBI;
   use DBD::Pg;
   
  -#   configure optional debugging
  -$Data::Dumper::Purity = 1;
  -$Data::Dumper::Indent = 1;
  -$Data::Dumper::Terse  = 1;
  -
   #   program name, version and date
   my $progname="registry-db.pl";
   my $progvers="0.6.3";
   my $progdate="25-Jul-2006";
   
  +#   configure data dumper
  +$Data::Dumper::Purity = 1;
  +$Data::Dumper::Indent = 1;
  +$Data::Dumper::Terse  = 1;
  +
   #   derive data version from program version
   my $datavers={};
   $datavers->{value} = $progvers;
  @@ -194,10 +194,10 @@
           $dbv = { 'version' => { 'key' => 'version', 'value' => '0.0.0' } }
       }
       else {
  -        $dbv=$rv;
  +        $dbv = $rv;
       }
   
  -    if($dbv->{version}->{value} =~ m/^([0-9]+)\.([0-9]+)\.([0-9]+)$/) {
  +    if ($dbv->{version}->{value} =~ m/^([0-9]+)\.([0-9]+)\.([0-9]+)$/) {
           $dbv->{version}->{major}=$1;
           $dbv->{version}->{minor}=$2;
           $dbv->{version}->{patch}=$3;
  @@ -304,7 +304,6 @@
                             . "\n";
           return 0;
       }
  -    die
   }
   
   sub upgraderegistry()
  @@ -317,10 +316,10 @@
           $dbv = { 'version' => { 'key' => 'version', 'value' => '0.0.0' } }
       }
       else {
  -        $dbv=$rv;
  +        $dbv = $rv;
       }
   
  -    if($dbv->{version}->{value} =~ m/^([0-9]+)\.([0-9]+)\.([0-9]+)$/) {
  +    if ($dbv->{version}->{value} =~ m/^([0-9]+)\.([0-9]+)\.([0-9]+)$/) {
           $dbv->{version}->{major}=$1;
           $dbv->{version}->{minor}=$2;
           $dbv->{version}->{patch}=$3;
  @@ -466,7 +465,6 @@
                             . "\n";
           return 0;
       }
  -    die
   }
   
   sub schemasession1()
  @@ -740,29 +738,3 @@
   EOT
   }
   
  -sub sample()
  -{
  -    return <<'EOT'
  -    INSERT INTO reg_user VALUES ('[EMAIL PROTECTED]', 'One');
  -    INSERT INTO reg_user VALUES ('[EMAIL PROTECTED]', 'Two');
  -    INSERT INTO reg_instance VALUES (
  -        'd98267da-0874-11d9-b8f6-0002a5489f14',
  -        '1169823e-22db-3547-9f72-20c2ef18619f',
  -        '4a27ce02-730e-3cbf-a3fd-c32042c5f619',
  -        'openpkg://one.example.com/current/inst/one',
  -        '[EMAIL PROTECTED]',
  -        'ix86-freebsd5.4',
  -        'OpenPKG-CURRENT'
  -    );
  -    INSERT INTO reg_instance VALUES (
  -        'de9b7b7e-996c-11d9-acc4-000f20f84e91',
  -        'f9212ca7-2ab9-339e-8cf3-e32b9dcad48b',
  -        '86bec982-9ea3-3992-9c91-6775c77bb102',
  -        'openpkg://two.example.com/release/inst/two',
  -        '[EMAIL PROTECTED]',
  -        'ix86-freebsd5.4',
  -        'OpenPKG-2.5'
  -    );
  -EOT
  -}
  -
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to