backend/satellite_tools/spacewalk-remove-channel | 12 ++++++++++++
backend/satellite_tools/spacewalk-update-signatures | 4 ----
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit fd616cc865935056bc7bd5389a10a31dbe2e83a5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 2 21:09:59 2011 +0200
701232 - remove unnecessary directories
diff --git a/backend/satellite_tools/spacewalk-remove-channel
b/backend/satellite_tools/spacewalk-remove-channel
index a7d53cb..a126c9e 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -521,6 +521,18 @@ def _delete_files(relpaths):
except OSError:
log_debug(1, "Error unlinking %s;" % path)
+ path = os.path.dirname(path)
+ base_dir = CFG.MOUNT_POINT + '/' + CFG.PREPENDED_DIR
+ while path != base_dir:
+ try:
+ os.rmdir(path)
+ except OSError, e:
+ if e.errno == 39:
+ break
+ else:
+ raise e
+ path = os.path.dirname(path)
+
def _bind_many(l):
h = {}
lr = []
commit b22353549504c9167abb7bc79bf55c3ec92fe96f
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 2 20:37:55 2011 +0200
remove unused imports
diff --git a/backend/satellite_tools/spacewalk-update-signatures
b/backend/satellite_tools/spacewalk-update-signatures
index d386f8f..6458f90 100644
--- a/backend/satellite_tools/spacewalk-update-signatures
+++ b/backend/satellite_tools/spacewalk-update-signatures
@@ -19,15 +19,11 @@
import sys
import os
-import time
-import shutil
from optparse import Option, OptionParser
-from spacewalk.common import rhnLib
from spacewalk.common.rhnLog import rhnLog, initLOG
from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.common import rhn_rpm
-from spacewalk.server.rhnLib import parseRPMFilename, get_package_path
from spacewalk.server import rhnSQL
from spacewalk.server.rhnServer import server_packages
from spacewalk.satellite_tools.progress_bar import ProgressBar