From 9de97e5e10dbb98edb603f9c130393a09115110c Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Sat, 23 Nov 2024 15:33:28 -0800
Subject: [PATCH] Fixed bug in `gam <UserTypeEntity> print|show filetree`

---
 .github/workflows/winget.yml |  2 +-
 .travis.yml                  | 14 +++++++-------
 src/GamUpdate.txt            |  5 +++++
 src/gam/__init__.py          |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index 83fefb10..92943d85 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: taers232c.GAMADV-XTD3
-          release-tag: v7.01.00
+          release-tag: v7.01.01
           max-versions-to-keep: 1 # keep only latest versions
           installers-regex: '\.msi$'
           token: ${{ secrets.WINGET_TOKEN }}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a896e681..797f1623 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,11 +95,11 @@ script:
 
 before_deploy:
 # Comment out for Linux Xenial and Trusty
-#- yes | gem update --system --force
-#- gem install bundler
-#- gem install faraday-net_http -v '3.3.0' # Fix faraday version
-#- gem install uri
-#- gem install logger
+- yes | gem update --system --force
+- gem install bundler
+- gem install faraday-net_http -v '3.3.0' # Fix faraday version
+- gem install uri
+- gem install logger
 - export TRAVIS_TAG="preview"
 - unset LD_LIBRARY_PATH
 
@@ -114,8 +114,8 @@ deploy:
 # Linux 64-Bit Bionic and Linux ARM64 Focal and Linux ARM64 Bionic and Linux ARM64 Xenial 
 #  edge: true
 # Linux Xenial and Trusty
-  edge:
-    branch: v2.0.3-beta.4
+#  edge:
+#    branch: v2.0.3-beta.4
 #    branch: v2.0.5-beta.1
   on:
     repo: taers232c/GAMADV-XTD3
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 61f4f160..9109b879 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,8 @@
+7.01.01
+
+Fixed bug in `gam <UserTypeEntity> print|show filetree` where no error message was generated
+if a user had Drive disabled.
+
 7.01.00
 
 Fixed bug in `gam update chromepolicy` that caused some policy updates to fail.
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 69b80675..7c0a9d42 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -25,7 +25,7 @@
 """
 
 __author__ = 'Ross Scroggs <ross.scroggs@gmail.com>'
-__version__ = '7.01.00'
+__version__ = '7.01.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -54788,7 +54788,8 @@ def initFileTree(drive, shareddrive, DLP, shareddriveFields, showParent, user, i
   except (GAPI.notFound, GAPI.fileNotFound, GAPI.invalid, GAPI.noListTeamDrivesAdministratorPrivilege) as e:
     entityActionFailedWarning([Ent.USER, user, Ent.SHAREDDRIVE, fileId], str(e), i, count)
     return (None, False)
-  except (GAPI.serviceNotAvailable, GAPI.authError, GAPI.domainPolicy):
+  except (GAPI.serviceNotAvailable, GAPI.authError, GAPI.domainPolicy) as e:
+    userSvcNotApplicableOrDriveDisabled(user, str(e), i, count)
     return (None, False)
   return (fileTree, True)