backend/satellite_tools/disk_dumper/iss.py | 10 +++++++++-
backend/satellite_tools/disk_dumper/iss_ui.py | 8 +++-----
2 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 2e602d8ac695a3836236e9b8b17732c670629461
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 14:54:32 2011 +0100
fixed error message
diff --git a/backend/satellite_tools/disk_dumper/iss.py
b/backend/satellite_tools/disk_dumper/iss.py
index c057bb1..06ef7da 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -929,7 +929,7 @@ class ExporterMain:
self.options.use_rhn_date=True
if self.options.end_date and not self.options.start_date:
- sys.stderr.write("--end-date must be used with --start-date.")
+ sys.stderr.write("--end-date must be used with --start-date.\n")
sys.exit(1)
if self.options.end_date and len(self.options.end_date) < 8:
commit 5d844a9a6f173089700bdea4e06e9c35e8751b9c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 14:53:18 2011 +0100
672277 - made --use-rhn-date and --use-sync-date mutually exclusive
diff --git a/backend/satellite_tools/disk_dumper/iss.py
b/backend/satellite_tools/disk_dumper/iss.py
index 2d31b6f..c057bb1 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -920,6 +920,14 @@ class ExporterMain:
sys.stdout.write("--dir not included!\n")
sys.exit(0)
+ if self.options.use_sync_date and self.options.use_rhn_date:
+ sys.stderr.write("--use-rhn-date and --use-sync-date are mutually
exclusive.\n")
+ sys.exit(1)
+ elif self.options.use_sync_date:
+ self.options.use_rhn_date=False
+ else:
+ self.options.use_rhn_date=True
+
if self.options.end_date and not self.options.start_date:
sys.stderr.write("--end-date must be used with --start-date.")
sys.exit(1)
diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py
b/backend/satellite_tools/disk_dumper/iss_ui.py
index e217a76..3a5e063 100644
--- a/backend/satellite_tools/disk_dumper/iss_ui.py
+++ b/backend/satellite_tools/disk_dumper/iss_ui.py
@@ -37,11 +37,9 @@ class UI:
option( "--end-date", action="store",
help="The end date limit that the last modified dates are compared against.
Should be in the format 'YYYYMMDDHH24MISS'."),
option( "--use-rhn-date",
action="store_true",
- help="Limit exported packages according to the date when they appeared at
Red Hat Network.",
- dest="use_rhn_date", default=True),
- option( "--use-sync-date",
action="store_false",
- help="Limit exported packages according to the date they where pulled into
satellite.",
- dest="use_rhn_date"),
+ help="Limit exported packages according to the date when they appeared at
Red Hat Network."),
+ option( "--use-sync-date",
action="store_true",
+ help="Limit exported packages according to the date they where pulled into
satellite."),
option( "--make-isos", action="store",
help="Create channel dump isos a directory called satellite-isos. Usage:
--make-isos=cd or dvd"),
option("-p", "--print-configuration",
action="store_true", default=0,
Show replies by date