Changeset 315 in ProjectBuilder

Timestamp:

Feb 10, 2008, 6:40:37 AM (17 years ago)

Author:

Bruno Cornec

Message:

Backup of local dev. cms2pkg compiles but doesn't work and even remove the SVN :-(
pb_log added

Location:

devel/pb

Files:

• bin/pb (modified) (31 diffs)
• lib/ProjectBuilder/Base.pm (modified) (41 diffs)
• lib/ProjectBuilder/Changelog.pm (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -23 +23 @@
 use ProjectBuilder::Distribution qw (pb_distro_init);
 use ProjectBuilder::Version qw (pb_version_init);
-use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout);
+use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init);
 
 my %opts;                   # CLI Options
@@ -36 +36 @@
 my %pbtag;                  # per package
 my $pbrev;                  # Global REVISION variable
-my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+my @date=pb_get_date();
 my $pbdate = strftime("%Y-%m-%d", @date);
-my $pbdatecvs = strftime("%Y-%m-%d %H:%M:%S", @date);
 my $debug = 0;
 my $pbaccount;              # Login to use to connect to the VM
@@ -64 +63 @@
     $debug = 0  if ($debug == -1);
     }
+pb_log_init($debug, $LOG);
+
 # Handles test option
 if (defined $opts{'t'}) {
@@ -106 +107 @@
 # And get global params
 if (defined $opts{'p'}) {
-    ($debug,$LOG, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
+    ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init($opts{'p'},$pbinit);
 } else {
-    ($debug,$LOG, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
+    ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init(undef,$pbinit);
 }
 
-print $LOG "Project: $ENV{'PBPROJ'}\n" if ($debug >= 0);
-print $LOG "Action: $action\n" if ($debug >= 0);
+pb_log(0,"Project: $ENV{'PBPROJ'}\n");
+pb_log(0,"Action: $action\n");
 
 # Keep those project values to store them at the end each time
@@ -154 +155 @@
 } elsif ($action =~ /^clean$/) {
 } else {
-    print $LOG "'$action' is not available\n";
+    pb_log(0,"\'$action\' is not available\n");
     pb_syntax();
 }
@@ -162 +163 @@
     my $ptr = pb_get_pkg($defpkgdir,$extpkgdir);
     @pkgs = @$ptr;
-    my $cms=pb_cms_init($ENV{'PBPROJ'});
+    my ($scheme,$uri)=pb_cms_init($ENV{'PBPROJ'});
 
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
@@ -188 +189 @@
 
         $pbrev = $ENV{'PBREVISION'};
-        print $LOG "\n";
-        print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n";
+        pb_log(2,"\n");
+        pb_log(2,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
         # Clean up dest if necessary. The export will recreate it
@@ -202 +203 @@
         my $dir = $defpkgdir->{$pbpkg};
         $dir = $extpkgdir->{$pbpkg} if (not defined $dir);
-        print "def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n" if ($debug >= 1);
-        pb_cms_export($cms,$pbdatecvs,"$ENV{'PBROOT'}/$dir",$dest);
+        pb_log(2,"def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n");
+
+        # If it isn't a flat CMS, then we have the choice to export subdir
+        $dir = "$uri/$dir" if ($ENV{'PBREVISION'} ne "flat");
+        pb_cms_export($scheme,"$dir",$dest);
 
         # Get project info on authors and log file
@@ -216 +220 @@
         # Extract cms log history and store it
         if ((defined $chglog) && (! -f "$dest/NEWS")) {
-            print $LOG "Generating NEWS file from $chglog\n";
+            pb_log(2,"Generating NEWS file from $chglog\n");
             copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
         }
-        pb_cms_log($cms,"$ENV{'PBROOT'}/$dir",$dest,$chglog,$authors);
+        pb_cms_log($scheme,$dir,$dest,$chglog,$authors);
 
         my %build;
 
-        my ($ptr) = pb_conf_get("vmlist");
+        my ($ptr) = pb_conf_get_if("vmlist","chrootlist");
         foreach my $d (split(/,/,$ptr->{$ENV{'PBPROJ'}})) {
-            my ($name,$ver) = split(/_/,$d);
-            chomp($ver);
+            my ($name,$ver,$arch) = split(/-/,$d);
+            chomp($arch);
             my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($name,$ver);
-            print $LOG "DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n" if ($debug >= 1);
-            print $LOG "DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n" if ($debug >= 1);
+            pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf)."\n");
+            pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
 
             # Filter build files from the less precise up to the most with overloading
@@ -236 +240 @@
             # Find all build files first relatively to PBROOT
             # Find also all specific files referenced in the .pb conf file
-            my %bfiles;
-            my %pkgfiles;
-            print $LOG "DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n" if ($debug >= 1);
+            my %bfiles = {};
+            my %pkgfiles = {};
+            pb_log(2,"DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n");
             $build{"$ddir-$dver"} = "yes";
-            if (-d "$ENV{'PBCONF'}/$pbpkg/$dtype") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$dtype") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$dtype: $!";
-                foreach my $f (readdir(BDIR)) {
-                    next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f";
-                    $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
-                    if (defined $supfiles->{$pbpkg}) {
-                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f" if ($f =~ /$supfiles->{$pbpkg}/);
-                    }
-                }
-                closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$dfam") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$dfam") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$dfam: $!";
-                foreach my $f (readdir(BDIR)) {
-                    next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f";
-                    $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
-                    if (defined $supfiles->{$pbpkg}) {
-                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f" if ($f =~ /$supfiles->{$pbpkg}/);
-                    }
-                }
-                closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$ddir") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$ddir") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$ddir: $!";
-                foreach my $f (readdir(BDIR)) {
-                    next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f";
-                    $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
-                    if (defined $supfiles->{$pbpkg}) {
-                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
-                    }
-                }
-                closedir(BDIR);
-            } elsif (-d "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver") {
-                opendir(BDIR,"$ENV{'PBCONF'}/$pbpkg/$ddir-$dver") || die "Unable to open dir $ENV{'PBCONF'}/$pbpkg/$ddir-$dver: $!";
-                foreach my $f (readdir(BDIR)) {
-                    next if ($f =~ /^\./);
-                    $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f";
-                    $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
-                    if (defined $supfiles->{$pbpkg}) {
-                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f" if ($f =~ /$supfiles->{$pbpkg}/);
-                    }
-                }
-                closedir(BDIR);
+
+            if (-d "$ENV{'PBROOT'}/$pbpkg/$dtype") {
+                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$dtype",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$dfam") {
+                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$dfam",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$ddir") {
+                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$ddir",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOT'}/$pbpkg/$ddir-$dver") {
+                pb_list_bfiles("$ENV{'PBROOT'}/$pbpkg/$ddir-$dver",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
             } else {
                 $build{"$ddir-$dver"} = "no";
                 next;
             }
-            print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
+            pb_log(2,"DEBUG bfiles: ".Dumper(\%bfiles)."\n");
 
             # Get all filters to apply
@@ -301 +270 @@
             }
         }
-        if ($debug >= 0) {
-            my @found;
-            my @notfound;
-            foreach my $b (keys %build) {
-                push @found,$b if ($build{$b} =~ /yes/);
-                push @notfound,$b if ($build{$b} =~ /no/);
-            }
-            print $LOG "Build files generated for ".join(',',@found)."\n";
-            print $LOG "No Build files found for ".join(',',@notfound)."\n" if (@notfound);
-        }
+        my @found;
+        my @notfound;
+        foreach my $b (keys %build) {
+            push @found,$b if ($build{$b} =~ /yes/);
+            push @notfound,$b if ($build{$b} =~ /no/);
+        }
+        pb_log(0,"Build files generated for ".join(',',@found)."\n");
+        pb_log(0,"No Build files found for ".join(',',@notfound)."\n") if (@notfound);
         # Get the generic filter (all.pbf) and 
         # apply those to the non-build files including those
@@ -321 +288 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+                pb_filter_file_inplace($ptr,"$dest/$f",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
                 $liste = "$f $liste";
             }
         }
-        print $LOG "Files ".$liste."have been filtered\n";
+        pb_log(2,"Files ".$liste."have been filtered\n");
 
         # Prepare the dest directory for archive
-        if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBCONF'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+        if (-x "$ENV{'PBROOT'}/$pbpkg/pbinit") {
+            pb_filter_file("$ENV{'PBROOT'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
-            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBCONF'}/$pbpkg/pbinit");
+            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOT'}/$pbpkg/pbinit");
         }
 
@@ -338 +305 @@
         # Possibility to look at PBSRC to guess more the filename
         pb_system("tar cfz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
-        print $LOG "Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n" if ($debug >= 0);
+        pb_log(2,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
 
         # Keep track of what is generated by default
@@ -354 +321 @@
         }
 
-        print $LOG "DEBUG pkg: ".Dumper($pkg)."\n" if ($debug >= 1);
+        pb_log(2,"DEBUG pkg: ".Dumper($pkg)."\n");
         open(PKG,"> $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb";
         foreach my $p (keys %$pkg) {
@@ -374 +341 @@
     # Get the running distro to build on
     my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init();
-    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
     # Get content saved in cms2build
@@ -392 +359 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        print $LOG "Source file: $src\n" if ($debug >= 0);
-
-        print $LOG "Working directory: $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
+        pb_log(2,"Source file: $src\n");
+
+        pb_log(2,"Working directory: $ENV{'PBBUILDDIR'}\n");
         if ($dtype eq "rpm") {
             foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
@@ -402 +369 @@
             }
 
+            # Remove in case a previous link/file was there
             unlink "$ENV{'PBBUILDDIR'}/SOURCES/".basename($src);
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
@@ -408 +376 @@
             @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
 
-            print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
+            pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
             # set LANGUAGE to check for correct log messages
             $ENV{'LANGUAGE'}="C";
-            #system("ls -R $ENV{'PBBUILDDIR'}") if ($debug >= 1);
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
@@ -432 +399 @@
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
+            if (-f "/usr/bin/lintian") {
+                pb_system("lintian $made","Checking validity of debs with lintian");
+            }
         } elsif ($dtype eq "ebuild") {
             my @ebuildfile;
@@ -528 +498 @@
     }
     my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init($odir,$over);
-    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n");
 
     # Get content saved in cms2build
@@ -575 +545 @@
     }
 
-    print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
+    pb_log(2,"Sources handled ($cmt): $src\n");
     my ($sshhost,$sshlogin,$sshdir,$sshport,$vmtmout,$testver) = pb_conf_get($host,$login,$dir,$port,$tmout,"testver");
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
@@ -723 +693 @@
         }
         if (! -f "$vem") {
-            print "Unable to find VM $vem\n";
+            pb_log(0,"Unable to find VM $vem\n");
         } else {
             pb_system("$cmd &","Launching the VM $vem");
@@ -730 +700 @@
         }
     } else {
-        print "Found an existing VM $vem (pid $veexist)\n";
+        pb_log(0,"Found an existing VM $vem (pid $veexist)\n");
     }
     return($veexist,$vepid);
@@ -798 +768 @@
         }
         if (! -f "$vmm") {
-            print "Unable to find VM $vmm\n";
+            pb_log(0,"Unable to find VM $vmm\n");
         } else {
             pb_system("$cmd &","Launching the VM $vmm");
@@ -805 +775 @@
         }
     } else {
-        print "Found an existing VM $vmm (pid $vmexist)\n";
+        pb_log(0,"Found an existing VM $vmm (pid $vmexist)\n");
     }
     return($vmexist,$vmpid);
@@ -864 +834 @@
 
     die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
-    my $cms=pb_cms_init($ENV{'PBPROJ'});
-    if ($cms->{$ENV{'PBPROJ'}} ne "svn") {
+    my $scheme=pb_cms_init($ENV{'PBPROJ'});
+    if ($scheme ne "svn") {
         die "Only SVN is supported at the moment";
     }
-    my $res = pb_cms_isdiff($cms);
+    my $res = pb_cms_isdiff($scheme);
     die "You need to have no differences before creating a new version" if ($res != 0);
-    my $cmsurl = pb_cms_getinfo($cms,$ENV{'PBROOT'});
+    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBROOT'},"URL:");
     my $newurl = dirname($cmsurl)."/$newver";
-    pb_cms_copy($cms,$cmsurl,$newurl);
-    pb_cms_checkout($cms,$newurl,"$ENV{'PBROOT'}/../$newver");
+    pb_cms_copy($scheme,$cmsurl,$newurl);
+    pb_cms_checkout($scheme,$newurl,"$ENV{'PBROOT'}/../$newver");
     my $oldver=basename($cmsurl);
     open(FILE,"$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb";
@@ -884 +854 @@
     close(OUT);
     rename("$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb");
-    pb_cms_checkin($cms,"$ENV{'PBROOT'}/../$newver");
+    pb_cms_checkin($scheme,"$ENV{'PBROOT'}/../$newver");
 }
 
@@ -905 +875 @@
     @pkgs = @ARGV;
 }
-print $LOG "Packages: ".join(',',@pkgs)."\n" if ($debug >= 0);
+pb_log(2,"Packages: ".join(',',@pkgs)."\n");
 return(\@pkgs);
 }
@@ -928 +898 @@
     $all = 1;
 }
-print $LOG "VMs: $ENV{'PBVM'}\n";
+pb_log(2,"VMs: $ENV{'PBVM'}\n");
 @vm = split(/,/,$ENV{'PBVM'});
 return(\@vm,$all);
@@ -969 +939 @@
     next if ($f =~ /^\./);
     move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
-    print $LOG "mv $dir/$f $ddir\n" if ($debug >= 1);
+    pb_log(2,"mv $dir/$f $ddir\n");
     push @files,"$ddir/$f";
 }
@@ -978 +948 @@
 }
 
+sub pb_list_bfiles {
+
+my $dir = shift;
+my $pbpkg = shift;
+my $bfiles = shift;
+my $pkgfiles = shift;
+my $supfiles = shift;
+
+opendir(BDIR,"$dir") || die "Unable to open dir $dir: $!";
+foreach my $f (readdir(BDIR)) {
+    next if ($f =~ /^\./);
+    $bfiles->{$f} = "$dir/$f";
+    $bfiles->{$f} =~ s~$ENV{'PBROOT'}~~;
+    if (defined $supfiles->{$pbpkg}) {
+        $pkgfiles->{$f} = "$dir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+    }
+}
+closedir(BDIR);
+}
+
 sub pb_syntax {
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -10 +10 @@
 use File::Basename;
 use File::Path;
+use File::Copy;
 use File::Temp qw /tempdir/;
 use Data::Dumper;
+use POSIX qw(strftime);
 
 use ProjectBuilder::Changelog qw (pb_changelog);
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
+
+my $debug = 0;
+my $LOG = \*STDOUT;
 
 sub pb_env_init {
@@ -24 +29 @@
 my $tag;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
 #
 # Check project name
@@ -44 +45 @@
 #
 my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconf");
-print "DEBUG pbconf: ".Dumper($pbconf)."\n" if ($debug >= 1);
+pb_log(2,"DEBUG pbconf: ".Dumper($pbconf)."\n");
 
 my %pbconf = %$pbconf;
@@ -50 +51 @@
     # Take the first as the default project
     $proj = (keys %pbconf)[0];
-    if (($debug >= 0) and (defined $proj)) {
-        print $LOG "WARNING: using $proj as default project as none has been specified\n" 
-        print $LOG "Please create a pbconf reference for project $proj in $ENV{'PBETC'}\nif you want to use another project\n";
+    if (defined $proj) {
+        pb_log(2,"WARNING: using $proj as default project as none has been specified\n");
+        pb_log(2,"Please create a pbconf reference for project $proj in $ENV{'PBETC'}\nif you want to use another project\n");
     }
 }
@@ -69 +70 @@
 # Tree will look like this:
 #
-#             maint pbdir                                              dev dir (optional)
-#                  |                                                      |
-#            ------------------------                              --------------------
-#            |                      |                              |                  |
-#         pbproj1                pbproj2                        pbproj1           pbproj2
-#            |                                                     |
-#  ---------------------------------------------              ----------
-#  *      *        |       |        |          |              *        *
-# 1.0    dev    pbconf    ...     build     delivery         1.0      dev
-#                  |                |          |
-#               ------                        pbrc
+#             maint pbdir                            PBDIR               dev dir (optional)   PBDEVDIR
+#                  |                                                        |
+#            ------------------------                                --------------------
+#            |                      |                                |                  |
+#         pbproj1                pbproj2             PBPROJ       pbproj1           pbproj2   PBDEVPROJ
+#            |                                                       |
+#  ---------------------------------------------                ----------
+#  *      *        |       |        |          |                *        *
+# 1.0    dev    pbconf    ...     build     delivery PBCONF    1.0      dev                   PBDEVROOT
+#                  |                           |     PBDESTDIR
+#               ------                        pbrc   PBBUILDDIR
 #               |    |       
-#              1.0  dev     
+#              1.0  dev                              PBROOT
 #                    |
 #               ----------------------------------
@@ -101 +102 @@
 if (not defined $ENV{'PBDIR'}) {
     if (not defined ($pbdir{$ENV{'PBPROJ'}})) {
-        print $LOG "WARNING: no pbdir defined, using /var/cache\n";
-        print $LOG "Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\nif you want to use another directory\n";
+        pb_log(2,"WARNING: no pbdir defined, using /var/cache\n");
+        pb_log(2,"Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\nif you want to use another directory\n");
     }
     # That's always the environment variable that will be used
@@ -157 +158 @@
 
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
-my $cms = { $ENV{'PBPROJ'} => $scheme };
 
 if ((not -d "$ENV{'PBCONF'}") || (defined $pbinit)) {
-    pb_cms_checkout($cms,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
+    pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
 } else {
-    my $cmsurl = pb_cms_getinfo($cms,$ENV{'PBCONF'});
+    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBCONF'},"URL:");
     if ($cmsurl !~ /^$scheme/) {
         pb_rm_rf("$ENV{'PBCONF'}");
-        pb_cms_checkout($cms,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
+        pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
     } elsif ($cmsurl ne $pbconf{$ENV{'PBPROJ'}}) {
         # The local content doesn't correpond to the repository
-        print $LOG "ERROR: Inconsistency detected:\n";
-        print $LOG "* $ENV{'PBCONF'} refers to $cmsurl but\n";
-        print $LOG "* $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n";
+        pb_log(2,"ERROR: Inconsistency detected:\n");
+        pb_log(2,"* $ENV{'PBCONF'} refers to $cmsurl but\n");
+        pb_log(2,"* $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n");
         die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
     } else {
@@ -181 +181 @@
     if (! -f ("$ENV{'PBDESTDIR'}/pbrc")) {
         opendir(DIR,$ENV{'PBCONF'}) || die "Unable to open directory $ENV{'PBCONF'}: $!";
-        my maxmtime = 0;
+        my $maxmtime = 0;
         foreach my $d (readdir(DIR)) {
             next if ($d =~ /^\./);
@@ -194 +194 @@
         }
         closedir(DIR);
-        print $LOG "WARNING: no pbroot defined, using $ENV{'PBROOT'}\n";
-        print $LOG "Please -r release if you want to use another release\n";
+        pb_log(2,"WARNING: no pbroot defined, using $ENV{'PBROOT'}\n");
+        pb_log(2,"Please -r release if you want to use another release\n");
     } else {
         my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot");
         # That's always the environment variable that will be used
-        $ENV{'PBROOT'} = $pbroot{$ENV{'PBPROJ'}};
+        $ENV{'PBROOT'} = $pbroot->{$ENV{'PBPROJ'}};
     }
 } else {
     # transform in full path if relative
-    $ENV{'PBROOT'} = "$ENV{'PBCONF'}/$ENV{'PBROOT'}" if ($ENV{'PBROOT'} !~ |/|);
+    $ENV{'PBROOT'} = "$ENV{'PBCONF'}/$ENV{'PBROOT'}" if ($ENV{'PBROOT'} !~ /\//);
 }
 
@@ -220 +220 @@
     # Project version and tag (optional)
     my ($extpkgdir, $version, $filteredfiles, $supfiles, $pkgv, $pkgt) = pb_conf_get_if("extpkgdir","version","filteredfiles","supfiles","projver","projtag");
-    print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
-    print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
-    print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1);
-    print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1);
-    print "DEBUG: supfiles: ".Dumper($supfiles)."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n");
+    pb_log(2,"DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n");
+    pb_log(2,"DEBUG: version: ".Dumper($version)."\n");
+    pb_log(2,"DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n");
+    pb_log(2,"DEBUG: supfiles: ".Dumper($supfiles)."\n");
     # Global
     %defpkgdir = %$defpkgdir;
@@ -718 +718 @@
         pb_mkdir_p("$ENV{'PBROOT'}/pkg1/pbfilter") || die "Unable to create $ENV{'PBROOT'}/pkg1/pbfilter";
 
-        print "\nDo not to forget to commit the pbconf directory in your CMS if needed\n";
-        print "After having renamed the pkg1 directory to your package's name      \n\n";
+        pb_log(2,"\nDo not to forget to commit the pbconf directory in your CMS if needed\n");
+        pb_log(2,"After having renamed the pkg1 directory to your package's name      \n\n");
     } else {
         die "Unable to open $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb";
@@ -725 +725 @@
 }
 umask 0022;
-return($debug,$LOG, \%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
+return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
 }
 
@@ -748 +748 @@
 my $cmt=shift || $cmd;
 
-print "$cmt... ";
+pb_log(2,"$cmt... ");
 #system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 system($cmd);
 if ($? == -1) {
-    print "failed to execute ($cmd) : $!\n";
+    pb_log(2,"failed to execute ($cmd) : $!\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? & 127) {
-    printf "child ($cmd) died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
+    pb_log(2, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? == 0) {
-    print "OK\n";
+    pb_log(2,"OK\n");
 } else {
-    printf "child ($cmd) exited with value %d\n", $? >> 8;
+    pb_log(2, "child ($cmd) exited with value ".($? >> 8)."\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 }
@@ -785 +785 @@
 my @return = pb_conf_get_if(@param);
 
-die "No params found for $ENV{'PBPROJ'}" if (not defined @return);
+die "No params found for $ENV{'PBPROJ'}" if (not @return);
 
 foreach my $i (0..$#param) {
@@ -807 +807 @@
 my $p2;
 
-#print "DEBUG: param1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
-#print "DEBUG: param2: ".Dumper(@ptr2)."\n"; # if ($debug >= 1);
+pb_log(2,"DEBUG: param1: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: param2: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -842 +842 @@
     }
     $ptr1[$i] = $p1;
-    #print "DEBUG: param ptr1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+    pb_log(2,"DEBUG: param ptr1: ".Dumper(@ptr1)."\n");
 }
 return(@ptr1);
@@ -870 +870 @@
 my %h;
 
-my $debug = 0;
-
 open(CONF,$conffile) || die "Unable to open $conffile";
 while(<CONF>) {
     if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-        print "DEBUG: 1:$1 2:$2 3:$3\n" if ($debug >= 1);
+        pb_log(2,"DEBUG: 1:$1 2:$2 3:$3\n");
         $h{$1}{$2}=$3;
     }
@@ -884 +882 @@
     push @ptr,$h{$param};
 }
-print "DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n" if ($debug >= 1);
+pb_log(2,"DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n");
 return(@ptr);
 }
@@ -898 +896 @@
          $uri =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?|;
 my ($account,$host,$port) = $authority =~ m|(?:([^\@]+)\@)?([^:]+)(:(?:[0-9]+))?|;
-print "DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n" if ($debug >= 1);
+pb_log(2,"DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n");
 return($scheme, $account, $host, $port, $path);
 }
@@ -907 +905 @@
 
 my $proj = shift || undef;
-my $ret;
-
-my ($cms) = pb_conf_get("cms");
-
-if ($cms->{$proj} eq "svn") {
-    $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
-    chomp($ENV{'PBREVISION'});
+
+# Use the project URI
+my ($uri) = pb_conf_get("pburl");
+
+# Extract values from that URI
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri->{$ENV{'PBPROJ'}});
+
+if ($scheme =~ /^svn/) {
+    $ENV{'PBREVISION'}= pb_cms_getinfo($scheme,$uri->{$ENV{'PBPROJ'}},"Revision:");
+    #$ENV{'PBREVISION'}=`(cd "$ENV{'PBDEVDIR'}" ; svnversion .)`;
     $ENV{'PBCMSLOGFILE'}="svn.log";
-} elsif ($cms->{$proj} eq "flat") {
+} elsif (($scheme eq "file") || ($scheme eq "ftp") || ($scheme eq "http")) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
-} elsif ($cms->{$proj} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     # Way too slow
     #$ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
@@ -930 +931 @@
     $ENV{'CVS_RSH'} = $cvsrsh->{$proj} if (defined $cvsrsh->{$proj});
 } else {
-    die "cms $cms->{$proj} unknown";
-}
-return($cms);
+    die "cms $scheme unknown";
+}
+
+#
+#if (not defined $scheme) {
+    # We're an upstream guy
+    # Try to make it easy for us
+    #pb_log(2,"WARNING: Assuming a local project under $ENV{'PBDIR'}/$ENV{'PBPROJ'}:\n");
+    #pb_log(2,"If not, pleaase setup a pbproj entry in $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb\n");
+    #return("");
+#}
+
+return($scheme,$uri->{$ENV{'PBPROJ'}});
+}
+
+sub pb_get_date {
+    
+return(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 }
 
 sub pb_cms_export {
-my $cms = shift;
-my $pbdate = shift || undef;
+
+my $scheme = shift;
 my $source = shift;
 my $destdir = shift;
@@ -943 +959 @@
 my $tmp1;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+my @date = pb_get_date();
+
+if ($scheme eq "svn") {
     if (-d $source) {
         $tmp = $destdir;
@@ -950 +968 @@
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+} elsif ($scheme eq "flat") {
     if (-d $source) {
         $tmp = $destdir;
@@ -957 +975 @@
     }
     pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     my $dir=dirname($destdir);
     my $base=basename($destdir);
@@ -970 +988 @@
     # CVS needs a relative path !
     my ($cvsroot) = pb_conf_get("cvsroot");
+    my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
     pb_system("cd $dir ; cvs -d $cvsroot->{$ENV{'PBPROJ'}} export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
@@ -981 +1000 @@
 my $authors=shift;
 my $dest=shift;
-my $cms=shift;
+my $scheme=shift;
 
 return if ($authors eq "/dev/null");
@@ -992 +1011 @@
     chomp($gcos);
     print DAUTH "$gcos";
-    if (defined $cms) {
-        print DAUTH " ($nick under $cms)\n";
+    if (defined $scheme) {
+        print DAUTH " ($nick under $scheme)\n";
     } else {
         print DAUTH "\n";
@@ -1003 +1022 @@
 
 sub pb_cms_log {
-my $cms = shift;
+my $scheme = shift;
 my $pkgdir = shift;
 my $dest = shift;
@@ -1009 +1028 @@
 my $authors = shift;
 
-pb_create_authors($authors,$dest,$cms->{$ENV{'PBPROJ'}});
-
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+pb_create_authors($authors,$dest,$scheme);
+
+if ($scheme eq "svn") {
     if (! -f "$dest/ChangeLog") {
         if (-x "/usr/bin/svn2cl") {
-            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN with svn2cl");
         } else {
             # To be written from pbcl
@@ -1020 +1039 @@
         }
     }
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+} elsif ($scheme eq "flat") {
     if (! -f "$dest/ChangeLog") {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     }
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     my $tmp=basename($pkgdir);
     # CVS needs a relative path !
     if (! -f "$dest/ChangeLog") {
         if (-x "/usr/bin/cvs2cl") {
-            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS");
+            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS with cvs2cl");
         } else {
             # To be written from pbcl
@@ -1036 +1055 @@
     }
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_getinfo {
-my $cms = shift;
+my $scheme = shift;
 my $dir = shift;
-my $url = "";
+my $info = shift || "URL:";
+
+my $res = "";
 my $void = "";
 
-if ($cms->{$ENV{'PBPROJ'}} =~ /^svn/) {
+if ($scheme =~ /^svn/) {
     open(PIPE,"LANGUAGE=C svn info $dir |") || return("");
     while (<PIPE>) {
-        ($void,$url) = split(/^URL:/) if (/^URL:/);
+        ($void,$res) = split(/^$info/) if (/^$info/);
     }
     close(PIPE);
-    chomp($url);
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+    chomp($res);
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
-}
-return($url);
+    die "cms $scheme unknown";
+}
+return($res);
 }
 
 sub pb_cms_copy {
-my $cms = shift;
+my $scheme = shift;
 my $oldurl = shift;
 my $newurl = shift;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme eq "svn") {
     pb_system("svn copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_checkout {
-my $cms = shift;
+my $scheme = shift;
 my $url = shift;
 my $destination = shift;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme =~ /^svn/) {
     pb_system("svn co $url $destination","Checking $url to $destination ");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_checkin {
-my $cms = shift;
+my $scheme = shift;
 my $dir = shift;
 
 my $ver = basename($dir);
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme eq "svn") {
     pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir");
     pb_system("svn up $dir","Updating $dir");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_isdiff {
-my $cms = shift;
-
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+my $scheme = shift;
+
+if ($scheme eq "svn") {
     open(PIPE,"svn diff $ENV{'PBROOT'} |") || die "Unable to get svn diff from $ENV{'PBROOT'}";
     my $l = 0;
@@ -1114 +1135 @@
     }
     return($l);
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
@@ -1126 +1147 @@
 
 sub pb_get_filters {
-
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
 
 my @ffiles;
@@ -1172 +1189 @@
 }
 if (@ffiles) {
-    print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG ffiles: ".Dumper(\@ffiles)."\n");
 
     foreach my $f (@ffiles) {
@@ -1184 +1201 @@
 
         $ptr = $h{"filter"};
-        print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+        pb_log(2,"DEBUG f:".Dumper($ptr)."\n");
     }
 } else {
@@ -1213 +1230 @@
 my $chglog = shift || undef;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
-print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
+pb_log(2,"DEBUG: From $f to $destfile\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
@@ -1225 +1238 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug >= 1);
+        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
         # Expand variables if any single one found
-        print $LOG "DEBUG tmp: $tmp\n" if ($debug >= 1);
+        pb_log(2,"DEBUG tmp: $tmp\n");
         if ($tmp =~ /\$/) {
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
@@ -1245 +1258 @@
 close(FILE);
 close(DEST);
+}
+
+# Function which applies filter on files (external call)
+sub pb_filter_file_inplace {
+
+my $ptr=shift;
+my %filter=%$ptr;
+my $destfile=shift;
+my $pbproj=shift;
+my $pbpkg=shift;
+my $pbver=shift;
+my $pbtag=shift;
+my $pbrev=shift;
+my $pbdate=shift;
+my $pbpackager=shift;
+
+my $cp = "$ENV{'PBTMP'}/".basename($destfile);
+copy($destfile,$cp) || die "Unable to create $cp";
+
+pb_filter_file($cp,$ptr,$destfile,$pbproj,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+unlink $cp;
 }
 
@@ -1262 +1296 @@
 my $pbpackager=shift;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
-print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
+pb_log(2,"DEBUG: From $f to $destfile\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
@@ -1274 +1304 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
+        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
@@ -1289 +1319 @@
 }
 
+sub pb_log_init {
+
+$debug = shift || 0;
+$LOG = shift || \*STDOUT;
+
+} 
+
+sub pb_log {
+
+my $dlevel = shift;
+my $msg = shift;
+
+print $LOG "$msg\n" if ($dlevel >= $debug);
+}
 
 1;

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -42 +42 @@
 
 if (((not defined $chglog) || (! -f $chglog)) && ($doit eq "yes")) {
-    #print "No ChangeLog file ($chglog) for $pkg\n";
+    #pb_log(2,"No ChangeLog file ($chglog) for $pkg\n";
     print $OUTPUT "\n";
     return;
@@ -95 +95 @@
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
-    #print "**$date**\n";
+    #pb_log(2,"**$date**\n";
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    #print "**$ndate**\n";
+    #pb_log(2,"**$ndate**\n";
 
     if (($dtype eq "rpm") || ($dtype eq "fc")) {

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -212 +212 @@
         my $found = 0;
         my $ptr = $distro_similar{$d};
-        #print $LOG "amb: ".Dumper($ptr)."\n" if ($debug >= 1);
+        #pb_log(2,$LOG "amb: ".Dumper($ptr)."\n" if ($debug >= 1);
         $release = "unknown";
         foreach my $dd (@$ptr) {
-            #print $LOG "check $dd\n" if ($debug >= 1);
+            #pb_log(2,$LOG "check $dd\n" if ($debug >= 1);
             # Try to check pattern
             if (defined $distro_match{$dd}) {
-                #print $LOG "cmp: $distro_match{$dd} - vs - $tmp\n" if ($debug >= 1);
+                #pb_log(2,$LOG "cmp: $distro_match{$dd} - vs - $tmp\n" if ($debug >= 1);
                 ($release) = $tmp =~ m/$distro_match{$dd}/m;
                 if ((defined $release) && ($release ne "unknown")) {