ENH: do not bother proceeding if config is the same already + enable sources based...

[neurodebian.git] / tools / nd-aptenable

diff --git a/tools/nd-aptenable b/tools/nd-aptenable
index d279351ed488321803944009d2091b0da26aa0a2..32dc7a7a9431079bb6ad9f76c72ac080379bcc39 100755 (executable)
--- a/tools/nd-aptenable
+++ b/tools/nd-aptenable
@@ -105,7 +105,7 @@ Options:
     Comma separated list of components to enable among:
      software -- primary software repository
      data -- data packages
-     devel -- "overlay" of development versions (like Debian "experimental").
+     devel -- "overlay" of development versions (like Debians' "experimental").
               Not sufficient on its own and available only from the main site
     If not specified -- "software,data"
 
@@ -122,7 +122,8 @@ Options:
     multiple repositories
 
   --sources, --no-sources
-    Either to enable deb-src lines.  If not specified -- deduced based on ??? TODO
+    Either to enable deb-src lines.  If none specified -- would be enabled if
+    sources for a core package (apt) are available.
 
   -n, --dry-run
     Do not perform any changes -- generated configurations and commands will
@@ -175,12 +176,19 @@ get_neurodebian_cfg()
     # if not -- should blow up
 }
 
+query_cfg_section()
+{
+    config_file="$1"
+    section="$2"
+    python -c "from ConfigParser import SafeConfigParser as SP; cfg = SP(); cfg.read('$config_file'); print('\n'.join([' '.join(x) for x in cfg.items('$section')]))"
+}
+
 get_mirrors()
 {
 #    echo "TODO: fetch uptodate neurodebian.cfg"
     nd_config=`get_neurodebian_cfg`
-    $exe_dir/nd_querycfg --config-file="$nd_config" "mirrors" \
-    | sed -e 's,=, ,'g \
+#    $exe_dir/nd_querycfg -F" " --config-file="$nd_config" "mirrors" \
+    query_cfg_section "$nd_config" "mirrors" \
     | while read mirror_name mirror_url; do
         # verify that url is just a url
         if echo "$mirror_url" | grep -v -e '^[a-z0-9:+]*://[-+_%.a-z0-9/]*$'; then
@@ -333,7 +341,11 @@ case $ae_flavor in
  *) error 5 "Unknown value of flavor $apt_flavor.  Must be full or libre"
 esac
 
-if [ -z "$ae_sources" ] || [ $ae_sources -eq 0 ]; then
+if [ -z "$ae_sources" ]; then
+    apt-cache showsrc apt >&/dev/null && ae_sources=1 || ae_sources=0
+fi
+
+if [ $ae_sources -eq 0 ]; then
     sources_comment="#"
 else
     sources_comment=""
@@ -366,17 +378,26 @@ ${sources_comment}deb-src http://neuro.debian.net/debian-devel $ae_release main
 fi
 
 if [ -e "$ae_output_file" ] && [ -z "$ae_overwrite" ]; then
-    # error 3
-    print_verbose 1 "File $ae_output_file already exists, containing:\n\n`cat \"$ae_output_file\"`\n\nI: Use --overwrite option to regenerate with:\n\n$apt_list"
-    if get_apt_policy NeuroDebian >/dev/null; then
-        print_verbose 1 "NeuroDebian repositories are already available, thus skipping the rest."
-        print_verbose 1 "Rerun with --overwrite if you would like to reconfigure."
+    # TODO: compare the content
+    if diff "$ae_output_file" <(echo "$apt_list") | grep -q .; then
+        # error 3
+        print_verbose 1 "File $ae_output_file already exists, containing:\n`cat \"$ae_output_file\"`\n\nI: New configuration is different:\n$apt_list"
+        if get_apt_policy NeuroDebian >/dev/null; then
+            print_verbose 1 "NeuroDebian repositories are already available, thus skipping the rest."
+            print_verbose 1 "Rerun with --overwrite if you would like to reconfigure."
+            exit 0
+        else
+            print_verbose 1 "NeuroDebian configuration is found but not yet available -- continuing with new configuration."
+        fi
+    else
+        print_verbose 1 "New configuration is identical to existing and NeuroDebian repository is already enabled."
+        print_verbose 1 "Skiping the rest. Rerun with --overwrite if you would like to reconfigure."
         exit 0
     fi
 else
     print_verbose 1 "Generating $ae_output_file"
     if [ -z "$ae_dry_run" ]; then
-        echo "$apt_list" >| "$ae_output_file"
+        echo "$apt_list" | $ae_sudo bash -c "cat - >| '$ae_output_file'"
     else
         echo "DRY:"
         echo "$apt_list"
@@ -401,7 +422,7 @@ fi
 
 print_verbose 1 "Updating APT listings, might take a few minutes"
 if [ -z "$ae_dry_run" ]; then
-    apt_logfile=$(ae_tempdir)/apt.log
+    apt_logfile="$ae_tempdir/apt.log"
     $ae_sudo apt-get update 1>"$apt_logfile" 2>&1 \
         && rm -f "$apt_logfile" \
         || {