[gentoo-commits] proj/grss:master commit in: bin/

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     0da0afe8badba52d21a9dcfcf5fb2c2229fbd13e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 15:43:56 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 15:43:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=0da0afe8

bin/grsup: Implement -l.  Cleanup flag sanity check.

 bin/grsup | 56 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/bin/grsup b/bin/grsup
index 2e726f0..3d5d1cc 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -93,26 +93,55 @@ def install_kernel(version = 'latest', logfile = CONST.LOGFILE):
     os.chdir(cwd)
 
 
-def usage(rc=1):
-    usage = """
-usage: grsup [pkg(s)]       : update @world or pkg(s) if given
-       grsup [-r|-d] pkg(s) : re-install or delete pkg(s)
+def usage(rc=1, extra=""):
+    use = """
+usage: grsup [-l] [pkg(s)]  : update @world or pkg(s) if given
+                            : prefer binpkgs unless -l is given
+       grsup [-l] -r pkg(s) : re-install pkg(s)
+                            : prefer binpkgs unless -l is given
+       grsup -d pkg(s)      : delete pkg(s)
        grsup -D             : download all @world pkgs, don't install
        grsup -k <version>   : install kernel <version> or 'latest'
        grsup -h             : print this help
 """
-    print(usage)
+    if extra:
+        print('\nCombination of parameters invalid: %s' % extra)
+    print(use)
     sys.exit(rc)
 
 
+def sanitize(opts, x):
+    lopt = ('-l','')
+    singleflags = [ '-d', '-D', '-k', '-h' ]
+    noargsflags = [ '-D', '-k', '-h' ]
+    for o, a in opts:
+        if o in singleflags and len(opts) > 1:
+            usage(extra=' '.join(sys.argv[1:]))
+        if o in noargsflags and len(x) > 0:
+            usage(extra=' '.join(sys.argv[1:]))
+        if ( o == '-r' or o == '-d')  and len(x) == 0:
+            usage(extra=' '.join(sys.argv[1:]))
+        if o == '-r' and len(opts) > 2:
+            usage(extra=' '.join(sys.argv[1:]))
+        if o == '-r' and len(opts) == 2 and not lopt in opts:
+            usage(extra=' '.join(sys.argv[1:]))
+
+
 def main():
     myaction, myopts, myfiles = parse_opts(sys.argv[1:])
 
     try:
-        opts, x = getopt(sys.argv[1:], 'Ck:rdh')
+        opts, x = getopt(sys.argv[1:], 'lDk:rdh')
+        sanitize(opts, x)
     except GetoptError:
         usage()
 
+    do_local = False
+    lopt = ('-l','')
+    if lopt in opts:
+        do_local = True
+        opts.remove(lopt)
+
     do_install_kernel = False
     if len(opts) == 0:
         args = ['-1', '-g', '-K', '-u', '-D', '-q']
@@ -120,32 +149,25 @@ def main():
             myfiles = ['@world']
         args.extend(myfiles)
     else:
-        exclude = 0
         for o, a in opts:
             if o == '-h':
                 usage(rc=0)
             elif o == '-r':
-                if len(myfiles) == 0 or exclude > 1:
-                    usage()
                 args = ['-1', '-g', '-K', '-D', '-q']
                 args.extend(myfiles)
-                exclude += 1
             elif o == '-d':
-                if len(myfiles) == 0 or exclude > 1:
-                    usage()
                 args = ['-C', '-q']
                 args.extend(myfiles)
-                exclude += 1
             elif o == '-D':
-                if len(myfiles) > 0:
-                    usage()
                 args = ['-g', '-e', '-f', '-q', '@world']
             elif o == '-k':
-                if len(sys.argv[1:]) != 2:
-                    usage()
                 version = a
                 do_install_kernel = True
 
+    if do_local:
+        args.remove('-g')
+        args.remove('-K')
+
     if len(CONST.names) > 1:
         sys.stderr.write('More than one GRS specified in systems.conf.  Using the first one.\n')
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     fdf55fd2cec43cc8d5de4ecd3be724e48431b399
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:17:11 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:17:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=fdf55fd2

bin/grsup: improve English.

 bin/grsup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/grsup b/bin/grsup
index dc6c9c4..b512675 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -105,7 +105,7 @@ usage: grsup [-l] [pkg(s)]  : update @world or pkg(s) if given
        grsup -h             : print this help
 """
     if extra:
-        print('\nCombination of parameters invalid: %s' % extra)
+        print('\nInvalide combination of parameters: %s' % extra)
     print(use)
     sys.exit(rc)
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     e4aead781c28383c3dba05ccdc05bc46a7a45e16
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:17:11 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:18:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=e4aead78

bin/grsup: improve English.

 bin/grsup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/grsup b/bin/grsup
index dc6c9c4..392005c 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -105,7 +105,7 @@ usage: grsup [-l] [pkg(s)]  : update @world or pkg(s) if given
        grsup -h             : print this help
 """
     if extra:
-        print('\nCombination of parameters invalid: %s' % extra)
+        print('\nInvalid combination of parameters: %s' % extra)
     print(use)
     sys.exit(rc)
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     ff639628515f63af8ca3fc70e519556722f34478
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:25:00 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 17:25:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=ff639628

bin/grsup: copy in the make.conf from remote git repo.

 bin/grsup | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/bin/grsup b/bin/grsup
index 0e05dbf..30e43bf 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -205,6 +205,24 @@ def main():
     newconf = '%s/core%s' % (libdir, CONST.WORLD_CONFIG)
     shutil.copy(newconf, CONST.WORLD_CONFIG)
 
+    # Copy the new make.conf to CONST.PORTAGE_CONFIGDIR
+    # If a raw new make.conf exists, pick it, else pick the highest cycle no.
+    newmakeconf = os.path.join(libdir, 'core/etc/portage/make.conf')
+    if os.path.isfile(newmakeconf):
+        shutil.copy(newmakeconf, CONST.PORTAGE_CONFIGDIR)
+    else:
+        cycled_files = {}
+        for f in glob.glob('%s.*' % newmakeconf):
+            m = re.search('^(.+)\.CYCLE\.(\d+)', f)
+            if m:
+                cycle_no = int(m.group(2))
+                cycled_files[cycle_no] = m.group(0)
+        try:
+            max_cycle_no = max(cycled_files)
+            shutil.copy(cycled_files[max_cycle_no], CONST.PORTAGE_CONFIGDIR)
+        except ValueError:
+            pass
+
     if os.path.isfile(CONST.PORTAGE_DIRTYFILE):
         WorldConf.clean()
     open(CONST.PORTAGE_DIRTYFILE, 'a').close()

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     65d1ee9d179df47c8a978d6feb986d3242dfafc2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:44:38 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 17:44:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=65d1ee9d

bin/grsup: fix bugs.

 bin/grsup | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/grsup b/bin/grsup
index 30e43bf..5e0a70c 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -17,6 +17,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import copy
+import glob
+import filecmp
 import os
 import re
 import shutil
@@ -208,8 +210,9 @@ def main():
     # Copy the new make.conf to CONST.PORTAGE_CONFIGDIR
     # If a raw new make.conf exists, pick it, else pick the highest cycle no.
     newmakeconf = os.path.join(libdir, 'core/etc/portage/make.conf')
+    oldmakeconf = os.path.join(CONST.PORTAGE_CONFIGDIR, 'make.conf')
     if os.path.isfile(newmakeconf):
-        shutil.copy(newmakeconf, CONST.PORTAGE_CONFIGDIR)
+        shutil.copy(newmakeconf, oldmakeconf)
     else:
         cycled_files = {}
         for f in glob.glob('%s.*' % newmakeconf):
@@ -219,7 +222,7 @@ def main():
                 cycled_files[cycle_no] = m.group(0)
         try:
             max_cycle_no = max(cycled_files)
-            shutil.copy(cycled_files[max_cycle_no], CONST.PORTAGE_CONFIGDIR)
+            shutil.copy(cycled_files[max_cycle_no], oldmakeconf)
         except ValueError:
             pass
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     38903acaed401c1a5daba418172eacf052cc2435
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:56:22 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 17:56:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=38903aca

bin/grsup: backup old make.conf if clobbering.

 bin/grsup | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/bin/grsup b/bin/grsup
index 5e0a70c..d722edb 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -211,8 +211,10 @@ def main():
     # If a raw new make.conf exists, pick it, else pick the highest cycle no.
     newmakeconf = os.path.join(libdir, 'core/etc/portage/make.conf')
     oldmakeconf = os.path.join(CONST.PORTAGE_CONFIGDIR, 'make.conf')
+
+    do_copy = False
     if os.path.isfile(newmakeconf):
-        shutil.copy(newmakeconf, oldmakeconf)
+        do_copy = True
     else:
         cycled_files = {}
         for f in glob.glob('%s.*' % newmakeconf):
@@ -222,10 +224,19 @@ def main():
                 cycled_files[cycle_no] = m.group(0)
         try:
             max_cycle_no = max(cycled_files)
-            shutil.copy(cycled_files[max_cycle_no], oldmakeconf)
-        except ValueError:
+            newmakeconf = cycled_files[max_cycle_no]
+            do_copy = True
+        except ValueError: # thrown by max() if cycled_files is empty
             pass
 
+    if do_copy:
+        if os.path.isfile(oldmakeconf):
+            if not filecmp.cmp(newmakeconf, oldmakeconf):
+                print('New make.conf differs from local version. Backing up as make.conf.old')
+                shutil(oldmakeconf, '%s.old' % oldmakeconf)
+        shutil.copy(newmakeconf, oldmakeconf)
+
+    # Check if we left behind a dirty /etc/portage
     if os.path.isfile(CONST.PORTAGE_DIRTYFILE):
         WorldConf.clean()
     open(CONST.PORTAGE_DIRTYFILE, 'a').close()

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     5f43bcc634c32be5724935cb8e0ec88f4f1b4c14
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 19:14:55 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 19:14:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=5f43bcc6

bin/grsrun: avoid name collision with usage().

 bin/grsrun | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/grsrun b/bin/grsrun
index 541b039..7dd3ed7 100755
--- a/bin/grsrun
+++ b/bin/grsrun
@@ -30,7 +30,7 @@ from getopt import gnu_getopt, GetoptError
 
 
 def usage(rc=1):
-    usage = """
+    use = """
 usage: grsrun [-m|-u|-h|-s <name>]
 
 flags:             Release run.  Do every step in build script.
@@ -39,7 +39,7 @@ flags:             Release run.  Do every step in build script.
      : -s <name>.  Only run for GRS system <name>.
      : -h          Print this help file.
 """
-    print(usage)
+    print(use)
     sys.exit(rc)
 
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     1ac74597080f5d2276757ae5d896faa544d7eee8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 20:02:36 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 20:02:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=1ac74597

bin/grsup: WorldConf.install() now does a cleanup automatically.

 bin/grsup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/grsup b/bin/grsup
index d722edb..5f03131 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -236,9 +236,9 @@ def main():
                 shutil(oldmakeconf, '%s.old' % oldmakeconf)
         shutil.copy(newmakeconf, oldmakeconf)
 
-    # Check if we left behind a dirty /etc/portage
-    if os.path.isfile(CONST.PORTAGE_DIRTYFILE):
-        WorldConf.clean()
+    # 1. Install all world.conf files.
+    # 2. Do the emerge.
+    # 3. Cleanup unused /etc/portage files.
     open(CONST.PORTAGE_DIRTYFILE, 'a').close()
     WorldConf.install()
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     6e34c9aee6561d4ba1eeab51cbeceed4a37d701f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 20:09:39 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 20:09:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=6e34c9ae

bin/grsup: fix typo.

 bin/grsup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/grsup b/bin/grsup
index 5f03131..74670cd 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -233,7 +233,7 @@ def main():
         if os.path.isfile(oldmakeconf):
             if not filecmp.cmp(newmakeconf, oldmakeconf):
                 print('New make.conf differs from local version. Backing up as make.conf.old')
-                shutil(oldmakeconf, '%s.old' % oldmakeconf)
+                shutil.copy(oldmakeconf, '%s.old' % oldmakeconf)
         shutil.copy(newmakeconf, oldmakeconf)
 
     # 1. Install all world.conf files.

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     2024ac84f3201615ffdf3f49e07454e480f0657b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 22:15:29 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 22:15:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=2024ac84

bin/grsup: dereference sym links so you don't clobber /lib -> /lib64

 bin/grsup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/grsup b/bin/grsup
index 74670cd..319236f 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -106,7 +106,7 @@ def install_kernel(version = 'latest', logfile = CONST.LOGFILE):
     # Untar it at '/'.  tar will not clobber files.
     cwd = os.getcwd()
     os.chdir('/')
-    cmd = 'tar --overwrite -Jxf %s' % kpath
+    cmd = 'tar --overwrite -hJxf %s' % kpath
     Execute(cmd, timeout=600, logfile=logfile)
     os.chdir(cwd)
 

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     1f8e6fc0aef8335d0a07923232515e28f138eba7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 13:05:25 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 26 13:05:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=1f8e6fc0

bin/make-worldconf: exclude ruby_ USE_EXPAND flags

 bin/make-worldconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/make-worldconf b/bin/make-worldconf
index afedf39..837d628 100755
--- a/bin/make-worldconf
+++ b/bin/make-worldconf
@@ -44,7 +44,7 @@ def useflags(config, p):
     # We only include select USE_EXPAND flags. Note becaue of how we match 'abi_',
     # for example, will match abi_ppc, abi_mips etc.  Hopefully this will not lead
     # to any false hits.
-    expand = [ 'kernel_', 'elibc_', 'userland_', 'abi_', 'linguas_', 'python_' ]
+    expand = [ 'kernel_', 'elibc_', 'userland_', 'abi_', 'linguas_', 'python_', 'ruby_' ]
 
     # Remove any selected USE_EXPAND and any EXPAND_HIDDEN flags from IUSE flags
     my_iuse = copy.deepcopy(iuse)

[gentoo-commits] proj/grss:master commit in: bin/

[Anthony G. Basile]

commit:     7a12e4895533aaaabbe46418c28e1c6f52c799a1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 18:11:47 2022 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 18:12:20 2022 +0000
URL:        https://gitweb.gentoo.org/proj/grss.git/commit/?id=7a12e489

bin/grsup: make sure bdeps are also pulled in

See: https://bugs.gentoo.org/863422
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 bin/grsup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/grsup b/bin/grsup
index 8e2679c..5963629 100755
--- a/bin/grsup
+++ b/bin/grsup
@@ -162,7 +162,7 @@ def main():
 
     do_install_kernel = False
     if len(opts) == 0:
-        args = ['-1', '-g', '-K', '-u', '-D', '-q']
+        args = ['-1', '-g', '-K', '-u', '-D', '-q', '--with-bdeps=y']
         if len(myfiles) == 0:
             myfiles = ['@world']
         args.extend(myfiles)
@@ -171,13 +171,13 @@ def main():
             if o == '-h':
                 usage(rc=0)
             elif o == '-r':
-                args = ['-1', '-g', '-K', '-D', '-q']
+                args = ['-1', '-g', '-K', '-D', '-q', '--with-bdeps=y']
                 args.extend(myfiles)
             elif o == '-d':
                 args = ['-C', '-q']
                 args.extend(myfiles)
             elif o == '-D':
-                args = ['-g', '-e', '-f', '-q', '@world']
+                args = ['-g', '-e', '-f', '-q', '--with-bdeps=y', '@world']
             elif o == '-k':
                 version = a
                 do_install_kernel = True