aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2003-09-24 01:09:39 +0000
committerJason Woodward2003-09-24 01:09:39 +0000
commit34a98e59daa77b2d2f144d1406b56eeb6396652d (patch)
tree27dcffb23ccea40061dd52b9d5a812a3c237057e
parent63f38e9ac14c35cfe4616edab517b4a8247fc06c (diff)
downloadslapt-get-34a98e59daa77b2d2f144d1406b56eeb6396652d.tar.gz
default make target doesn't build slack pkg, --dist-upgrade becomes target instead of option
-rw-r--r--ChangeLog4
-rw-r--r--Makefile2
-rw-r--r--src/main.c9
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 03c398f..6998146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
+0.9.3 Sep 23, 2003
+ * default make target doesn't build slack pkg
+ * --dist-upgrade becomes target instead of option
+
0.9.2 Sep 22, 2003
* renamed to slapt-get
* documentation updates
diff --git a/Makefile b/Makefile
index 3d2da3d..e72cef8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SBINDIR=/sbin/
DEFINES=-DPROGRAM_NAME="\"$(PROGRAM_NAME)\"" -DVERSION="\"$(VERSION)\"" -DRC_LOCATION="\"$(RCDEST)\""
CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic -Iinclude $(DEFINES)
-default: all
+default: $(PROGRAM_NAME)
all: pkg
diff --git a/src/main.c b/src/main.c
index d02c0fc..52df21c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,6 +112,7 @@ int main( int argc, char *argv[] ){
break;
case 'a': /* dist-upgrade */
global_config->dist_upgrade = 1;
+ pkg_action_upgrade_all(global_config);
break;
case 'm': /* simulate */
global_config->simulate = 1;
@@ -146,8 +147,9 @@ void usage(){
printf("%s [option(s)] [target]\n",PROGRAM_NAME);
printf("\n");
printf("Targets:\n");
- printf(" --update - retrieves pkg data from MIRROR\n");
- printf(" --upgrade - upgrade installed pkgs\n");
+ printf(" --update - retrieves pkg data from MIRROR\n");
+ printf(" --upgrade - upgrade installed pkgs\n");
+ printf(" --dist-upgrade - assumes MIRROR is set to newer release\n");
printf(" --install [pkg name(s)] - install specified pkg(s)\n");
printf(" --remove [pkg name(s)] - remove specified pkg(s)\n");
printf(" --show [pkg name] - show pkg description\n");
@@ -159,10 +161,9 @@ void usage(){
printf("\n");
printf("Options:\n");
printf(" --download-only - only download pkg on install/upgrade\n");
- printf(" --dist-upgrade - assumes MIRROR is set to newer release\n");
printf(" --simulate - show pkgs to be upgraded\n");
printf(" --no-prompt - do not prompt during upgrade\n");
- printf(" --reinstall - re-install the pkg even if installed\n");
+ printf(" --reinstall - re-install the pkg even if installed\n");
printf(" --ignore-excludes - install excludes anyway\n");
}