ref: refs/heads/master
commit d75e4cdfc55601dc517227849f0a56451f32ec37
Author: Ján Kupec
Date: Mon Jul 27 15:09:25 2009 +0200
--download only added (fate #302159, bnc #384579)
---
src/Zypper.cc | 15 ++++++++++++---
src/solve-commit.cc | 40 +++++++++++++++++++++++-----------------
2 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/Zypper.cc b/src/Zypper.cc
index 46751fb..31ae08e 100644
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -900,6 +900,7 @@ void Zypper::processCommandOptions()
{"dry-run", no_argument, 0, 'N'},
{"no-recommends", no_argument, 0, 0 },
{"recommends", no_argument, 0, 0 },
+ {"download-only", no_argument, 0, 'd'},
// rug compatibility - will mark all packages for installation (like 'in *')
{"entire-catalog", required_argument, 0, 0 },
{"help", no_argument, 0, 'h'},
@@ -937,6 +938,7 @@ void Zypper::processCommandOptions()
"-R, --force-resolution Force the solver to find a solution (even\n"
" an agressive).\n"
"-D, --dry-run Test the installation, do not actually install.\n"
+ "-d, --download-only Only download the packages, do not install.\n"
), "package, patch, pattern, product", "package");
break;
}
@@ -1017,6 +1019,7 @@ void Zypper::processCommandOptions()
{"dry-run", no_argument, 0, 'D'},
// rug uses -N shorthand
{"dry-run", no_argument, 0, 'N'},
+ {"download-only", no_argument, 0, 'd'},
{"repo", required_argument, 0, 'r'},
{"no-recommends", no_argument, 0, 0},
{"help", no_argument, 0, 'h'},
@@ -1037,6 +1040,7 @@ void Zypper::processCommandOptions()
" to the required.\n"
"-D, --dry-run Test the repair, do not actually do anything to\n"
" the system.\n"
+ "-d, --download-only Only download needed packages, do not install.\n"
);
break;
}
@@ -1045,6 +1049,7 @@ void Zypper::processCommandOptions()
{
static struct option options[] = {
{"dry-run", no_argument, 0, 'D'},
+ {"download-only", no_argument, 0, 'd'},
{"repo", required_argument, 0, 'r'},
{"debug-solver", no_argument, 0, 0},
{"help", no_argument, 0, 'h'},
@@ -1061,6 +1066,7 @@ void Zypper::processCommandOptions()
" Command options:\n"
"-r, --repo Use only specified repositories to install packages.\n"
"-D, --dry-run Test the installation, do not actually install anything.\n"
+ "-d, --download-only Only download the packages, do not install.\n"
" --debug-solver Create solver test case for debugging.\n"
);
break;
@@ -1515,9 +1521,9 @@ void Zypper::processCommandOptions()
{"dry-run", no_argument, 0, 'D'},
// rug uses -N shorthand
{"dry-run", no_argument, 0, 'N'},
- // dummy for now
{"download-only", no_argument, 0, 'd'},
// rug-compatibility - dummy for now
+ //! \todo category can now be implemented in 'patch' using PoolQuery
{"category", no_argument, 0, 'g'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
@@ -1552,6 +1558,7 @@ void Zypper::processCommandOptions()
" --force-resolution Force the solver to find a solution (even\n"
" an agressive).\n"
"-D, --dry-run Test the update, do not actually update.\n"
+ "-d, --download-only Only download the packages, do not install.\n"
), "package, patch, pattern, product", "package");
break;
}
@@ -1566,6 +1573,7 @@ void Zypper::processCommandOptions()
{"no-recommends", no_argument, 0, 0 },
{"recommends", no_argument, 0, 0 },
{"dry-run", no_argument, 0, 'D'},
+ {"download-only", no_argument, 0, 'd'},
{"bz", required_argument, 0, 'b'},
{"bugzilla", required_argument, 0, 'b'},
{"cve", required_argument, 0, 0 },
@@ -1593,6 +1601,7 @@ void Zypper::processCommandOptions()
" to the required.\n"
"-r, --repo Load only the specified repository.\n"
"-D, --dry-run Test the update, do not actually update.\n"
+ "-d, --download-only Only download the packages, do not install.\n"
);
break;
}
@@ -1636,6 +1645,7 @@ void Zypper::processCommandOptions()
{"dry-run", no_argument, 0, 'D'},
// rug uses -N shorthand
{"dry-run", no_argument, 0, 'N'},
+ {"download-only", no_argument, 0, 'd'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
@@ -1657,6 +1667,7 @@ void Zypper::processCommandOptions()
" --recommends Install also recommended packages in addition\n"
" to the required.\n"
"-D, --dry-run Test the upgrade, do not actually upgrade\n"
+ "-d, --download-only Only download the packages, do not install.\n"
);
break;
}
@@ -3668,8 +3679,6 @@ void Zypper::doCommand()
return;
}
- if (_copts.count("download-only"))
- report_dummy_option(out(), "download-only");
if (_copts.count("category"))
report_dummy_option(out(), "category");
diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index 93e7ea4..2b0cb45 100755
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -351,6 +351,25 @@ static void make_solver_test_case(Zypper & zypper)
}
}
+ZYppCommitPolicy get_commit_policy(Zypper & zypper)
+{
+ ZYppCommitPolicy policy;
+
+ if (zypper.cOpts().count("dry-run"))
+ policy.dryRun(true);
+
+ if (zypper.cOpts().count("download-only"))
+ policy.downloadMode(DownloadOnly);
+ //! \todo make this configurable
+ //else
+ // policy.downloadMode(DownloadInAdvance);
+
+ policy.syncPoolAfterCommit(policy.dryRun() ? false : zypper.runningShell());
+
+ MIL << "Using commit policy: " << policy << endl;
+ return policy;
+}
+
// ----------------------------------------------------------------------------
// commit
// ----------------------------------------------------------------------------
@@ -590,25 +609,12 @@ void solve_and_commit (Zypper & zypper)
ostringstream s;
s << _("committing"); MIL << "committing...";
-
- ZYppCommitResult result;
if (copts.count("dry-run"))
- {
- s << " " << _("(dry run)") << endl; MIL << "(dry run)";
- zypper.out().info(s.str(), Out::HIGH);
-
- result = God->commit(ZYppCommitPolicy().dryRun(true));
- }
- else
- {
- zypper.out().info(s.str(), Out::HIGH);
-
- result = God->commit(
- ZYppCommitPolicy().syncPoolAfterCommit(zypper.runningShell()));
-
- commit_done = true;
- }
+ s << " " << _("(dry run)") << endl;
+ zypper.out().info(s.str(), Out::HIGH);
+ ZYppCommitResult result = God->commit(get_commit_policy(zypper));
+ commit_done = true;
MIL << endl << "DONE" << endl;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
