spacecmd/src/lib/configchannel.py | 30 +++++--
spacecmd/src/lib/cryptokey.py | 30 ++++++-
spacecmd/src/lib/custominfo.py | 27 ++++++
spacecmd/src/lib/distribution.py | 48 +++++++++---
spacecmd/src/lib/softwarechannel.py | 140 +++++++++++++++++++++++-------------
spacecmd/src/lib/utils.py | 7 +
6 files changed, 206 insertions(+), 76 deletions(-)
New commits:
commit 10513eaaed48f1d737401965b1d52af111d08233
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Mar 23 18:42:42 2012 +0000
spacecmd : softwarechannel_clone avoid ISE on duplicate name
Duplicate name in target channel causes ISE, and duplicate label is only handled
by printing the xmlrpc error, can catch both of these before attempting the
clone, also affects softwarechannel_clonetree so fix both
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index fb6f4b3..48ddc0c 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -533,6 +533,21 @@ def do_softwarechannel_create(self, args):
####################
+def softwarechannel_check_existing(self, name, label):
+ # Catch label or name which already exists, duplicate label throws a
+ # descriptive xmlrpc error, but duplicate name results in ISE
+ for c in self.list_base_channels() + self.list_child_channels():
+ cd = self.client.channel.software.getDetails(self.session, c)
+ if cd['name'] == name:
+ logging.error("Name %s already in use by channel %s" %\
+ (name, cd['label']))
+ return True
+ if cd['label'] == label:
+ logging.error("Label %s already in use by channel %s" %\
+ (label, cd['label']))
+ return True
+ return False
+
def help_softwarechannel_clone(self):
print 'softwarechannel_clone: Clone a software channel'
print '''usage: softwarechannel_clone [options]
@@ -630,6 +645,9 @@ def do_softwarechannel_clone(self, args):
logging.debug("regex mode : %s %s %s" % (options.source_channel,\
options.name, options.label))
+ # Catch label or name which already exists
+ if self.softwarechannel_check_existing(options.name, options.label):
+ return
details = { 'name' : options.name,
'label' : options.label,
@@ -785,6 +803,10 @@ def do_softwarechannel_clonetree(self, args):
logging.error("called without prefix or regex option!")
return
+ # Catch label or name which already exists
+ if self.softwarechannel_check_existing(name, label):
+ return
+
details = { 'name' : name,
'label' : label,
'summary' : name }
commit 328582fe40a4bb8b526dc449ceb63216e7354f21
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Mar 23 18:20:13 2012 +0000
spacecmd bugfix : softwarechannel_adderrata mergeErrata should be cloneErrataAsOriginal
Remove the logic which uses mergeErrata, since testing indicates mergeErrata
simply adds the errata (not the packages), so a better plan is to use
cloneAsOriginal regardless of the API version.
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index 48f7831..fb6f4b3 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1262,35 +1262,21 @@ def do_softwarechannel_adderrata(self, args):
if not self.user_confirm('Add these errata [y/N]:'): return
- if self.check_api_version('10.12'):
- merged = self.client.channel.software.mergeErrata(self.session,
- source_channel,
- dest_channel,
- errata)
-
- # show the user which errata were actually merged
- if self.options.debug:
- print
- print "Errata Merged"
- print "-------------"
- print
- print_errata_list(merged)
- else:
- # clone each erratum individually because the process is slow and it can
- # lead to timeouts on the server
- for erratum in errata:
- logging.debug('Cloning %s' % erratum)
- if self.check_api_version('10.11'):
- # This call is poorly documented, but it stops errata.clone
- # pushing EL6 packages into EL5 channels when the errata
- # package list contains both versions, ref bz678721
- self.client.errata.cloneAsOriginal(self.session, dest_channel,\
- [erratum])
- else:
- logging.warning("Using the old errata.clone function")
- logging.warning("If you have base channels for multiple OS" +\
- " versions, check no unexpected packages have been added")
- self.client.errata.clone(self.session, dest_channel, [erratum])
+ # clone each erratum individually because the process is slow and it can
+ # lead to timeouts on the server
+ for erratum in errata:
+ logging.debug('Cloning %s' % erratum)
+ if self.check_api_version('10.11'):
+ # This call is poorly documented, but it stops errata.clone
+ # pushing EL6 packages into EL5 channels when the errata
+ # package list contains both versions, ref bz678721
+ self.client.errata.cloneAsOriginal(self.session, dest_channel,\
+ [erratum])
+ else:
+ logging.warning("Using the old errata.clone function")
+ logging.warning("If you have base channels for multiple OS" +\
+ " versions, check no unexpected packages have been added")
+ self.client.errata.clone(self.session, dest_channel, [erratum])
# regenerate the errata cache since we just cloned errata
self.generate_errata_cache(True)
commit 39a49adae8f6cef413acd0f4aedd4e950136a7de
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Mar 23 08:14:03 2012 +0000
spacecmd enhancement : Add globbing support to distribution_details
Adds support for globbing distribution names similar to many other spacecmd functions
diff --git a/spacecmd/src/lib/distribution.py b/spacecmd/src/lib/distribution.py
index 5a5d78b..14b66ed 100644
--- a/spacecmd/src/lib/distribution.py
+++ b/spacecmd/src/lib/distribution.py
@@ -188,21 +188,34 @@ def complete_distribution_details(self, text, line, beg, end):
def do_distribution_details(self, args):
(args, options) = parse_arguments(args)
- if len(args) != 1:
+ if not len(args):
self.help_distribution_details()
return
- label = args[0]
+ # allow globbing of distribution names
+ dists = filter_results(self.do_distribution_list('', True), args)
+ logging.debug("distribution_details called with args %s, dists=%s" % \
+ (args, dists))
+
+ if not len(dists):
+ logging.error("No distributions matched argument %s" % args)
+ return
+
+ add_separator = False
- details = self.client.kickstart.tree.getDetails(self.session, label)
+ for label in dists:
+ details = self.client.kickstart.tree.getDetails(self.session, label)
- channel = \
- self.client.channel.software.getDetails(self.session,
+ channel = \
+ self.client.channel.software.getDetails(self.session,
details.get('channel_id'))
- print 'Name: %s' % details.get('label')
- print 'Path: %s' % details.get('abs_path')
- print 'Channel: %s' % channel.get('label')
+ if add_separator: print self.SEPARATOR
+ add_separator = True
+
+ print 'Name: %s' % details.get('label')
+ print 'Path: %s' % details.get('abs_path')
+ print 'Channel: %s' % channel.get('label')
####################
commit e099c52deb0864a4147a6643edf642b40bc103a9
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Mar 23 08:06:34 2012 +0000
spacecmd enhancement : Add globbing support to distribution_delete
Adds support for globbing distribution names similar to other spacecmd functions
diff --git a/spacecmd/src/lib/distribution.py b/spacecmd/src/lib/distribution.py
index 035b1e2..5a5d78b 100644
--- a/spacecmd/src/lib/distribution.py
+++ b/spacecmd/src/lib/distribution.py
@@ -156,14 +156,25 @@ def complete_distribution_delete(self, text, line, beg, end):
def do_distribution_delete(self, args):
(args, options) = parse_arguments(args)
- if len(args) != 1:
+ if not len(args):
self.help_distribution_delete()
return
- label = args[0]
+ # allow globbing of distribution names
+ dists = filter_results(self.do_distribution_list('', True), args)
+ logging.debug("distribution_delete called with args %s, dists=%s" % \
+ (args, dists))
+
+ if not len(dists):
+ logging.error("No distributions matched argument %s" % args)
+ return
+
+ # Print the distributions prior to the confirmation
+ print '\n'.join(sorted(dists))
- if self.user_confirm('Delete this tree [y/N]:'):
- self.client.kickstart.tree.delete(self.session, label)
+ if self.user_confirm('Delete distribution tree(s) [y/N]:'):
+ for d in dists:
+ self.client.kickstart.tree.delete(self.session, d)
####################
commit affcdbe5b518927653401091b59641270b27ba0d
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 19:19:25 2012 +0000
spacecmd : Cleanup some typos in comments
Trival cleanups to some cut/paste comment errors
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 2ec5d20..5b4701b 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -359,7 +359,7 @@ def do_configchannel_delete(self, args):
self.help_configchannel_delete()
return
- # allow globbing of configchannel channel names
+ # allow globbing of configchannel names
channels = filter_results(self.do_configchannel_list('', True), args)
logging.debug("configchannel_delete called with args %s, channels=%s" % \
(args, channels))
@@ -368,7 +368,7 @@ def do_configchannel_delete(self, args):
logging.error("No channels matched argument %s" % args)
return
- # Print the channels prior to the confimation
+ # Print the channels prior to the confirmation
print '\n'.join(sorted(channels))
if self.user_confirm('Delete these channels [y/N]:'):
@@ -872,7 +872,7 @@ def do_configchannel_export(self, args):
logging.info("Exporting ALL config channels to %s" % filename)
ccs = self.do_configchannel_list('', True)
else:
- # allow globbing of configchannel channel names
+ # allow globbing of configchannel names
ccs = filter_results(self.do_configchannel_list('', True), args)
logging.debug("configchannel_export called with args %s, ccs=%s" % \
(args, ccs))
@@ -1060,7 +1060,7 @@ def do_configchannel_clone(self, args):
self.help_configchannel_clone()
return
logging.debug("Got args=%s %d" % (args, len(args)))
- # allow globbing of configchannel channel names
+ # allow globbing of configchannel names
ccs = filter_results(self.do_configchannel_list('', True), args)
logging.debug("Filtered ccs %s" % ccs)
for cc in ccs:
commit 57e5f5e19d6e4b2b8f2057fd491810109e1398f3
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 19:16:53 2012 +0000
spacecmd enhancement : custominfo_details add support for globbing key names
Adds support for globbing key names similar to many other spacecmd functions
diff --git a/spacecmd/src/lib/custominfo.py b/spacecmd/src/lib/custominfo.py
index 4dd799a..c505e51 100644
--- a/spacecmd/src/lib/custominfo.py
+++ b/spacecmd/src/lib/custominfo.py
@@ -113,11 +113,20 @@ def do_custominfo_details(self, args):
self.help_custominfo_details()
return
+ # allow globbing of custominfo key names
+ keys = filter_results(self.do_custominfo_listkeys('', True), args)
+ logging.debug("customkey_details called with args %s, keys=%s" % \
+ (args, keys))
+
+ if not len(keys):
+ logging.error("No keys matched argument %s" % args)
+ return
+
add_separator = False
all_keys = self.client.system.custominfo.listAllKeys(self.session)
- for key in args:
+ for key in keys:
for k in all_keys:
if k.get('label') == key:
details = k
commit 9f62ce365427533756a0876ba0831c2e1ac58469
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 19:12:26 2012 +0000
spacecmd enhancement : custominfo_deletekey add support for globbing key names
Adds support for globbing key names similar to many other spacecmd functions
diff --git a/spacecmd/src/lib/custominfo.py b/spacecmd/src/lib/custominfo.py
index c5a068d..4dd799a 100644
--- a/spacecmd/src/lib/custominfo.py
+++ b/spacecmd/src/lib/custominfo.py
@@ -63,10 +63,22 @@ def do_custominfo_deletekey(self, args):
if not len(args):
self.help_custominfo_deletekey()
return
-
+
+ # allow globbing of custominfo key names
+ keys = filter_results(self.do_custominfo_listkeys('', True), args)
+ logging.debug("customkey_deletekey called with args %s, keys=%s" % \
+ (args, keys))
+
+ if not len(keys):
+ logging.error("No keys matched argument %s" % args)
+ return
+
+ # Print the keys prior to the confirmation
+ print '\n'.join(sorted(keys))
+
if not self.user_confirm('Delete these keys [y/N]:'): return
- for key in args:
+ for key in keys:
self.client.system.custominfo.deleteKey(self.session, key)
####################
commit 2e182eea13b9bfcda9bb748c2f826af32911bf8b
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 18:59:41 2012 +0000
spacecmd enhancement : Add cryptokey_details globbing support
Adds support for globbing key names similar to several other spacecmd functions
diff --git a/spacecmd/src/lib/cryptokey.py b/spacecmd/src/lib/cryptokey.py
index 9870e3d..c59d718 100644
--- a/spacecmd/src/lib/cryptokey.py
+++ b/spacecmd/src/lib/cryptokey.py
@@ -148,9 +148,18 @@ def do_cryptokey_details(self, args):
self.help_cryptokey_details()
return
+ # allow globbing of cryptokey names
+ keys = filter_results(self.do_cryptokey_list('', True), args)
+ logging.debug("cryptokey_details called with args %s, keys=%s" % \
+ (args, keys))
+
+ if not len(keys):
+ logging.error("No keys matched argument %s" % args)
+ return
+
add_separator = False
- for key in args:
+ for key in keys:
try:
details = self.client.kickstart.keys.getDetails(self.session,
key)
commit 3c2dfb0fd0521609a1da71190261ea9e363160a0
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 18:55:59 2012 +0000
spacecmd enhancement : cryptokey_delete add support for globbing
Adds support for globbing key names similar to many other spacecmd functions
diff --git a/spacecmd/src/lib/cryptokey.py b/spacecmd/src/lib/cryptokey.py
index 55392aa..9870e3d 100644
--- a/spacecmd/src/lib/cryptokey.py
+++ b/spacecmd/src/lib/cryptokey.py
@@ -96,14 +96,25 @@ def complete_cryptokey_delete(self, text, line, beg, end):
def do_cryptokey_delete(self, args):
(args, options) = parse_arguments(args)
- if len(args) != 1:
+ if not len(args):
self.help_cryptokey_delete()
return
- name = args[0]
+ # allow globbing of cryptokey names
+ keys = filter_results(self.do_cryptokey_list('', True), args)
+ logging.debug("cryptokey_delete called with args %s, keys=%s" % \
+ (args, keys))
+
+ if not len(keys):
+ logging.error("No keys matched argument %s" % args)
+ return
+
+ # Print the keys prior to the confirmation
+ print '\n'.join(sorted(keys))
- if self.user_confirm('Delete this key [y/N]:'):
- self.client.kickstart.keys.delete(self.session, name)
+ if self.user_confirm('Delete key(s) [y/N]:'):
+ for key in keys:
+ self.client.kickstart.keys.delete(self.session, key)
####################
commit b922ab450930c1c7df3f9e2d4849bf478622e089
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 18:39:38 2012 +0000
spacecmd : Workaround missing date key in recent spacewalk listErrata
Workaround - recent spacewalk lacks the "date" key on some listErrata calls
so use "issue_date" if we don't find "date"
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index b4a12bc..66ec32c 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -347,7 +347,12 @@ def build_package_names(packages):
def print_errata_summary(erratum):
- date_parts = erratum.get('date').split()
+ # Workaround - recent spacewalk lacks the "date" key
+ # on some listErrata calls
+ if erratum.has_key('date'):
+ date_parts = erratum.get('date').split()
+ else:
+ date_parts = erratum.get('issue_date').split()
if len(date_parts) > 1:
erratum['date'] = date_parts[0]
commit 2a01e02d3d1389931449d4df230e31f148391489
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 08:36:17 2012 +0000
spacecmd : Add validation to softwarechannel_adderrata channel args
Avoid stack-trace and xmlrpc error when incorrect channel args passed
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index cb6c8d5..48f7831 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1181,8 +1181,17 @@ def do_softwarechannel_adderrata(self, args):
self.help_softwarechannel_adderrata()
return
+ allchannels = self.do_softwarechannel_list('', True)
source_channel = args[0]
+ if not source_channel in allchannels:
+ logging.error("source channel %s does not exist!" % source_channel)
+ self.help_softwarechannel_adderrata()
+ return
dest_channel = args[1]
+ if not dest_channel in allchannels:
+ logging.error("dest channel %s does not exist!" % dest_channel)
+ self.help_softwarechannel_adderrata()
+ return
errata_wanted = self.expand_errata(args[2:])
logging.debug('Retrieving the list of errata from source channel')
commit 60a5f09299ec865e8f612a896df6189ab5a65c72
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu Mar 22 08:27:01 2012 +0000
spacecmd enhancement : softwarechannel_adderrata add --skip mode
Adds -s/--skip mode to softwarechannel_adderrata, which skips any errata which
appear to already exist in the destination channel
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index 8613fdc..cb6c8d5 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1161,6 +1161,7 @@ def help_softwarechannel_adderrata(self):
print 'usage: softwarechannel_adderrata SOURCE DEST <ERRATA|search:XXX ...>'
print 'Options:'
print ' -q/--quick : Don\'t display list of packages (slightly faster)'
+ print ' -s/--skip : Skip errata which appear to exist already in DEST'
def complete_softwarechannel_adderrata(self, text, line, beg, end):
parts = line.split(' ')
@@ -1171,7 +1172,8 @@ def complete_softwarechannel_adderrata(self, text, line, beg, end):
return self.tab_complete_errata(text)
def do_softwarechannel_adderrata(self, args):
- options = [ Option('-q', '--quick', action='store_true') ]
+ options = [ Option('-q', '--quick', action='store_true'),
+ Option('-s', '--skip', action='store_true') ]
(args, options) = parse_arguments(args, options)
@@ -1186,9 +1188,28 @@ def do_softwarechannel_adderrata(self, args):
logging.debug('Retrieving the list of errata from source channel')
source_errata = self.client.channel.software.listErrata(self.session,
source_channel)
+ dest_errata = self.client.channel.software.listErrata(self.session,
+ dest_channel)
errata = filter_results([ e.get('advisory_name') for e in source_errata ],
errata_wanted)
+ logging.debug("errata = %s" % errata)
+ if options.skip:
+ # We just match the NNNN:MMMM of the XXXX-NNNN:MMMM as the
+ # source errata will be RH[BES]A and the DEST errata will be CLA
+ dest_errata_suffix = [ x.get('advisory_name').split("-")[1] \
+ for x in dest_errata]
+ logging.debug("dest_errata_suffix = %s" % dest_errata_suffix)
+ toremove = []
+ for e in errata:
+ if e.split("-")[1] in dest_errata_suffix:
+ logging.debug("Skipping errata %s as it seems to be in %s" %\
+ (e, dest_channel))
+ toremove.append(e)
+ for e in toremove:
+ logging.debug("Removing %s from errata to be added" % e)
+ errata.remove(e)
+ logging.debug("skip-mode : reduced errata = %s" % errata)
# keep the details for our matching errata so we can use them later
errata_details = []
commit 60a298ca05cdb969d9d577da0aabc0c67411fc9a
Author: Steven Hardy <shardy(a)redhat.com>
Date: Wed Mar 21 18:27:49 2012 +0000
spacecmd enhancement : Add --quick mode to softwarechannel_adderrata
For non-interactive use calculating the package list is not necessary and takes
quite a long time, -q/--quick allows a quiet/quick mode which bypasses the
package-list calculation and display
diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py
index 1fda6cf..8613fdc 100644
--- a/spacecmd/src/lib/softwarechannel.py
+++ b/spacecmd/src/lib/softwarechannel.py
@@ -1159,6 +1159,8 @@ def help_softwarechannel_adderrata(self):
print 'softwarechannel_adderrata: Add errata from one channel ' + \
'into another channel'
print 'usage: softwarechannel_adderrata SOURCE DEST <ERRATA|search:XXX ...>'
+ print 'Options:'
+ print ' -q/--quick : Don\'t display list of packages (slightly faster)'
def complete_softwarechannel_adderrata(self, text, line, beg, end):
parts = line.split(' ')
@@ -1169,7 +1171,9 @@ def complete_softwarechannel_adderrata(self, text, line, beg, end):
return self.tab_complete_errata(text)
def do_softwarechannel_adderrata(self, args):
- (args, options) = parse_arguments(args)
+ options = [ Option('-q', '--quick', action='store_true') ]
+
+ (args, options) = parse_arguments(args, options)
if len(args) < 3:
self.help_softwarechannel_adderrata()
@@ -1192,19 +1196,20 @@ def do_softwarechannel_adderrata(self, args):
if erratum.get('advisory_name') in errata:
errata_details.append(erratum)
- # get the packages that resolve these errata so we can add them
- # to the channel afterwards
- package_ids = []
- for erratum in errata:
- logging.debug('Retrieving packages for errata %s' % erratum)
+ if not options.quick:
+ # get the packages that resolve these errata so we can add them
+ # to the channel afterwards
+ package_ids = []
+ for erratum in errata:
+ logging.debug('Retrieving packages for errata %s' % erratum)
- # get the packages affected by this errata
- packages = self.client.errata.listPackages(self.session, erratum)
+ # get the packages affected by this errata
+ packages = self.client.errata.listPackages(self.session, erratum)
- # only add packages that exist in the source channel
- for package in packages:
- if source_channel in package.get('providing_channels'):
- package_ids.append(package.get('id'))
+ # only add packages that exist in the source channel
+ for package in packages:
+ if source_channel in package.get('providing_channels'):
+ package_ids.append(package.get('id'))
if not len(errata):
logging.warning('No errata to add')
@@ -1213,16 +1218,19 @@ def do_softwarechannel_adderrata(self, args):
# show the user which errata will be added
print_errata_list(errata_details)
- print
- print 'Packages'
- print '--------'
- print '\n'.join(sorted([ self.get_package_name(p) for p in package_ids ]))
+ if not options.quick:
+ print
+ print 'Packages'
+ print '--------'
+ print '\n'.join(sorted([ self.get_package_name(p) for p in package_ids ]))
- print
+ print
print 'Total Errata: %s' % str(len(errata)).rjust(3)
- print 'Total Packages: %s' % str(len(package_ids)).rjust(3)
- if not self.user_confirm('Add these errata and packages [y/N]:'): return
+ if not options.quick:
+ print 'Total Packages: %s' % str(len(package_ids)).rjust(3)
+
+ if not self.user_confirm('Add these errata [y/N]:'): return
if self.check_api_version('10.12'):
merged = self.client.channel.software.mergeErrata(self.session,
commit ebf582b8861c1771400fdd25b7d04493069012c9
Author: Steven Hardy <shardy(a)redhat.com>
Date: Tue Mar 20 18:59:49 2012 +0000
spacecmd enhancement : Allow config-channel export of b64 encoded files
Recent spacewalk API versions have configchannel.getEncodedFileRevision
this can be used to export binary of problematic ascii files
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 285c2d8..2ec5d20 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -822,6 +822,21 @@ def export_configchannel_getdetails(self, channel):
# string "macro-start-delimiter" Y N
# string "macro-end-delimiter" Y N
for f in fileinfo:
+ # If we're using a recent API version files exported with no contents
+ # i.e binary or non-xml encodable ascii files can be exported as
+ # base64 encoded
+ if not f.has_key('contents'):
+ if not self.check_api_version('11.1'):
+ logging.warning("File %s could not be exported " % f['path'] +\
+ "with this API version(needs base64 encoding)")
+ else:
+ logging.info("File %s could not be exported as" % f['path'] +\
+ " text...getting base64 encoded version")
+ b64f = self.client.configchannel.getEncodedFileRevision(\
+ self.session, channel, f['path'], f['revision'])
+ f['contents'] = b64f['contents']
+ f['contents_enc64'] = b64f['contents_enc64']
+
for k in [ 'channel', 'revision', 'creation', 'modified', \
'permissions_mode', 'binary', 'md5' ]:
if f.has_key(k):
@@ -954,7 +969,8 @@ def import_configchannel_fromdetails(self, ccdetails):
isdir = False
# If binary files (or those containing characters which are
# invalid in XML, e.g the ascii escape character) are
- # exported, you end up with a file with no "contents" key
+ # exported, on older API versions, you end up with a file
+ # with no "contents" key (
# I guess the best thing to do here flag an error and
# import everything else
if not filedetails.has_key('contents'):
@@ -965,9 +981,7 @@ def import_configchannel_fromdetails(self, ccdetails):
continue
# Now we check if the file needs base64 encoding
# This will be because of trailing newlines (which get
- # eaten by the API), since as mentioned above, binary
- # and other problematic files can't be exported (there's
- # no option to export in base64 encoded format AFAICS)
+ # eaten by the API)
elif self.file_needs_b64_enc(filedetails['contents']):
logging.debug("Detected file needs base64 encoding")
filedetails['contents'] =\
