oops
This commit is contained in:
brent s
parent
120b576a38
commit
6078736f70
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@ __pycache__/
|
|||||||
*.7z
|
*.7z
|
||||||
*.rar
|
*.rar
|
||||||
*.deb
|
*.deb
|
||||||
|
.idea/
|
||||||
|
|||||||
311
.idea/workspace.xml
generated
311
.idea/workspace.xml
generated
@ -1,311 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="405aa042-981d-425d-adbb-7c41dc3f2018" name="Default" comment="">
|
|
||||||
<change beforePath="$PROJECT_DIR$/TODO" beforeDir="false" afterPath="$PROJECT_DIR$/TODO" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/aif/scripts/post/sshsecure.py" beforeDir="false" afterPath="$PROJECT_DIR$/aif/scripts/post/sshsecure.py" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/centos/repoclone/centos.dflts.ini" beforeDir="false" afterPath="$PROJECT_DIR$/centos/repoclone/centos.dflts.ini" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/centos/repoclone/repoclone.py" beforeDir="false" afterPath="$PROJECT_DIR$/centos/repoclone/repoclone.py" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/net/irc/irssilogparse.py" beforeDir="false" afterPath="$PROJECT_DIR$/net/irc/irssilogparse.py" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="FUSProjectUsageTrigger">
|
|
||||||
<session id="-211496600">
|
|
||||||
<usages-collector id="statistics.lifecycle.project">
|
|
||||||
<counts>
|
|
||||||
<entry key="project.closed" value="2" />
|
|
||||||
<entry key="project.open.time.0" value="1" />
|
|
||||||
<entry key="project.open.time.2" value="1" />
|
|
||||||
<entry key="project.open.time.3" value="2" />
|
|
||||||
<entry key="project.opened" value="4" />
|
|
||||||
</counts>
|
|
||||||
</usages-collector>
|
|
||||||
<usages-collector id="statistics.file.extensions.edit">
|
|
||||||
<counts>
|
|
||||||
<entry key="TODO" value="322" />
|
|
||||||
<entry key="py" value="19307" />
|
|
||||||
</counts>
|
|
||||||
</usages-collector>
|
|
||||||
<usages-collector id="statistics.file.types.edit">
|
|
||||||
<counts>
|
|
||||||
<entry key="PLAIN_TEXT" value="322" />
|
|
||||||
<entry key="Python" value="19305" />
|
|
||||||
<entry key="RegExp" value="2" />
|
|
||||||
</counts>
|
|
||||||
</usages-collector>
|
|
||||||
<usages-collector id="statistics.file.extensions.open">
|
|
||||||
<counts>
|
|
||||||
<entry key="TODO" value="1" />
|
|
||||||
<entry key="bak" value="1" />
|
|
||||||
<entry key="py" value="5" />
|
|
||||||
</counts>
|
|
||||||
</usages-collector>
|
|
||||||
<usages-collector id="statistics.file.types.open">
|
|
||||||
<counts>
|
|
||||||
<entry key="PLAIN_TEXT" value="2" />
|
|
||||||
<entry key="Python" value="5" />
|
|
||||||
</counts>
|
|
||||||
</usages-collector>
|
|
||||||
</session>
|
|
||||||
</component>
|
|
||||||
<component name="FileEditorManager">
|
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
||||||
<file pinned="false" current-in-tab="true">
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/irc/irssilogparse.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="389">
|
|
||||||
<caret line="32" column="51" selection-start-line="32" selection-start-column="51" selection-end-line="32" selection-end-column="51" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/irc/irssilogparse.py.bak">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1848">
|
|
||||||
<caret line="84" column="30" selection-start-line="84" selection-start-column="30" selection-end-line="84" selection-end-column="30" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
</leaf>
|
|
||||||
</component>
|
|
||||||
<component name="FileTemplateManagerImpl">
|
|
||||||
<option name="RECENT_TEMPLATES">
|
|
||||||
<list>
|
|
||||||
<option value="Python Script" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="FindInProjectRecents">
|
|
||||||
<findStrings>
|
|
||||||
<find>ps</find>
|
|
||||||
<find>mounts</find>
|
|
||||||
<find>ansi_pr</find>
|
|
||||||
<find>has_magic</find>
|
|
||||||
<find>ptrn</find>
|
|
||||||
<find>int</find>
|
|
||||||
<find>\x1b</find>
|
|
||||||
</findStrings>
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
</component>
|
|
||||||
<component name="IdeDocumentHistory">
|
|
||||||
<option name="CHANGED_PATHS">
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$/net/ssh/pubkeymanager/README" />
|
|
||||||
<option value="$PROJECT_DIR$/arch/relchk.py" />
|
|
||||||
<option value="/tmp/bootchk.py" />
|
|
||||||
<option value="/var/tmp/bootchk.py" />
|
|
||||||
<option value="/tmp/test.py" />
|
|
||||||
<option value="$PROJECT_DIR$/TODO" />
|
|
||||||
<option value="$PROJECT_DIR$/net/irc/tmp/irssigrep.py" />
|
|
||||||
<option value="/tmp/irssigrep.py" />
|
|
||||||
<option value="$PROJECT_DIR$/net/irc/irssilogparse.py" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectFrameBounds" extendedState="6">
|
|
||||||
<option name="y" value="27" />
|
|
||||||
<option name="width" value="1920" />
|
|
||||||
<option name="height" value="1053" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectView">
|
|
||||||
<navigator proportions="" version="1">
|
|
||||||
<foldersAlwaysOnTop value="true" />
|
|
||||||
</navigator>
|
|
||||||
<panes>
|
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="ProjectPane">
|
|
||||||
<subPane>
|
|
||||||
<expand>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="arch" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="net" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="net" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="irc" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="net" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="ssh" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="optools" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="net" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="ssh" type="462c0819:PsiDirectoryNode" />
|
|
||||||
<item name="pubkeymanager" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="optools" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
|
||||||
<item name="< Python 3.6 >" type="70bed36:NamedLibraryElementNode" />
|
|
||||||
</path>
|
|
||||||
</expand>
|
|
||||||
<select />
|
|
||||||
</subPane>
|
|
||||||
</pane>
|
|
||||||
</panes>
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent">
|
|
||||||
<property name="last_opened_file_path" value="/tmp/irssigrep.py" />
|
|
||||||
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.Python" />
|
|
||||||
</component>
|
|
||||||
<component name="RecentsManager">
|
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
|
||||||
<recent name="$PROJECT_DIR$/net/irc" />
|
|
||||||
</key>
|
|
||||||
</component>
|
|
||||||
<component name="RunDashboard">
|
|
||||||
<option name="ruleStates">
|
|
||||||
<list>
|
|
||||||
<RuleState>
|
|
||||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
||||||
</RuleState>
|
|
||||||
<RuleState>
|
|
||||||
<option name="name" value="StatusDashboardGroupingRule" />
|
|
||||||
</RuleState>
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="SvnConfiguration">
|
|
||||||
<configuration />
|
|
||||||
</component>
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="405aa042-981d-425d-adbb-7c41dc3f2018" name="Default" comment="" />
|
|
||||||
<created>1529436795575</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1529436795575</updated>
|
|
||||||
</task>
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="ToolWindowManager">
|
|
||||||
<frame x="0" y="27" width="1920" height="1053" extended-state="6" />
|
|
||||||
<layout>
|
|
||||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15741728" />
|
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
||||||
<window_info id="Favorites" order="2" side_tool="true" />
|
|
||||||
<window_info anchor="bottom" id="Message" order="0" />
|
|
||||||
<window_info anchor="bottom" id="Find" order="1" />
|
|
||||||
<window_info anchor="bottom" id="Run" order="2" />
|
|
||||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
||||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
||||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
||||||
<window_info anchor="bottom" id="TODO" order="6" />
|
|
||||||
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
||||||
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
|
|
||||||
<window_info anchor="bottom" id="Version Control" order="9" />
|
|
||||||
<window_info anchor="bottom" id="Python Console" order="10" />
|
|
||||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
||||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
||||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
||||||
<window_info anchor="right" id="LuaJ" order="3" />
|
|
||||||
<window_info anchor="right" id="Json Parser" order="4" />
|
|
||||||
</layout>
|
|
||||||
</component>
|
|
||||||
<component name="VcsContentAnnotationSettings">
|
|
||||||
<option name="myLimit" value="2678400000" />
|
|
||||||
</component>
|
|
||||||
<component name="editorHistoryManager">
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/ssh/hostkeymanager/config.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor" />
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/ssh/hostkeymanager/app/manage.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor" />
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/ssh/hostkeymanager/run.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor" />
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/ssh/hostkeymanager/uwsgi.ini">
|
|
||||||
<provider selected="true" editor-type-id="text-editor" />
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/arch/relchk.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="684">
|
|
||||||
<caret line="80" column="25" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/ssh/pubkeymanager/README">
|
|
||||||
<provider selected="true" editor-type-id="text-editor" />
|
|
||||||
</entry>
|
|
||||||
<entry file="file:///tmp/bootchk.py" />
|
|
||||||
<entry file="file:///var/tmp/bootchk.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="651">
|
|
||||||
<caret line="148" column="74" selection-start-line="148" selection-start-column="74" selection-end-line="148" selection-end-column="74" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/TODO">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="748">
|
|
||||||
<caret line="33" column="57" selection-start-line="33" selection-start-column="57" selection-end-line="33" selection-end-column="57" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/irc/tmp/irssigrep.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/irc/irssilogparse.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="389">
|
|
||||||
<caret line="32" column="51" selection-start-line="32" selection-start-column="51" selection-end-line="32" selection-end-column="51" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file:///tmp/irssigrep.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="418">
|
|
||||||
<caret line="20" column="67" selection-start-line="20" selection-start-column="67" selection-end-line="20" selection-end-column="67" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#23#32#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/net/irc/irssilogparse.py.bak">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1848">
|
|
||||||
<caret line="84" column="30" selection-start-line="84" selection-start-column="30" selection-end-line="84" selection-end-column="30" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file:///tmp/test.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="902">
|
|
||||||
<caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#23#32#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -247,8 +247,7 @@ class Backup(object):
|
|||||||
self.logger.info('[{0}]: BEGIN RESTORE'.format(r))
|
self.logger.info('[{0}]: BEGIN RESTORE'.format(r))
|
||||||
_cmd = ['borg',
|
_cmd = ['borg',
|
||||||
'extract',
|
'extract',
|
||||||
'-v', '--stats',
|
'-v', '--stats']
|
||||||
'--compression', 'lzma,9']
|
|
||||||
# if 'excludes' in self.cfg['repos'][r].keys():
|
# if 'excludes' in self.cfg['repos'][r].keys():
|
||||||
# for e in self.cfg['repos'][r]['excludes']:
|
# for e in self.cfg['repos'][r]['excludes']:
|
||||||
# _cmd.extend(['--exclude', e])
|
# _cmd.extend(['--exclude', e])
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user