- added the notification of the module database used in the right place

- added a notification for tables creation in database

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14498 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/make-gosa-package b/gosa-core/contrib/make-gosa-package
index acb7c37a606147aa8678614a3d0c4db1de6b7df9..e3124051fe2e7cae8b783dd96cd24d5035bef23b 100755 (executable)
--- a/gosa-core/contrib/make-gosa-package
+++ b/gosa-core/contrib/make-gosa-package
@@ -29,7 +29,7 @@ MAKE_GOTO=""
 GOTO=""
 PBUILDER=""
 NOT_RELEASED="heimdal dak dfs glpi apache2"
-GOTO_NOT_RELEASED="apache-directory-studio goto-cd libresourcepool-net-ldap-perl-1.002 libresourcepool-perl-1.0104 openproj ptc syslinux" 
+GOTO_NOT_RELEASED="apache-directory-studio goto-cd libresourcepool-net-ldap-perl-1.002 libresourcepool-perl-1.0104 openproj ptc syslinux konch" 
 DEBIAN_PKG="remove"
 NO_SVN="use"
 EXTRACT=`pwd`
@@ -51,7 +51,7 @@ usage() {
          -n|--no-svn       Don't extract gosa from svn (when internet connectivity is not present)
          -x|--extract-dir  Directory where the checkout is for no-svn
          -g|--build-goto   Build the goto2 packages
-          -l|--use-pbuilder Use pbuilder to build the packages
+         -l|--use-pbuilder Use pbuilder to build the packages
          -h|--help         this help
 
        EOF
@@ -334,12 +334,11 @@ then
        fi
 else
        echo "Creating debian packages..."
-       echo $PBUILDER
 
        for dir in $GOSA_DIR $GOSA_SI_DIR $GOSA_PLUGIN_DIRS; do
        if [ "$PBUILDER" = "use" ]
        then
-               echo "using pbuilder"
+               echo "using pbuilder to build gosa gosa-si gosa-plugins"
                (cd "$dir"; pdebuild)
        else
                (cd "$dir"; dpkg-buildpackage -k$DEBSIGN_KEYID -rfakeroot -sa)

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 3cb1c23ac8791117eb7986ff1a2b779faacf18c6..7b1a5569b8e2b1822344cce134106065910582c7 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -63,7 +63,6 @@ my $db_module = "DBsqlite";
 no strict "refs";
 require ("GOSA/".$db_module.".pm");
 ("GOSA/".$db_module)->import;
-daemon_log("0 INFO: importing database module '$db_module'", 1);
 }
 
 my $modules_path = "/usr/lib/gosa-si/modules";
@@ -3526,6 +3525,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1);
     no strict "refs";
 
     if ($db_module eq "DBmysql") {
+
+        daemon_log("0 INFO: importing database module '$db_module'", 1);
+
         # connect to incoming_db
         $incoming_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
@@ -3557,6 +3559,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1);
         $messaging_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
     } elsif ($db_module eq "DBsqlite") {
+
+        daemon_log("0 INFO: importing database module '$db_module'", 1);
+
         # connect to incoming_db
         unlink($incoming_file_name);
         $incoming_db = GOSA::DBsqlite->new($incoming_file_name);
@@ -3619,6 +3624,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1);
 }
 
 # Creating tables
+
+daemon_log("0 INFO: creating tables in database with '$db_module'", 1);
+
 $messaging_db->create_table($messaging_tn, \@messaging_col_names);
 $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);
 $fai_release_db->create_table($fai_release_tn, \@fai_release_col_names);