Changeset 1850 in ProjectBuilder for devel

Timestamp:

Jan 28, 2014, 9:10:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Move pb_cms_compliant fundtion into VCS.pm and rename it pb_vcs_compliant, as it was used incorrectly in Env.pm which was lower in the tree. Detected by MondoRescue 3.2 update by Corey Wirun and reported on the ML.

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Env.pm (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)
• pb/lib/ProjectBuilder/CMS.pm (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -24 +24 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
-use ProjectBuilder::CMS;
 use ProjectBuilder::VCS;
 
@@ -309 +308 @@
     # Check pbconf cms compliance
     #
-    pb_cms_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
 
     # Check where is our PBROOTDIR (release tag name can't be guessed the first time)
@@ -1252 +1251 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            pb_cms_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$pbinit);
+            my $msg = "updated to ".basename("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}");
+            $msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.pb in it\n");

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -36 +36 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd);
+our @EXPORT = qw(pb_vcs_export pb_vcs_get_uri pb_vcs_copy pb_vcs_checkout pb_vcs_up pb_vcs_checkin pb_vcs_isdiff pb_vcs_add pb_vcs_add_if_not_in pb_vcs_cmd pb_vcs_compliant);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -623 +623 @@
 }
 
-    
+=item B<pb_vcs_compliant>
+
+This function checks the compliance of the project and the pbconf directory.
+The first parameter is the key name of the value that needs to be read in the configuration file.
+The second parameter is the environment variable this key will populate.
+The third parameter is the location of the pbconf dir.
+The fourth parameter is the URI of the CMS content related to the pbconf dir.
+The fifth parameter indicates whether we should inititate the context or not.
+
+=cut
+
+sub pb_vcs_compliant {
+
+my $param = shift;
+my $envar = shift;
+my $defdir = shift;
+my $uri = shift;
+my $pbinit = shift;
+my %pdir;
+
+pb_log(1,"pb_vcs_compliant: envar: $envar - defdir: $defdir - uri: $uri\n");
+my ($pdir) = pb_conf_get_if($param) if (defined $param);
+if (defined $pdir) {
+    %pdir = %$pdir;
+}
+
+
+if ((defined $pdir) && (%pdir) && (defined $pdir{$ENV{'PBPROJ'}})) {
+    # That's always the environment variable that will be used
+    $ENV{$envar} = $pdir{$ENV{'PBPROJ'}};
+} else {
+    if (defined $param) {
+        pb_log(1,"WARNING: no $param defined, using $defdir\n");
+        pb_log(1,"         Please create a $param reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
+        pb_log(1,"         if you want to use another directory\n");
+    }
+    $ENV{$envar} = "$defdir";
+}
+
+# Expand potential env variable in it
+eval { $ENV{$envar} =~ s/(\$ENV.+\})/$1/eeg };
+pb_log(2,"$envar: $ENV{$envar}\n");
+
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
+
+if (($scheme !~ /^cvs/) && ($scheme !~ /^svn/) && ($scheme !~ /^svk/) && ($scheme !~ /^hg/) && ($scheme !~ /^git/)) {
+    # Do not compare if it's not a real cms
+    pb_log(1,"pb_vcs_compliant useless\n");
+    return;
+} elsif (defined $pbinit) {
+    pb_mkdir_p("$ENV{$envar}");
+} elsif (! -d "$ENV{$envar}") {
+    # Either we have a version in the uri, and it should be the same
+    # as the one in the envar. Or we should add the version to the uri
+    if (basename($uri) ne basename($ENV{$envar})) {
+        $uri .= "/".basename($ENV{$envar})
+    }
+    pb_log(1,"Checking out $uri\n");
+    # Create structure and remove end dir before exporting
+    pb_mkdir_p("$ENV{$envar}");
+    pb_rm_rf($ENV{$envar});
+    pb_vcs_checkout($scheme,$uri,$ENV{$envar});
+} else {
+    pb_log(1,"$uri found locally, checking content\n");
+    my $cmsurl = pb_vcs_get_uri($scheme,$ENV{$envar});
+    my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
+    # For svk, scheme doesn't appear in svk info so remove it here in uri coming from conf file 
+    # which needs it to trigger correct behaviour
+    $uri =~ s/^svk://;
+    if (($scheme2 =~ /^git/) || ($scheme2 =~ /^hg/)) {
+        # These VCS manage branches internally not with different tree structures
+        # Assuming it's correct for now.
+    } elsif ($cmsurl ne $uri) {
+        # The local content doesn't correpond to the repository
+        pb_log(0,"ERROR: Inconsistency detected:\n");
+        pb_log(0,"       * $ENV{$envar} ($envar) refers to $cmsurl but\n");
+        pb_log(0,"       * $ENV{'PBETC'} refers to $uri\n");
+        die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
+    } else {
+        pb_log(1,"Content correct - doing nothing - you may want to update your repository however\n");
+        # they match - do nothing - there may be local changes
+    }
+}
+pb_log(1,"pb_vcs_compliant end\n");
+}
+
 
 =back 

devel/pb/bin/pb

@@ -3088 +3088 @@
 
     pb_log(2,"Checkin $ENV{'PBCONFDIR'}/$newver\n");
-    pb_cms_checkin($scheme,"$ENV{'PBCONFDIR'}/$newver",undef);
+    pb_vcs_checkin($scheme,"$ENV{'PBCONFDIR'}/$newver","updated to $ENV{'PBCONFDIR'}");
 }
 

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -35 +35 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_cms_init pb_cms_checkin pb_cms_get_pkg pb_cms_get_real_pkg pb_cms_compliant pb_cms_log);
+our @EXPORT = qw(pb_cms_init pb_cms_get_pkg pb_cms_get_real_pkg pb_cms_log);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -94 +94 @@
 my $turl = "$pburl->{$ENV{'PBPROJ'}}/$tmp";
 $turl = $pburl->{$ENV{'PBPROJ'}} if ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o);
-pb_cms_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
+pb_vcs_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$turl,$pbinit);
 
 
@@ -147 +147 @@
 pb_log(1,"pb_cms_init returns $scheme,$pburl->{$ENV{'PBPROJ'}}\n");
 return($scheme,$pburl->{$ENV{'PBPROJ'}});
-}
-
-=item B<pb_cms_checkin>
-
-This function updates a CMS content from a local directory.
-The first parameter is the schema of the CMS systems (svn, cvs, svn+ssh, ...)
-The second parameter is the directory to update from.
-The third parameter indicates if we are in a new version creation (undef) or in a new project creation (1)
-
-=cut
-
-sub pb_cms_checkin {
-my $scheme = shift;
-my $dir = shift;
-my $pbinit = shift || undef;
-
-my $ver = basename($dir);
-my $msg = "updated to $ver";
-$msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
-
-pb_vcs_checkin($scheme,$dir,$msg);
 }
 
@@ -239 +218 @@
 }
 
-=item B<pb_cms_compliant>
-
-This function checks the compliance of the project and the pbconf directory.
-The first parameter is the key name of the value that needs to be read in the configuration file.
-The second parameter is the environment variable this key will populate.
-The third parameter is the location of the pbconf dir.
-The fourth parameter is the URI of the CMS content related to the pbconf dir.
-The fifth parameter indicates whether we should inititate the context or not.
-
-=cut
-
-sub pb_cms_compliant {
-
-my $param = shift;
-my $envar = shift;
-my $defdir = shift;
-my $uri = shift;
-my $pbinit = shift;
-my %pdir;
-
-pb_log(1,"pb_cms_compliant: envar: $envar - defdir: $defdir - uri: $uri\n");
-my ($pdir) = pb_conf_get_if($param) if (defined $param);
-if (defined $pdir) {
-    %pdir = %$pdir;
-}
-
-
-if ((defined $pdir) && (%pdir) && (defined $pdir{$ENV{'PBPROJ'}})) {
-    # That's always the environment variable that will be used
-    $ENV{$envar} = $pdir{$ENV{'PBPROJ'}};
-} else {
-    if (defined $param) {
-        pb_log(1,"WARNING: no $param defined, using $defdir\n");
-        pb_log(1,"         Please create a $param reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
-        pb_log(1,"         if you want to use another directory\n");
-    }
-    $ENV{$envar} = "$defdir";
-}
-
-# Expand potential env variable in it
-eval { $ENV{$envar} =~ s/(\$ENV.+\})/$1/eeg };
-pb_log(2,"$envar: $ENV{$envar}\n");
-
-my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
-
-if (($scheme !~ /^cvs/) && ($scheme !~ /^svn/) && ($scheme !~ /^svk/) && ($scheme !~ /^hg/) && ($scheme !~ /^git/)) {
-    # Do not compare if it's not a real cms
-    pb_log(1,"pb_cms_compliant useless\n");
-    return;
-} elsif (defined $pbinit) {
-    pb_mkdir_p("$ENV{$envar}");
-} elsif (! -d "$ENV{$envar}") {
-    # Either we have a version in the uri, and it should be the same
-    # as the one in the envar. Or we should add the version to the uri
-    if (basename($uri) ne basename($ENV{$envar})) {
-        $uri .= "/".basename($ENV{$envar})
-    }
-    pb_log(1,"Checking out $uri\n");
-    # Create structure and remove end dir before exporting
-    pb_mkdir_p("$ENV{$envar}");
-    pb_rm_rf($ENV{$envar});
-    pb_vcs_checkout($scheme,$uri,$ENV{$envar});
-} else {
-    pb_log(1,"$uri found locally, checking content\n");
-    my $cmsurl = pb_vcs_get_uri($scheme,$ENV{$envar});
-    my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
-    # For svk, scheme doesn't appear in svk info so remove it here in uri coming from conf file 
-    # which needs it to trigger correct behaviour
-    $uri =~ s/^svk://;
-    if (($scheme2 =~ /^git/) || ($scheme2 =~ /^hg/)) {
-        # These VCS manage branches internally not with different tree structures
-        # Assuming it's correct for now.
-    } elsif ($cmsurl ne $uri) {
-        # The local content doesn't correpond to the repository
-        pb_log(0,"ERROR: Inconsistency detected:\n");
-        pb_log(0,"       * $ENV{$envar} ($envar) refers to $cmsurl but\n");
-        pb_log(0,"       * $ENV{'PBETC'} refers to $uri\n");
-        die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
-    } else {
-        pb_log(1,"Content correct - doing nothing - you may want to update your repository however\n");
-        # they match - do nothing - there may be local changes
-    }
-}
-pb_log(1,"pb_cms_compliant end\n");
-}
-
 =item B<pb_cms_create_authors>