From 7cba9e80147899b145481348f8d83197425e3a84 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 12 Nov 2011 10:32:11 +0100
Subject: [PATCH] [bin] force ::repo on portage atoms by default for
 bump_kernel_tag_mods*

---
 bin/bump_kernel_tag_mods        | 17 ++++++++++++++---
 bin/bump_kernel_tag_mods_inject | 13 ++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/bin/bump_kernel_tag_mods b/bin/bump_kernel_tag_mods
index 33f9a21..898e540 100755
--- a/bin/bump_kernel_tag_mods
+++ b/bin/bump_kernel_tag_mods
@@ -9,9 +9,12 @@ args = sys.argv[1:]
 only_injected = "--only-injected" in args
 if only_injected:
     args.remove("--only-injected")
+do_spm_repo = "--no-spm-repo" not in args
+if not do_spm_repo:
+    args.remove("--no-spm-repo")
 
 if len(args) < 3:
-    print("bump_kernel_tag_mods <query tag> <compile tag> <source (query) repo> <destination entropy repo>")
+    print("bump_kernel_tag_mods <query tag> <compile tag> <source (query) repo> <destination entropy repo> [--only-injected] [--no-spm-repo]")
     raise SystemExit(1)
 
 kernel_tag = args.pop(0)
@@ -41,8 +44,16 @@ try:
         else:
             normal_pkgs.append(pkg_id)
 
-    normal_atoms = [entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) for pkg_id in normal_pkgs]
-    injected_atoms = [entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) for pkg_id in injected_pkgs]
+    normal_atoms = []
+    injected_atoms = []
+    for lst in (normal_pkgs, injected_pkgs):
+        for pkg_id in lst:
+            atom_str = entropy.dep.remove_tag(repo.retrieveAtom(pkg_id))
+            if do_spm_repo:
+                spm_repo = repo.retrieveSpmRepository(pkg_id)
+                if spm_repo is not None:
+                    atom_str += "::" + spm_repo
+            lst.append(atom_str)
 finally:
     srv.shutdown()
 
diff --git a/bin/bump_kernel_tag_mods_inject b/bin/bump_kernel_tag_mods_inject
index 0575b2b..9828f95 100755
--- a/bin/bump_kernel_tag_mods_inject
+++ b/bin/bump_kernel_tag_mods_inject
@@ -5,9 +5,12 @@ import os
 import tempfile
 
 args = sys.argv[1:]
+do_spm_repo = "--no-spm-repo" not in args
+if not do_spm_repo:
+    args.remove("--no-spm-repo")
 
 if len(args) < 3:
-    print("bump_kernel_tag_mods <query tag> <compile tag> <source (query) repo> <destination entropy repo>")
+    print("bump_kernel_tag_mods <query tag> <compile tag> <source (query) repo> <destination entropy repo> [--no-spm-repo]")
     raise SystemExit(1)
 
 kernel_tag = args.pop(0)
@@ -29,6 +32,14 @@ try:
     if not pkg_ids:
         print("!!! no packages for kernel_tag")
 
+    injected_atoms = []
+    for pkg_id in injected_atoms:
+        atom_str = entropy.dep.remove_tag(repo.retrieveAtom(pkg_id))
+        if do_spm_repo:
+            spm_repo = repo.retrieveSpmRepository(pkg_id)
+            if spm_repo is not None:
+                atom_str += "::" + spm_repo
+        injected_atoms.append(atom_str)
     injected_atoms = [entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) for pkg_id in pkg_ids]
 finally:
     srv.shutdown()