Changeset 1678 in ProjectBuilder

Timestamp:

Nov 16, 2012, 9:06:13 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Exports function pb_vcs_add_if_not_in
• replace most die by confess

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Distribution.pm (modified) (7 diffs)
• VCS.pm (modified) (18 diffs)

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

@@ -266 +266 @@
 if (not defined $lsbf) {
     print STDERR "no lsb entry defined for osrelambfile\n";
-    die "You modified upstream delivery and lost !\n";
+    confess "You modified upstream delivery and lost !\n";
 }
 
@@ -296 +296 @@
 } else {
     print STDERR "Unable to read $lsbf file\n";
-    die "Please report to the maintainer bruno_at_project-builder.org\n";
+    confess "Please report to the maintainer bruno_at_project-builder.org\n";
 }
 }
@@ -328 +328 @@
 
 # Protection
-die "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
+confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
 
@@ -347 +347 @@
 # Check that all deps have been installed correctly
 $deps = pb_distro_getdeps($f, $pbos);
-die "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/));
+confess "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/));
 }
 
@@ -387 +387 @@
 my $oldsep = $/;
 $/ = $sep;
-open(DESC,"$f") || die "Unable to open $f";
+open(DESC,"$f") || confess "Unable to open $f";
 while (<DESC>) {
     pb_log(4,"read: $_\n");
@@ -459 +459 @@
         my $res = pb_system("dpkg -L $p","Looking for $p","mayfail");
         next if ($res eq 0);
-        open(CMD,"dpkg -l $p |") or die "Unable to run dpkg -l $p: $!";
+        open(CMD,"dpkg -l $p |") or confess "Unable to run dpkg -l $p: $!";
         my $ok = 0;
         while (<CMD>) {
@@ -583 +583 @@
                 $dirdest = "/etc/zypp/repos.d";
             } else {
-                die "Unknown location for repository file for '$pbos->{install}' command";
+                confess "Unknown location for repository file for '$pbos->{install}' command";
             }
             my $dest = "$dirdest/$bn";
             return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
-            die "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
+            confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dirdest/$bn","Adding $reponame repository") if (not -f "$dirdest/$bn");
         } elsif ($bn =~ /\.addmedia/) {

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

@@ -35 +35 @@
  
 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_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);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -112 +112 @@
     } else {
         # Look at svk admin hotcopy
-        die "Unable to export from svk without a source defined";
+        confess "Unable to export from svk without a source defined";
     }
 } elsif ($scheme eq "dir") {
@@ -131 +131 @@
     if ($@) {
         # File::MimeInfo not found
-        die("ERROR: Install File::MimeInfo to handle scheme $scheme\n");
+        confess("ERROR: Install File::MimeInfo to handle scheme $scheme\n");
     }
 
@@ -220 +220 @@
     pb_system("cd $dir ; $vcscmd -d $account\@$host:$path export $cvsopt -d $base $tmp1","Exporting $tmp1 from $source under CVS to $destdir ");
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 return(undef);
@@ -243 +243 @@
 
 if ($scheme =~ /^svn/) {
-    open(PIPE,"LANGUAGE=C $vcscmd info $dir |") || return("");
+    open(PIPE,"LANGUAGE=C $vcscmd info $dir 2> /dev/null |") || return("");
     while (<PIPE>) {
         ($void,$res) = split(/^URL:/) if (/^URL:/);
@@ -251 +251 @@
     chomp($res);
 } elsif ($scheme =~ /^svk/) {
-    open(PIPE,"LANGUAGE=C $vcscmd info $dir |") || return("");
+    open(PIPE,"LANGUAGE=C $vcscmd info $dir 2> /dev/null |") || return("");
     my $void2 = "";
     while (<PIPE>) {
@@ -267 +267 @@
     chomp($res);
 } elsif ($scheme =~ /^git/) {
-    open(GIT,"git --git-dir=$dir/.git remote -v |") || return("");
+    open(GIT,"git --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
     while (<GIT>) {
         next unless (/^origin\s+(\S+) \(push\)$/);
@@ -277 +277 @@
 } elsif ($scheme =~ /^cvs/) {
     # This path is always the root path of CVS, but we may be below
-    open(FILE,"$dir/CVS/Root") || die "$dir isn't CVS controlled";
+    open(FILE,"$dir/CVS/Root") || confess "$dir isn't CVS controlled";
     $res = <FILE>;
     chomp($res);
@@ -286 +286 @@
         $rdir = dirname($rdir);
     }
-    die "Unable to find a CVSROOT dir in the parents of $dir" if (! -d "$rdir/CVSROOT");
+    confess "Unable to find a CVSROOT dir in the parents of $dir" if (! -d "$rdir/CVSROOT");
     #compute our place under that root dir - should be a relative path
     $dir =~ s|^$rdir||;
@@ -300 +300 @@
     $res = $prefix.$res.$suffix;
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 pb_log(1,"pb_vcs_get_uri returns $res\n");
@@ -332 +332 @@
     # Nothing to do.
 } else {
-    die "cms $scheme unknown for project management";
+    confess "cms $scheme unknown for project management";
 }
 }
@@ -385 +385 @@
     pb_vcs_export($url,undef,$destination);
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 }
@@ -411 +411 @@
     # Nothing to do.
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 }
@@ -437 +437 @@
     # Nothing to do.
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 pb_vcs_up($scheme,$dir);
+}
+
+=item B<pb_vcs_add_if_not_in>
+
+This function adds to a VCS content from a local directory if the content wasn't already managed under th VCS.
+The first parameter is the schema of the VCS systems (svn, cvs, svn+ssh, ...)
+The second parameter is a list of directory/file to add.
+
+=cut
+
+sub pb_vcs_add_if_not_in {
+my $scheme = shift;
+my @f = @_;
+my $vcscmd = pb_vcs_cmd($scheme);
+
+if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
+    for my $f (@f) {
+        my $uri = pb_vcs_get_uri($scheme,$f);
+        pb_vcs_add($scheme,$f) if ($uri !~ /^$scheme/);
+    }
+} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
+    # Nothing to do.
+} else {
+    confess "cms $scheme unknown";
+}
 }
 
@@ -460 +485 @@
     # Nothing to do.
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 pb_vcs_up($scheme,@f);
@@ -480 +505 @@
 
 if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
-    open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
+    open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir";
     $l = 0;
     while (<PIPE>) {
@@ -490 +515 @@
     $l = 0;
 } else {
-    die "cms $scheme unknown";
+    confess "cms $scheme unknown";
 }
 pb_log(1,"pb_vcs_isdiff returns $l\n");
@@ -552 +577 @@
             return($cmd."$command -o ");
         } else {
-            die "Unable to handle $scheme.\nNo wget/curl available, please install one of those";
+            confess "Unable to handle $scheme.\nNo wget/curl available, please install one of those";
         }
     }