[sabayon-createrepo] sign won't return true also if succeeds but repos have to be synced

builder

@@ -70,17 +70,19 @@ sub calculate_missing {
     # Getting the package dependencies and the installed packages
     say "[$package] Getting the package dependencies and the installed packages";
     my @dependencies = package_deps( $package, $depth, 1 );
-    my %install_dependencies = map { $_ => 1 } @dependencies;
-    # Look for any virtuals and remove its immediate dependencies to avoid
-    # installing multiple conflicting packages one by one
-    my @virtual_deps;
-    for my $dep (@dependencies) {
-        push(@virtual_deps, package_deps( $dep, 1, 1 )) if ( $dep =~ /^virtual\// );
-    }
-    for my $dep (@virtual_deps) {
-        $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
-    }
-    @dependencies = grep { $install_dependencies{$_} } @dependencies;
+
+    # XXX: Endless loop as for now.
+    # my %install_dependencies = map { $_ => 1 } @dependencies;
+    # # Look for any virtuals and remove its immediate dependencies to avoid
+    # # installing multiple conflicting packages one by one
+    # my @virtual_deps;
+    # for my $dep (@dependencies) {
+    #     push(@virtual_deps, package_deps( $dep, 1, 1 )) if ( $dep =~ /^virtual\// );
+    # }
+    # for my $dep (@virtual_deps) {
+    #     $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
+    # }
+    # @dependencies = grep { $install_dependencies{$_} } @dependencies;
 
     #taking only the 4th column of output as key of the hashmap
     my %installed_packs =

sabayon-createrepo

@@ -25,6 +25,10 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
 )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
+
+
 if [ $# -eq 0 ]
 then
  docker_volumes+=(-v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
@@ -51,7 +55,7 @@ mkdir -p /sabayon/artifacts
 
 if [ -d "/sabayon/artifacts/standard" ]; then
   eit unlock \$repo || true
-  eit pull --quick $repo || true
+  eit pull --quick \$repo || true
   #eit sync \$repo
 else
   echo "Yes" | eit init --quick \$repo
@@ -59,6 +63,10 @@ fi
 
 echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
+
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] &&\
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; }
+
 eit push --quick --force
 
 EOF